diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index ded8a74..69a2dcf 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -16,6 +16,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessCertificatePrintService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.validation.BindingResult; @@ -40,6 +41,7 @@ @RestController @RequestMapping("/business/certificatePrint") @AllArgsConstructor +@Api(tags = "证书打印") public class BusinessCertificatePrintController extends ExportController { private final IBusinessCertificatePrintService certificatePrintService; @@ -72,8 +74,8 @@ */ @ApiOperation("证书审批-同意") @PostMapping("/agree") - public ReturnDTO agreeAgainPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { - if(bindingResult.hasErrors()){ + public ReturnDTO agreeAgainPrint(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } return certificatePrintService.agreeAgainPrint(request); @@ -82,19 +84,19 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/refuse") public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ + if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return certificatePrintService.refuseAgainPrint(request); + return certificatePrintService.refuseAgainPrint(request); } @ApiOperation("证书打印审批-发起申请") @PostMapping("/submitApproval") - public ReturnDTO submitAgainPrint(@RequestBody @Valid BaseApprovalSubmitRequest request,BindingResult bindingResult){ - if(bindingResult.hasErrors()){ + public ReturnDTO submitAgainPrint(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return certificatePrintService.submitAgainPrint(request); + return certificatePrintService.submitAgainPrint(request); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index ded8a74..69a2dcf 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -16,6 +16,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessCertificatePrintService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.validation.BindingResult; @@ -40,6 +41,7 @@ @RestController @RequestMapping("/business/certificatePrint") @AllArgsConstructor +@Api(tags = "证书打印") public class BusinessCertificatePrintController extends ExportController { private final IBusinessCertificatePrintService certificatePrintService; @@ -72,8 +74,8 @@ */ @ApiOperation("证书审批-同意") @PostMapping("/agree") - public ReturnDTO agreeAgainPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { - if(bindingResult.hasErrors()){ + public ReturnDTO agreeAgainPrint(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } return certificatePrintService.agreeAgainPrint(request); @@ -82,19 +84,19 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/refuse") public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ + if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return certificatePrintService.refuseAgainPrint(request); + return certificatePrintService.refuseAgainPrint(request); } @ApiOperation("证书打印审批-发起申请") @PostMapping("/submitApproval") - public ReturnDTO submitAgainPrint(@RequestBody @Valid BaseApprovalSubmitRequest request,BindingResult bindingResult){ - if(bindingResult.hasErrors()){ + public ReturnDTO submitAgainPrint(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return certificatePrintService.submitAgainPrint(request); + return certificatePrintService.submitAgainPrint(request); } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java index 3915aee..bb96f39 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java @@ -74,7 +74,7 @@ private String isUrgent; @ApiModelProperty(value = "接收状态", dataType = "String") - @DictCodeField(message = "样品状态不合法", cacheName = MeterDictCode.ORDER_STATUS) + @DictCodeField(message = "接收状态不合法", cacheName = MeterDictCode.ORDER_STATUS) private Integer status; @TableField(exist = false)