diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 28746cf..b247f6b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -88,7 +88,7 @@ return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); } - @ApiOperation("委托书导出") + @ApiOperation("委托书列表导出") @PostMapping("/export") public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { businessOrderService.orderExport(request, response); @@ -115,7 +115,7 @@ @ApiOperation("委托书接收") @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -131,4 +131,10 @@ return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } + @ApiOperation("委托书表单打印/导出") + @PostMapping("/form/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.formExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 28746cf..b247f6b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -88,7 +88,7 @@ return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); } - @ApiOperation("委托书导出") + @ApiOperation("委托书列表导出") @PostMapping("/export") public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { businessOrderService.orderExport(request, response); @@ -115,7 +115,7 @@ @ApiOperation("委托书接收") @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -131,4 +131,10 @@ return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } + @ApiOperation("委托书表单打印/导出") + @PostMapping("/form/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.formExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a59f6af..3b092a0 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,6 +36,8 @@ template: calibration: "现场检定审批报告" environmental: "现场环境记录" + testOrder: "检测委托单" + calibrationOrder: "检定或校准委托单" logging: level.root: info diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 28746cf..b247f6b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -88,7 +88,7 @@ return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); } - @ApiOperation("委托书导出") + @ApiOperation("委托书列表导出") @PostMapping("/export") public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { businessOrderService.orderExport(request, response); @@ -115,7 +115,7 @@ @ApiOperation("委托书接收") @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -131,4 +131,10 @@ return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } + @ApiOperation("委托书表单打印/导出") + @PostMapping("/form/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.formExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a59f6af..3b092a0 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,6 +36,8 @@ template: calibration: "现场检定审批报告" environmental: "现场环境记录" + testOrder: "检测委托单" + calibrationOrder: "检定或校准委托单" logging: level.root: info diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java index c27b98e..f8727f9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -3,7 +3,7 @@ public interface CertificatePrintStatusEnum { /** - * 不可打印 + * 可打印 */ String PRINTABLE = "1"; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 28746cf..b247f6b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -88,7 +88,7 @@ return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); } - @ApiOperation("委托书导出") + @ApiOperation("委托书列表导出") @PostMapping("/export") public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { businessOrderService.orderExport(request, response); @@ -115,7 +115,7 @@ @ApiOperation("委托书接收") @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -131,4 +131,10 @@ return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } + @ApiOperation("委托书表单打印/导出") + @PostMapping("/form/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.formExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a59f6af..3b092a0 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,6 +36,8 @@ template: calibration: "现场检定审批报告" environmental: "现场环境记录" + testOrder: "检测委托单" + calibrationOrder: "检定或校准委托单" logging: level.root: info diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java index c27b98e..f8727f9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -3,7 +3,7 @@ public interface CertificatePrintStatusEnum { /** - * 不可打印 + * 可打印 */ String PRINTABLE = "1"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java index a8f1f13..72500d6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java @@ -3,4 +3,6 @@ public interface FilePrintTypeEnum { String TEST_REPORT = "样品内部检校证书"; String CALIBRATION_CERTIFICATE = "自有设备内部检校证书"; + String TEST_ORDER = "检测委托单"; + String CALIBRATION_ORDER = "检定或校准委托单"; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 28746cf..b247f6b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -88,7 +88,7 @@ return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); } - @ApiOperation("委托书导出") + @ApiOperation("委托书列表导出") @PostMapping("/export") public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { businessOrderService.orderExport(request, response); @@ -115,7 +115,7 @@ @ApiOperation("委托书接收") @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -131,4 +131,10 @@ return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } + @ApiOperation("委托书表单打印/导出") + @PostMapping("/form/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.formExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a59f6af..3b092a0 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,6 +36,8 @@ template: calibration: "现场检定审批报告" environmental: "现场环境记录" + testOrder: "检测委托单" + calibrationOrder: "检定或校准委托单" logging: level.root: info diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java index c27b98e..f8727f9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -3,7 +3,7 @@ public interface CertificatePrintStatusEnum { /** - * 不可打印 + * 可打印 */ String PRINTABLE = "1"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java index a8f1f13..72500d6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java @@ -3,4 +3,6 @@ public interface FilePrintTypeEnum { String TEST_REPORT = "样品内部检校证书"; String CALIBRATION_CERTIFICATE = "自有设备内部检校证书"; + String TEST_ORDER = "检测委托单"; + String CALIBRATION_ORDER = "检定或校准委托单"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java index a17b733..f42477a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java @@ -10,10 +10,12 @@ { put(CALIBRATION_CERTIFICATE, CALIBRATION_CERTIFICATE_BEAN); //校准证书 put(TEST_REPORT, TEST_REPORT_BEAN); //测试报告 + put(TEST_ORDER, TEST_ORDER_BEAN); //检测委托单 + put(CALIBRATION_ORDER, CALIBRATION_ORDER_BEAN); //检定或校准委托单 } }); - public HashMap certificateTypeBeanMap; + public HashMap certificateTypeBeanMap; AwareFilePrintTypeEnum(HashMap certificateTypeBeanMap) { this.certificateTypeBeanMap = certificateTypeBeanMap; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 28746cf..b247f6b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -88,7 +88,7 @@ return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); } - @ApiOperation("委托书导出") + @ApiOperation("委托书列表导出") @PostMapping("/export") public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { businessOrderService.orderExport(request, response); @@ -115,7 +115,7 @@ @ApiOperation("委托书接收") @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -131,4 +131,10 @@ return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } + @ApiOperation("委托书表单打印/导出") + @PostMapping("/form/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.formExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a59f6af..3b092a0 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,6 +36,8 @@ template: calibration: "现场检定审批报告" environmental: "现场环境记录" + testOrder: "检测委托单" + calibrationOrder: "检定或校准委托单" logging: level.root: info diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java index c27b98e..f8727f9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -3,7 +3,7 @@ public interface CertificatePrintStatusEnum { /** - * 不可打印 + * 可打印 */ String PRINTABLE = "1"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java index a8f1f13..72500d6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java @@ -3,4 +3,6 @@ public interface FilePrintTypeEnum { String TEST_REPORT = "样品内部检校证书"; String CALIBRATION_CERTIFICATE = "自有设备内部检校证书"; + String TEST_ORDER = "检测委托单"; + String CALIBRATION_ORDER = "检定或校准委托单"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java index a17b733..f42477a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java @@ -10,10 +10,12 @@ { put(CALIBRATION_CERTIFICATE, CALIBRATION_CERTIFICATE_BEAN); //校准证书 put(TEST_REPORT, TEST_REPORT_BEAN); //测试报告 + put(TEST_ORDER, TEST_ORDER_BEAN); //检测委托单 + put(CALIBRATION_ORDER, CALIBRATION_ORDER_BEAN); //检定或校准委托单 } }); - public HashMap certificateTypeBeanMap; + public HashMap certificateTypeBeanMap; AwareFilePrintTypeEnum(HashMap certificateTypeBeanMap) { this.certificateTypeBeanMap = certificateTypeBeanMap; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java index 099faae..bf23ba3 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java @@ -10,5 +10,9 @@ String EXTERNAL_CALIBRATION_FILE_BEAN = "externalCalibrationFile"; String EXTERNAL_ENVIRONMENTAL_RECORD_BEAN = "environmentalRecordData"; + //检测委托单 + String TEST_ORDER_BEAN = "testOrderBean"; + //检定或校准委托单 + String CALIBRATION_ORDER_BEAN = "calibrationOrderBean"; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 28746cf..b247f6b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -88,7 +88,7 @@ return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); } - @ApiOperation("委托书导出") + @ApiOperation("委托书列表导出") @PostMapping("/export") public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { businessOrderService.orderExport(request, response); @@ -115,7 +115,7 @@ @ApiOperation("委托书接收") @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -131,4 +131,10 @@ return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } + @ApiOperation("委托书表单打印/导出") + @PostMapping("/form/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.formExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a59f6af..3b092a0 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,6 +36,8 @@ template: calibration: "现场检定审批报告" environmental: "现场环境记录" + testOrder: "检测委托单" + calibrationOrder: "检定或校准委托单" logging: level.root: info diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java index c27b98e..f8727f9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -3,7 +3,7 @@ public interface CertificatePrintStatusEnum { /** - * 不可打印 + * 可打印 */ String PRINTABLE = "1"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java index a8f1f13..72500d6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java @@ -3,4 +3,6 @@ public interface FilePrintTypeEnum { String TEST_REPORT = "样品内部检校证书"; String CALIBRATION_CERTIFICATE = "自有设备内部检校证书"; + String TEST_ORDER = "检测委托单"; + String CALIBRATION_ORDER = "检定或校准委托单"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java index a17b733..f42477a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java @@ -10,10 +10,12 @@ { put(CALIBRATION_CERTIFICATE, CALIBRATION_CERTIFICATE_BEAN); //校准证书 put(TEST_REPORT, TEST_REPORT_BEAN); //测试报告 + put(TEST_ORDER, TEST_ORDER_BEAN); //检测委托单 + put(CALIBRATION_ORDER, CALIBRATION_ORDER_BEAN); //检定或校准委托单 } }); - public HashMap certificateTypeBeanMap; + public HashMap certificateTypeBeanMap; AwareFilePrintTypeEnum(HashMap certificateTypeBeanMap) { this.certificateTypeBeanMap = certificateTypeBeanMap; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java index 099faae..bf23ba3 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java @@ -10,5 +10,9 @@ String EXTERNAL_CALIBRATION_FILE_BEAN = "externalCalibrationFile"; String EXTERNAL_ENVIRONMENTAL_RECORD_BEAN = "environmentalRecordData"; + //检测委托单 + String TEST_ORDER_BEAN = "testOrderBean"; + //检定或校准委托单 + String CALIBRATION_ORDER_BEAN = "calibrationOrderBean"; } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java index 9fe66ff..6934768 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -36,4 +36,5 @@ List selectPreMonthCountByYear(); + BusinessOrder selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 28746cf..b247f6b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -88,7 +88,7 @@ return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); } - @ApiOperation("委托书导出") + @ApiOperation("委托书列表导出") @PostMapping("/export") public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { businessOrderService.orderExport(request, response); @@ -115,7 +115,7 @@ @ApiOperation("委托书接收") @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -131,4 +131,10 @@ return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } + @ApiOperation("委托书表单打印/导出") + @PostMapping("/form/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.formExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a59f6af..3b092a0 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,6 +36,8 @@ template: calibration: "现场检定审批报告" environmental: "现场环境记录" + testOrder: "检测委托单" + calibrationOrder: "检定或校准委托单" logging: level.root: info diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java index c27b98e..f8727f9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -3,7 +3,7 @@ public interface CertificatePrintStatusEnum { /** - * 不可打印 + * 可打印 */ String PRINTABLE = "1"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java index a8f1f13..72500d6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java @@ -3,4 +3,6 @@ public interface FilePrintTypeEnum { String TEST_REPORT = "样品内部检校证书"; String CALIBRATION_CERTIFICATE = "自有设备内部检校证书"; + String TEST_ORDER = "检测委托单"; + String CALIBRATION_ORDER = "检定或校准委托单"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java index a17b733..f42477a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java @@ -10,10 +10,12 @@ { put(CALIBRATION_CERTIFICATE, CALIBRATION_CERTIFICATE_BEAN); //校准证书 put(TEST_REPORT, TEST_REPORT_BEAN); //测试报告 + put(TEST_ORDER, TEST_ORDER_BEAN); //检测委托单 + put(CALIBRATION_ORDER, CALIBRATION_ORDER_BEAN); //检定或校准委托单 } }); - public HashMap certificateTypeBeanMap; + public HashMap certificateTypeBeanMap; AwareFilePrintTypeEnum(HashMap certificateTypeBeanMap) { this.certificateTypeBeanMap = certificateTypeBeanMap; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java index 099faae..bf23ba3 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java @@ -10,5 +10,9 @@ String EXTERNAL_CALIBRATION_FILE_BEAN = "externalCalibrationFile"; String EXTERNAL_ENVIRONMENTAL_RECORD_BEAN = "environmentalRecordData"; + //检测委托单 + String TEST_ORDER_BEAN = "testOrderBean"; + //检定或校准委托单 + String CALIBRATION_ORDER_BEAN = "calibrationOrderBean"; } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java index 9fe66ff..6934768 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -36,4 +36,5 @@ List selectPreMonthCountByYear(); + BusinessOrder selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml index 0ac2a54..4cf3d9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -6,10 +6,23 @@ + + + + + + + + + + + + + @@ -29,7 +42,9 @@ - id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + id, order_code, order_type, order_time, deliverer_id, deliverer, deliverer_tel, fixed_tel, email, invoice_company, contact_return, direct_return, + need_accord_declare, need_advice, accord_lab, agree_other, staff_no, staff_name, receive_date, deliver_time, plan_deliver_time, + require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 28746cf..b247f6b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -88,7 +88,7 @@ return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); } - @ApiOperation("委托书导出") + @ApiOperation("委托书列表导出") @PostMapping("/export") public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { businessOrderService.orderExport(request, response); @@ -115,7 +115,7 @@ @ApiOperation("委托书接收") @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -131,4 +131,10 @@ return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } + @ApiOperation("委托书表单打印/导出") + @PostMapping("/form/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.formExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a59f6af..3b092a0 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,6 +36,8 @@ template: calibration: "现场检定审批报告" environmental: "现场环境记录" + testOrder: "检测委托单" + calibrationOrder: "检定或校准委托单" logging: level.root: info diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java index c27b98e..f8727f9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -3,7 +3,7 @@ public interface CertificatePrintStatusEnum { /** - * 不可打印 + * 可打印 */ String PRINTABLE = "1"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java index a8f1f13..72500d6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java @@ -3,4 +3,6 @@ public interface FilePrintTypeEnum { String TEST_REPORT = "样品内部检校证书"; String CALIBRATION_CERTIFICATE = "自有设备内部检校证书"; + String TEST_ORDER = "检测委托单"; + String CALIBRATION_ORDER = "检定或校准委托单"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java index a17b733..f42477a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java @@ -10,10 +10,12 @@ { put(CALIBRATION_CERTIFICATE, CALIBRATION_CERTIFICATE_BEAN); //校准证书 put(TEST_REPORT, TEST_REPORT_BEAN); //测试报告 + put(TEST_ORDER, TEST_ORDER_BEAN); //检测委托单 + put(CALIBRATION_ORDER, CALIBRATION_ORDER_BEAN); //检定或校准委托单 } }); - public HashMap certificateTypeBeanMap; + public HashMap certificateTypeBeanMap; AwareFilePrintTypeEnum(HashMap certificateTypeBeanMap) { this.certificateTypeBeanMap = certificateTypeBeanMap; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java index 099faae..bf23ba3 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java @@ -10,5 +10,9 @@ String EXTERNAL_CALIBRATION_FILE_BEAN = "externalCalibrationFile"; String EXTERNAL_ENVIRONMENTAL_RECORD_BEAN = "environmentalRecordData"; + //检测委托单 + String TEST_ORDER_BEAN = "testOrderBean"; + //检定或校准委托单 + String CALIBRATION_ORDER_BEAN = "calibrationOrderBean"; } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java index 9fe66ff..6934768 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -36,4 +36,5 @@ List selectPreMonthCountByYear(); + BusinessOrder selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml index 0ac2a54..4cf3d9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -6,10 +6,23 @@ + + + + + + + + + + + + + @@ -29,7 +42,9 @@ - id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + id, order_code, order_type, order_time, deliverer_id, deliverer, deliverer_tel, fixed_tel, email, invoice_company, contact_return, direct_return, + need_accord_declare, need_advice, accord_lab, agree_other, staff_no, staff_name, receive_date, deliver_time, plan_deliver_time, + require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml index c0a59ae..7cbcf70 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml @@ -35,8 +35,8 @@ and boc.certificate_name like concat('%',#{request.certificateName},'%') - - and csi.sample_no like concat('%',#{request.sampleNo},'%') + + and csi.manufacturing_no like concat('%',#{request.manufacturingNo},'%') and csi.sample_name like concat('%',#{request.sampleName},'%') diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 28746cf..b247f6b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -88,7 +88,7 @@ return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); } - @ApiOperation("委托书导出") + @ApiOperation("委托书列表导出") @PostMapping("/export") public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { businessOrderService.orderExport(request, response); @@ -115,7 +115,7 @@ @ApiOperation("委托书接收") @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -131,4 +131,10 @@ return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } + @ApiOperation("委托书表单打印/导出") + @PostMapping("/form/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.formExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a59f6af..3b092a0 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,6 +36,8 @@ template: calibration: "现场检定审批报告" environmental: "现场环境记录" + testOrder: "检测委托单" + calibrationOrder: "检定或校准委托单" logging: level.root: info diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java index c27b98e..f8727f9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -3,7 +3,7 @@ public interface CertificatePrintStatusEnum { /** - * 不可打印 + * 可打印 */ String PRINTABLE = "1"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java index a8f1f13..72500d6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java @@ -3,4 +3,6 @@ public interface FilePrintTypeEnum { String TEST_REPORT = "样品内部检校证书"; String CALIBRATION_CERTIFICATE = "自有设备内部检校证书"; + String TEST_ORDER = "检测委托单"; + String CALIBRATION_ORDER = "检定或校准委托单"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java index a17b733..f42477a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java @@ -10,10 +10,12 @@ { put(CALIBRATION_CERTIFICATE, CALIBRATION_CERTIFICATE_BEAN); //校准证书 put(TEST_REPORT, TEST_REPORT_BEAN); //测试报告 + put(TEST_ORDER, TEST_ORDER_BEAN); //检测委托单 + put(CALIBRATION_ORDER, CALIBRATION_ORDER_BEAN); //检定或校准委托单 } }); - public HashMap certificateTypeBeanMap; + public HashMap certificateTypeBeanMap; AwareFilePrintTypeEnum(HashMap certificateTypeBeanMap) { this.certificateTypeBeanMap = certificateTypeBeanMap; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java index 099faae..bf23ba3 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java @@ -10,5 +10,9 @@ String EXTERNAL_CALIBRATION_FILE_BEAN = "externalCalibrationFile"; String EXTERNAL_ENVIRONMENTAL_RECORD_BEAN = "environmentalRecordData"; + //检测委托单 + String TEST_ORDER_BEAN = "testOrderBean"; + //检定或校准委托单 + String CALIBRATION_ORDER_BEAN = "calibrationOrderBean"; } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java index 9fe66ff..6934768 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -36,4 +36,5 @@ List selectPreMonthCountByYear(); + BusinessOrder selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml index 0ac2a54..4cf3d9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -6,10 +6,23 @@ + + + + + + + + + + + + + @@ -29,7 +42,9 @@ - id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + id, order_code, order_type, order_time, deliverer_id, deliverer, deliverer_tel, fixed_tel, email, invoice_company, contact_return, direct_return, + need_accord_declare, need_advice, accord_lab, agree_other, staff_no, staff_name, receive_date, deliver_time, plan_deliver_time, + require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml index c0a59ae..7cbcf70 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml @@ -35,8 +35,8 @@ and boc.certificate_name like concat('%',#{request.certificateName},'%') - - and csi.sample_no like concat('%',#{request.sampleNo},'%') + + and csi.manufacturing_no like concat('%',#{request.manufacturingNo},'%') and csi.sample_name like concat('%',#{request.sampleName},'%') diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index e5f948e..8a4774e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -108,6 +108,8 @@ */ //委托书状态 String ORDER_STATUS = "orderStatus"; + //委托书类型 + String ORDER_TYPE = "orderType"; //检测状态 String MEASURE_STATUS = "measureStatus"; //打印状态 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 28746cf..b247f6b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -88,7 +88,7 @@ return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); } - @ApiOperation("委托书导出") + @ApiOperation("委托书列表导出") @PostMapping("/export") public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { businessOrderService.orderExport(request, response); @@ -115,7 +115,7 @@ @ApiOperation("委托书接收") @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -131,4 +131,10 @@ return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } + @ApiOperation("委托书表单打印/导出") + @PostMapping("/form/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.formExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a59f6af..3b092a0 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,6 +36,8 @@ template: calibration: "现场检定审批报告" environmental: "现场环境记录" + testOrder: "检测委托单" + calibrationOrder: "检定或校准委托单" logging: level.root: info diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java index c27b98e..f8727f9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -3,7 +3,7 @@ public interface CertificatePrintStatusEnum { /** - * 不可打印 + * 可打印 */ String PRINTABLE = "1"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java index a8f1f13..72500d6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java @@ -3,4 +3,6 @@ public interface FilePrintTypeEnum { String TEST_REPORT = "样品内部检校证书"; String CALIBRATION_CERTIFICATE = "自有设备内部检校证书"; + String TEST_ORDER = "检测委托单"; + String CALIBRATION_ORDER = "检定或校准委托单"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java index a17b733..f42477a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java @@ -10,10 +10,12 @@ { put(CALIBRATION_CERTIFICATE, CALIBRATION_CERTIFICATE_BEAN); //校准证书 put(TEST_REPORT, TEST_REPORT_BEAN); //测试报告 + put(TEST_ORDER, TEST_ORDER_BEAN); //检测委托单 + put(CALIBRATION_ORDER, CALIBRATION_ORDER_BEAN); //检定或校准委托单 } }); - public HashMap certificateTypeBeanMap; + public HashMap certificateTypeBeanMap; AwareFilePrintTypeEnum(HashMap certificateTypeBeanMap) { this.certificateTypeBeanMap = certificateTypeBeanMap; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java index 099faae..bf23ba3 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java @@ -10,5 +10,9 @@ String EXTERNAL_CALIBRATION_FILE_BEAN = "externalCalibrationFile"; String EXTERNAL_ENVIRONMENTAL_RECORD_BEAN = "environmentalRecordData"; + //检测委托单 + String TEST_ORDER_BEAN = "testOrderBean"; + //检定或校准委托单 + String CALIBRATION_ORDER_BEAN = "calibrationOrderBean"; } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java index 9fe66ff..6934768 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -36,4 +36,5 @@ List selectPreMonthCountByYear(); + BusinessOrder selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml index 0ac2a54..4cf3d9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -6,10 +6,23 @@ + + + + + + + + + + + + + @@ -29,7 +42,9 @@ - id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + id, order_code, order_type, order_time, deliverer_id, deliverer, deliverer_tel, fixed_tel, email, invoice_company, contact_return, direct_return, + need_accord_declare, need_advice, accord_lab, agree_other, staff_no, staff_name, receive_date, deliver_time, plan_deliver_time, + require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml index c0a59ae..7cbcf70 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml @@ -35,8 +35,8 @@ and boc.certificate_name like concat('%',#{request.certificateName},'%') - - and csi.sample_no like concat('%',#{request.sampleNo},'%') + + and csi.manufacturing_no like concat('%',#{request.manufacturingNo},'%') and csi.sample_name like concat('%',#{request.sampleName},'%') diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index e5f948e..8a4774e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -108,6 +108,8 @@ */ //委托书状态 String ORDER_STATUS = "orderStatus"; + //委托书类型 + String ORDER_TYPE = "orderType"; //检测状态 String MEASURE_STATUS = "measureStatus"; //打印状态 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java index 7fa62b6..80765bf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java @@ -30,6 +30,14 @@ @ExcelProperty(value = "委托书编号",order = 0) private String orderCode; + @ApiModelProperty(value = "委托书类型-字典code（1检测委托单，2检定或校准委托单）（检测委托单不出证书，检定或校准委托单出具证书）", dataType = "String") + @DictCodeField(message = "接收状态不合法", cacheName = MeterDictCode.ORDER_TYPE) + private String orderType; + + @ApiModelProperty(value = "委托书类型-字典value", dataType = "String") + @TableField(exist = false) + private String orderTypeName; + @ApiModelProperty(value = "委托方id", dataType = "String") // @ExcelProperty(value = "委托方id",order = 1) private String customerId; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 28746cf..b247f6b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -88,7 +88,7 @@ return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); } - @ApiOperation("委托书导出") + @ApiOperation("委托书列表导出") @PostMapping("/export") public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { businessOrderService.orderExport(request, response); @@ -115,7 +115,7 @@ @ApiOperation("委托书接收") @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -131,4 +131,10 @@ return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } + @ApiOperation("委托书表单打印/导出") + @PostMapping("/form/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.formExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a59f6af..3b092a0 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,6 +36,8 @@ template: calibration: "现场检定审批报告" environmental: "现场环境记录" + testOrder: "检测委托单" + calibrationOrder: "检定或校准委托单" logging: level.root: info diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java index c27b98e..f8727f9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -3,7 +3,7 @@ public interface CertificatePrintStatusEnum { /** - * 不可打印 + * 可打印 */ String PRINTABLE = "1"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java index a8f1f13..72500d6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java @@ -3,4 +3,6 @@ public interface FilePrintTypeEnum { String TEST_REPORT = "样品内部检校证书"; String CALIBRATION_CERTIFICATE = "自有设备内部检校证书"; + String TEST_ORDER = "检测委托单"; + String CALIBRATION_ORDER = "检定或校准委托单"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java index a17b733..f42477a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java @@ -10,10 +10,12 @@ { put(CALIBRATION_CERTIFICATE, CALIBRATION_CERTIFICATE_BEAN); //校准证书 put(TEST_REPORT, TEST_REPORT_BEAN); //测试报告 + put(TEST_ORDER, TEST_ORDER_BEAN); //检测委托单 + put(CALIBRATION_ORDER, CALIBRATION_ORDER_BEAN); //检定或校准委托单 } }); - public HashMap certificateTypeBeanMap; + public HashMap certificateTypeBeanMap; AwareFilePrintTypeEnum(HashMap certificateTypeBeanMap) { this.certificateTypeBeanMap = certificateTypeBeanMap; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java index 099faae..bf23ba3 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java @@ -10,5 +10,9 @@ String EXTERNAL_CALIBRATION_FILE_BEAN = "externalCalibrationFile"; String EXTERNAL_ENVIRONMENTAL_RECORD_BEAN = "environmentalRecordData"; + //检测委托单 + String TEST_ORDER_BEAN = "testOrderBean"; + //检定或校准委托单 + String CALIBRATION_ORDER_BEAN = "calibrationOrderBean"; } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java index 9fe66ff..6934768 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -36,4 +36,5 @@ List selectPreMonthCountByYear(); + BusinessOrder selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml index 0ac2a54..4cf3d9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -6,10 +6,23 @@ + + + + + + + + + + + + + @@ -29,7 +42,9 @@ - id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + id, order_code, order_type, order_time, deliverer_id, deliverer, deliverer_tel, fixed_tel, email, invoice_company, contact_return, direct_return, + need_accord_declare, need_advice, accord_lab, agree_other, staff_no, staff_name, receive_date, deliver_time, plan_deliver_time, + require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml index c0a59ae..7cbcf70 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml @@ -35,8 +35,8 @@ and boc.certificate_name like concat('%',#{request.certificateName},'%') - - and csi.sample_no like concat('%',#{request.sampleNo},'%') + + and csi.manufacturing_no like concat('%',#{request.manufacturingNo},'%') and csi.sample_name like concat('%',#{request.sampleName},'%') diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index e5f948e..8a4774e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -108,6 +108,8 @@ */ //委托书状态 String ORDER_STATUS = "orderStatus"; + //委托书类型 + String ORDER_TYPE = "orderType"; //检测状态 String MEASURE_STATUS = "measureStatus"; //打印状态 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java index 7fa62b6..80765bf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java @@ -30,6 +30,14 @@ @ExcelProperty(value = "委托书编号",order = 0) private String orderCode; + @ApiModelProperty(value = "委托书类型-字典code（1检测委托单，2检定或校准委托单）（检测委托单不出证书，检定或校准委托单出具证书）", dataType = "String") + @DictCodeField(message = "接收状态不合法", cacheName = MeterDictCode.ORDER_TYPE) + private String orderType; + + @ApiModelProperty(value = "委托书类型-字典value", dataType = "String") + @TableField(exist = false) + private String orderTypeName; + @ApiModelProperty(value = "委托方id", dataType = "String") // @ExcelProperty(value = "委托方id",order = 1) private String customerId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java index ac8351b..f0ced78 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java @@ -20,8 +20,8 @@ @ApiModelProperty(value = "证书名称", dataType = "String") private String certificateName; - @ApiModelProperty(value = "样品编号", dataType = "String") - private String sampleNo; + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; @ApiModelProperty(value = "样品名称", dataType = "String") private String sampleName; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 28746cf..b247f6b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -88,7 +88,7 @@ return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); } - @ApiOperation("委托书导出") + @ApiOperation("委托书列表导出") @PostMapping("/export") public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { businessOrderService.orderExport(request, response); @@ -115,7 +115,7 @@ @ApiOperation("委托书接收") @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -131,4 +131,10 @@ return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } + @ApiOperation("委托书表单打印/导出") + @PostMapping("/form/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.formExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a59f6af..3b092a0 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,6 +36,8 @@ template: calibration: "现场检定审批报告" environmental: "现场环境记录" + testOrder: "检测委托单" + calibrationOrder: "检定或校准委托单" logging: level.root: info diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java index c27b98e..f8727f9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -3,7 +3,7 @@ public interface CertificatePrintStatusEnum { /** - * 不可打印 + * 可打印 */ String PRINTABLE = "1"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java index a8f1f13..72500d6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java @@ -3,4 +3,6 @@ public interface FilePrintTypeEnum { String TEST_REPORT = "样品内部检校证书"; String CALIBRATION_CERTIFICATE = "自有设备内部检校证书"; + String TEST_ORDER = "检测委托单"; + String CALIBRATION_ORDER = "检定或校准委托单"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java index a17b733..f42477a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java @@ -10,10 +10,12 @@ { put(CALIBRATION_CERTIFICATE, CALIBRATION_CERTIFICATE_BEAN); //校准证书 put(TEST_REPORT, TEST_REPORT_BEAN); //测试报告 + put(TEST_ORDER, TEST_ORDER_BEAN); //检测委托单 + put(CALIBRATION_ORDER, CALIBRATION_ORDER_BEAN); //检定或校准委托单 } }); - public HashMap certificateTypeBeanMap; + public HashMap certificateTypeBeanMap; AwareFilePrintTypeEnum(HashMap certificateTypeBeanMap) { this.certificateTypeBeanMap = certificateTypeBeanMap; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java index 099faae..bf23ba3 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java @@ -10,5 +10,9 @@ String EXTERNAL_CALIBRATION_FILE_BEAN = "externalCalibrationFile"; String EXTERNAL_ENVIRONMENTAL_RECORD_BEAN = "environmentalRecordData"; + //检测委托单 + String TEST_ORDER_BEAN = "testOrderBean"; + //检定或校准委托单 + String CALIBRATION_ORDER_BEAN = "calibrationOrderBean"; } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java index 9fe66ff..6934768 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -36,4 +36,5 @@ List selectPreMonthCountByYear(); + BusinessOrder selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml index 0ac2a54..4cf3d9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -6,10 +6,23 @@ + + + + + + + + + + + + + @@ -29,7 +42,9 @@ - id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + id, order_code, order_type, order_time, deliverer_id, deliverer, deliverer_tel, fixed_tel, email, invoice_company, contact_return, direct_return, + need_accord_declare, need_advice, accord_lab, agree_other, staff_no, staff_name, receive_date, deliver_time, plan_deliver_time, + require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml index c0a59ae..7cbcf70 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml @@ -35,8 +35,8 @@ and boc.certificate_name like concat('%',#{request.certificateName},'%') - - and csi.sample_no like concat('%',#{request.sampleNo},'%') + + and csi.manufacturing_no like concat('%',#{request.manufacturingNo},'%') and csi.sample_name like concat('%',#{request.sampleName},'%') diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index e5f948e..8a4774e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -108,6 +108,8 @@ */ //委托书状态 String ORDER_STATUS = "orderStatus"; + //委托书类型 + String ORDER_TYPE = "orderType"; //检测状态 String MEASURE_STATUS = "measureStatus"; //打印状态 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java index 7fa62b6..80765bf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java @@ -30,6 +30,14 @@ @ExcelProperty(value = "委托书编号",order = 0) private String orderCode; + @ApiModelProperty(value = "委托书类型-字典code（1检测委托单，2检定或校准委托单）（检测委托单不出证书，检定或校准委托单出具证书）", dataType = "String") + @DictCodeField(message = "接收状态不合法", cacheName = MeterDictCode.ORDER_TYPE) + private String orderType; + + @ApiModelProperty(value = "委托书类型-字典value", dataType = "String") + @TableField(exist = false) + private String orderTypeName; + @ApiModelProperty(value = "委托方id", dataType = "String") // @ExcelProperty(value = "委托方id",order = 1) private String customerId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java index ac8351b..f0ced78 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java @@ -20,8 +20,8 @@ @ApiModelProperty(value = "证书名称", dataType = "String") private String certificateName; - @ApiModelProperty(value = "样品编号", dataType = "String") - private String sampleNo; + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; @ApiModelProperty(value = "样品名称", dataType = "String") private String sampleName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java index 7f126f9..965bc72 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.model.customer.CustomerSampleInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -33,6 +35,14 @@ @ApiModelProperty(value = "委托书编号", dataType = "String") private String orderCode; + @ApiModelProperty(value = "委托书类型-字典code（1检测委托单，2检定或校准委托单）（检测委托单不出证书，检定或校准委托单出具证书）", dataType = "String") + @DictCodeField(message = "委托书类型不合法", cacheName = MeterDictCode.ORDER_TYPE) + private String orderType; + + @ApiModelProperty(value = "委托书类型-字典value", dataType = "String") + @TableField(exist = false) + private String orderTypeName; + @ApiModelProperty(value = "委托日期", dataType = "String") private String orderTime; @@ -41,20 +51,68 @@ private Long delivererId; @TableField("deliverer") - @ApiModelProperty(value = "送样人/送检人", dataType = "String") + @ApiModelProperty(value = "送样人/送检人/联系人", dataType = "String") private String deliverer; @TableField("deliverer_tel") - @ApiModelProperty(value = "送样人联系方式", dataType = "String") + @ApiModelProperty(value = "移动电话", dataType = "String") private String delivererTel; + @TableField("fixed_tel") + @ApiModelProperty(value = "固定电话", dataType = "String") + private String fixedTel; + + @TableField("email") + @ApiModelProperty(value = "电子邮件/QQ", dataType = "String") + private String email; + + @TableField("invoice_company") + @ApiModelProperty(value = "发票单位名称", dataType = "String") + private String invoiceCompany; + + @TableField("contact_return") + @ApiModelProperty(value = "需联络后再做退件处理（1/0）", dataType = "Integer") + private Integer contactReturn; + + @TableField("direct_return") + @ApiModelProperty(value = "直接退件处理（1/0）", dataType = "Integer") + private Integer directReturn; + + @TableField("need_accord_declare") + @ApiModelProperty(value = "需要符合性声明（1/0）", dataType = "Integer") + private Integer needAccordDeclare; + + @TableField("need_advice") + @ApiModelProperty(value = "需要建议再校准日期（1/0）", dataType = "Integer") + private Integer needAdvice; + + @TableField("accord_lab") + @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准（1/0）", dataType = "Integer") + private Integer accordLab; + + @TableField("agree_other") + @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0）", dataType = "Integer") + private Integer agreeOther; + + @TableField("staff_no") + @ApiModelProperty(value = "收件人工号（计量人员编号）", dataType = "String") + private String staffNo; + + @TableField("staff_name") + @ApiModelProperty(value = "收件人姓名", dataType = "String") + private String staffName; + + @TableField("receive_date") + @ApiModelProperty(value = "收件日期", dataType = "String") + private String receiveDate; + @ApiModelProperty(value = "送检时间", dataType = "String") private String deliverTime; @ApiModelProperty(value = "预约送达时间", dataType = "String") private String planDeliverTime; - @ApiModelProperty(value = "要求检完时间", dataType = "String") + @ApiModelProperty(value = "预约取样时间/要求检完时间", dataType = "String") private String requireOverTime; @ApiModelProperty(value = "委托方id（客户id）", dataType = "Long") @@ -111,4 +169,8 @@ @TableField(exist = false) private List customerSampleInfoList = new ArrayList<>(); + @TableField(exist = false) + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 28746cf..b247f6b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -88,7 +88,7 @@ return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); } - @ApiOperation("委托书导出") + @ApiOperation("委托书列表导出") @PostMapping("/export") public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { businessOrderService.orderExport(request, response); @@ -115,7 +115,7 @@ @ApiOperation("委托书接收") @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -131,4 +131,10 @@ return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } + @ApiOperation("委托书表单打印/导出") + @PostMapping("/form/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.formExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a59f6af..3b092a0 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,6 +36,8 @@ template: calibration: "现场检定审批报告" environmental: "现场环境记录" + testOrder: "检测委托单" + calibrationOrder: "检定或校准委托单" logging: level.root: info diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java index c27b98e..f8727f9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -3,7 +3,7 @@ public interface CertificatePrintStatusEnum { /** - * 不可打印 + * 可打印 */ String PRINTABLE = "1"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java index a8f1f13..72500d6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java @@ -3,4 +3,6 @@ public interface FilePrintTypeEnum { String TEST_REPORT = "样品内部检校证书"; String CALIBRATION_CERTIFICATE = "自有设备内部检校证书"; + String TEST_ORDER = "检测委托单"; + String CALIBRATION_ORDER = "检定或校准委托单"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java index a17b733..f42477a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java @@ -10,10 +10,12 @@ { put(CALIBRATION_CERTIFICATE, CALIBRATION_CERTIFICATE_BEAN); //校准证书 put(TEST_REPORT, TEST_REPORT_BEAN); //测试报告 + put(TEST_ORDER, TEST_ORDER_BEAN); //检测委托单 + put(CALIBRATION_ORDER, CALIBRATION_ORDER_BEAN); //检定或校准委托单 } }); - public HashMap certificateTypeBeanMap; + public HashMap certificateTypeBeanMap; AwareFilePrintTypeEnum(HashMap certificateTypeBeanMap) { this.certificateTypeBeanMap = certificateTypeBeanMap; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java index 099faae..bf23ba3 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java @@ -10,5 +10,9 @@ String EXTERNAL_CALIBRATION_FILE_BEAN = "externalCalibrationFile"; String EXTERNAL_ENVIRONMENTAL_RECORD_BEAN = "environmentalRecordData"; + //检测委托单 + String TEST_ORDER_BEAN = "testOrderBean"; + //检定或校准委托单 + String CALIBRATION_ORDER_BEAN = "calibrationOrderBean"; } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java index 9fe66ff..6934768 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -36,4 +36,5 @@ List selectPreMonthCountByYear(); + BusinessOrder selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml index 0ac2a54..4cf3d9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -6,10 +6,23 @@ + + + + + + + + + + + + + @@ -29,7 +42,9 @@ - id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + id, order_code, order_type, order_time, deliverer_id, deliverer, deliverer_tel, fixed_tel, email, invoice_company, contact_return, direct_return, + need_accord_declare, need_advice, accord_lab, agree_other, staff_no, staff_name, receive_date, deliver_time, plan_deliver_time, + require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml index c0a59ae..7cbcf70 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml @@ -35,8 +35,8 @@ and boc.certificate_name like concat('%',#{request.certificateName},'%') - - and csi.sample_no like concat('%',#{request.sampleNo},'%') + + and csi.manufacturing_no like concat('%',#{request.manufacturingNo},'%') and csi.sample_name like concat('%',#{request.sampleName},'%') diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index e5f948e..8a4774e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -108,6 +108,8 @@ */ //委托书状态 String ORDER_STATUS = "orderStatus"; + //委托书类型 + String ORDER_TYPE = "orderType"; //检测状态 String MEASURE_STATUS = "measureStatus"; //打印状态 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java index 7fa62b6..80765bf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java @@ -30,6 +30,14 @@ @ExcelProperty(value = "委托书编号",order = 0) private String orderCode; + @ApiModelProperty(value = "委托书类型-字典code（1检测委托单，2检定或校准委托单）（检测委托单不出证书，检定或校准委托单出具证书）", dataType = "String") + @DictCodeField(message = "接收状态不合法", cacheName = MeterDictCode.ORDER_TYPE) + private String orderType; + + @ApiModelProperty(value = "委托书类型-字典value", dataType = "String") + @TableField(exist = false) + private String orderTypeName; + @ApiModelProperty(value = "委托方id", dataType = "String") // @ExcelProperty(value = "委托方id",order = 1) private String customerId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java index ac8351b..f0ced78 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java @@ -20,8 +20,8 @@ @ApiModelProperty(value = "证书名称", dataType = "String") private String certificateName; - @ApiModelProperty(value = "样品编号", dataType = "String") - private String sampleNo; + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; @ApiModelProperty(value = "样品名称", dataType = "String") private String sampleName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java index 7f126f9..965bc72 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.model.customer.CustomerSampleInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -33,6 +35,14 @@ @ApiModelProperty(value = "委托书编号", dataType = "String") private String orderCode; + @ApiModelProperty(value = "委托书类型-字典code（1检测委托单，2检定或校准委托单）（检测委托单不出证书，检定或校准委托单出具证书）", dataType = "String") + @DictCodeField(message = "委托书类型不合法", cacheName = MeterDictCode.ORDER_TYPE) + private String orderType; + + @ApiModelProperty(value = "委托书类型-字典value", dataType = "String") + @TableField(exist = false) + private String orderTypeName; + @ApiModelProperty(value = "委托日期", dataType = "String") private String orderTime; @@ -41,20 +51,68 @@ private Long delivererId; @TableField("deliverer") - @ApiModelProperty(value = "送样人/送检人", dataType = "String") + @ApiModelProperty(value = "送样人/送检人/联系人", dataType = "String") private String deliverer; @TableField("deliverer_tel") - @ApiModelProperty(value = "送样人联系方式", dataType = "String") + @ApiModelProperty(value = "移动电话", dataType = "String") private String delivererTel; + @TableField("fixed_tel") + @ApiModelProperty(value = "固定电话", dataType = "String") + private String fixedTel; + + @TableField("email") + @ApiModelProperty(value = "电子邮件/QQ", dataType = "String") + private String email; + + @TableField("invoice_company") + @ApiModelProperty(value = "发票单位名称", dataType = "String") + private String invoiceCompany; + + @TableField("contact_return") + @ApiModelProperty(value = "需联络后再做退件处理（1/0）", dataType = "Integer") + private Integer contactReturn; + + @TableField("direct_return") + @ApiModelProperty(value = "直接退件处理（1/0）", dataType = "Integer") + private Integer directReturn; + + @TableField("need_accord_declare") + @ApiModelProperty(value = "需要符合性声明（1/0）", dataType = "Integer") + private Integer needAccordDeclare; + + @TableField("need_advice") + @ApiModelProperty(value = "需要建议再校准日期（1/0）", dataType = "Integer") + private Integer needAdvice; + + @TableField("accord_lab") + @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准（1/0）", dataType = "Integer") + private Integer accordLab; + + @TableField("agree_other") + @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0）", dataType = "Integer") + private Integer agreeOther; + + @TableField("staff_no") + @ApiModelProperty(value = "收件人工号（计量人员编号）", dataType = "String") + private String staffNo; + + @TableField("staff_name") + @ApiModelProperty(value = "收件人姓名", dataType = "String") + private String staffName; + + @TableField("receive_date") + @ApiModelProperty(value = "收件日期", dataType = "String") + private String receiveDate; + @ApiModelProperty(value = "送检时间", dataType = "String") private String deliverTime; @ApiModelProperty(value = "预约送达时间", dataType = "String") private String planDeliverTime; - @ApiModelProperty(value = "要求检完时间", dataType = "String") + @ApiModelProperty(value = "预约取样时间/要求检完时间", dataType = "String") private String requireOverTime; @ApiModelProperty(value = "委托方id（客户id）", dataType = "Long") @@ -111,4 +169,8 @@ @TableField(exist = false) private List customerSampleInfoList = new ArrayList<>(); + @TableField(exist = false) + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java index 19b348a..79f1880 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -49,7 +49,7 @@ @ApiModelProperty(value = "样品型号", dataType = "String") private String sampleModel; - @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + @ApiModelProperty(value = "出厂编号/仪器编号-判重依据", dataType = "String") private String manufacturingNo; @ApiModelProperty(value = "生产厂家", dataType = "String") @@ -93,9 +93,15 @@ @TableField(exist = false) private String measureCategoryName; - @ApiModelProperty(value = "检定项目", dataType = "String") + @ApiModelProperty(value = "外观状态", dataType = "String") + private String appearanceStatus; + + @ApiModelProperty(value = "检定项目/检测项目", dataType = "String") private String measureContent; + @ApiModelProperty(value = "检测依据标准", dataType = "String") + private String accordStandard; + @ApiModelProperty(value = "检定周期(月)", dataType = "String") private String measurePeriod; @@ -158,4 +164,7 @@ @TableField(exist = false) @ApiModelProperty(value = "委托书样品关联表id", dataType = "Long") private Long relationId; + + @TableField(exist = false) + private int seq; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 28746cf..b247f6b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -88,7 +88,7 @@ return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); } - @ApiOperation("委托书导出") + @ApiOperation("委托书列表导出") @PostMapping("/export") public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { businessOrderService.orderExport(request, response); @@ -115,7 +115,7 @@ @ApiOperation("委托书接收") @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -131,4 +131,10 @@ return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } + @ApiOperation("委托书表单打印/导出") + @PostMapping("/form/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.formExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a59f6af..3b092a0 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,6 +36,8 @@ template: calibration: "现场检定审批报告" environmental: "现场环境记录" + testOrder: "检测委托单" + calibrationOrder: "检定或校准委托单" logging: level.root: info diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java index c27b98e..f8727f9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -3,7 +3,7 @@ public interface CertificatePrintStatusEnum { /** - * 不可打印 + * 可打印 */ String PRINTABLE = "1"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java index a8f1f13..72500d6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java @@ -3,4 +3,6 @@ public interface FilePrintTypeEnum { String TEST_REPORT = "样品内部检校证书"; String CALIBRATION_CERTIFICATE = "自有设备内部检校证书"; + String TEST_ORDER = "检测委托单"; + String CALIBRATION_ORDER = "检定或校准委托单"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java index a17b733..f42477a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java @@ -10,10 +10,12 @@ { put(CALIBRATION_CERTIFICATE, CALIBRATION_CERTIFICATE_BEAN); //校准证书 put(TEST_REPORT, TEST_REPORT_BEAN); //测试报告 + put(TEST_ORDER, TEST_ORDER_BEAN); //检测委托单 + put(CALIBRATION_ORDER, CALIBRATION_ORDER_BEAN); //检定或校准委托单 } }); - public HashMap certificateTypeBeanMap; + public HashMap certificateTypeBeanMap; AwareFilePrintTypeEnum(HashMap certificateTypeBeanMap) { this.certificateTypeBeanMap = certificateTypeBeanMap; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java index 099faae..bf23ba3 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java @@ -10,5 +10,9 @@ String EXTERNAL_CALIBRATION_FILE_BEAN = "externalCalibrationFile"; String EXTERNAL_ENVIRONMENTAL_RECORD_BEAN = "environmentalRecordData"; + //检测委托单 + String TEST_ORDER_BEAN = "testOrderBean"; + //检定或校准委托单 + String CALIBRATION_ORDER_BEAN = "calibrationOrderBean"; } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java index 9fe66ff..6934768 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -36,4 +36,5 @@ List selectPreMonthCountByYear(); + BusinessOrder selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml index 0ac2a54..4cf3d9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -6,10 +6,23 @@ + + + + + + + + + + + + + @@ -29,7 +42,9 @@ - id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + id, order_code, order_type, order_time, deliverer_id, deliverer, deliverer_tel, fixed_tel, email, invoice_company, contact_return, direct_return, + need_accord_declare, need_advice, accord_lab, agree_other, staff_no, staff_name, receive_date, deliver_time, plan_deliver_time, + require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml index c0a59ae..7cbcf70 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml @@ -35,8 +35,8 @@ and boc.certificate_name like concat('%',#{request.certificateName},'%') - - and csi.sample_no like concat('%',#{request.sampleNo},'%') + + and csi.manufacturing_no like concat('%',#{request.manufacturingNo},'%') and csi.sample_name like concat('%',#{request.sampleName},'%') diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index e5f948e..8a4774e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -108,6 +108,8 @@ */ //委托书状态 String ORDER_STATUS = "orderStatus"; + //委托书类型 + String ORDER_TYPE = "orderType"; //检测状态 String MEASURE_STATUS = "measureStatus"; //打印状态 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java index 7fa62b6..80765bf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java @@ -30,6 +30,14 @@ @ExcelProperty(value = "委托书编号",order = 0) private String orderCode; + @ApiModelProperty(value = "委托书类型-字典code（1检测委托单，2检定或校准委托单）（检测委托单不出证书，检定或校准委托单出具证书）", dataType = "String") + @DictCodeField(message = "接收状态不合法", cacheName = MeterDictCode.ORDER_TYPE) + private String orderType; + + @ApiModelProperty(value = "委托书类型-字典value", dataType = "String") + @TableField(exist = false) + private String orderTypeName; + @ApiModelProperty(value = "委托方id", dataType = "String") // @ExcelProperty(value = "委托方id",order = 1) private String customerId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java index ac8351b..f0ced78 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java @@ -20,8 +20,8 @@ @ApiModelProperty(value = "证书名称", dataType = "String") private String certificateName; - @ApiModelProperty(value = "样品编号", dataType = "String") - private String sampleNo; + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; @ApiModelProperty(value = "样品名称", dataType = "String") private String sampleName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java index 7f126f9..965bc72 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.model.customer.CustomerSampleInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -33,6 +35,14 @@ @ApiModelProperty(value = "委托书编号", dataType = "String") private String orderCode; + @ApiModelProperty(value = "委托书类型-字典code（1检测委托单，2检定或校准委托单）（检测委托单不出证书，检定或校准委托单出具证书）", dataType = "String") + @DictCodeField(message = "委托书类型不合法", cacheName = MeterDictCode.ORDER_TYPE) + private String orderType; + + @ApiModelProperty(value = "委托书类型-字典value", dataType = "String") + @TableField(exist = false) + private String orderTypeName; + @ApiModelProperty(value = "委托日期", dataType = "String") private String orderTime; @@ -41,20 +51,68 @@ private Long delivererId; @TableField("deliverer") - @ApiModelProperty(value = "送样人/送检人", dataType = "String") + @ApiModelProperty(value = "送样人/送检人/联系人", dataType = "String") private String deliverer; @TableField("deliverer_tel") - @ApiModelProperty(value = "送样人联系方式", dataType = "String") + @ApiModelProperty(value = "移动电话", dataType = "String") private String delivererTel; + @TableField("fixed_tel") + @ApiModelProperty(value = "固定电话", dataType = "String") + private String fixedTel; + + @TableField("email") + @ApiModelProperty(value = "电子邮件/QQ", dataType = "String") + private String email; + + @TableField("invoice_company") + @ApiModelProperty(value = "发票单位名称", dataType = "String") + private String invoiceCompany; + + @TableField("contact_return") + @ApiModelProperty(value = "需联络后再做退件处理（1/0）", dataType = "Integer") + private Integer contactReturn; + + @TableField("direct_return") + @ApiModelProperty(value = "直接退件处理（1/0）", dataType = "Integer") + private Integer directReturn; + + @TableField("need_accord_declare") + @ApiModelProperty(value = "需要符合性声明（1/0）", dataType = "Integer") + private Integer needAccordDeclare; + + @TableField("need_advice") + @ApiModelProperty(value = "需要建议再校准日期（1/0）", dataType = "Integer") + private Integer needAdvice; + + @TableField("accord_lab") + @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准（1/0）", dataType = "Integer") + private Integer accordLab; + + @TableField("agree_other") + @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0）", dataType = "Integer") + private Integer agreeOther; + + @TableField("staff_no") + @ApiModelProperty(value = "收件人工号（计量人员编号）", dataType = "String") + private String staffNo; + + @TableField("staff_name") + @ApiModelProperty(value = "收件人姓名", dataType = "String") + private String staffName; + + @TableField("receive_date") + @ApiModelProperty(value = "收件日期", dataType = "String") + private String receiveDate; + @ApiModelProperty(value = "送检时间", dataType = "String") private String deliverTime; @ApiModelProperty(value = "预约送达时间", dataType = "String") private String planDeliverTime; - @ApiModelProperty(value = "要求检完时间", dataType = "String") + @ApiModelProperty(value = "预约取样时间/要求检完时间", dataType = "String") private String requireOverTime; @ApiModelProperty(value = "委托方id（客户id）", dataType = "Long") @@ -111,4 +169,8 @@ @TableField(exist = false) private List customerSampleInfoList = new ArrayList<>(); + @TableField(exist = false) + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java index 19b348a..79f1880 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -49,7 +49,7 @@ @ApiModelProperty(value = "样品型号", dataType = "String") private String sampleModel; - @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + @ApiModelProperty(value = "出厂编号/仪器编号-判重依据", dataType = "String") private String manufacturingNo; @ApiModelProperty(value = "生产厂家", dataType = "String") @@ -93,9 +93,15 @@ @TableField(exist = false) private String measureCategoryName; - @ApiModelProperty(value = "检定项目", dataType = "String") + @ApiModelProperty(value = "外观状态", dataType = "String") + private String appearanceStatus; + + @ApiModelProperty(value = "检定项目/检测项目", dataType = "String") private String measureContent; + @ApiModelProperty(value = "检测依据标准", dataType = "String") + private String accordStandard; + @ApiModelProperty(value = "检定周期(月)", dataType = "String") private String measurePeriod; @@ -158,4 +164,7 @@ @TableField(exist = false) @ApiModelProperty(value = "委托书样品关联表id", dataType = "Long") private Long relationId; + + @TableField(exist = false) + private int seq; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index c98eca2..c272790 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.business; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -29,9 +30,13 @@ import com.casic.missiles.model.customer.CustomerSampleInfo; import com.casic.missiles.service.business.IBusinessOrderService; import com.casic.missiles.service.customer.CustomerSampleService; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; +import com.casic.missiles.utils.SpringContextUtil; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,6 +46,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -51,6 +57,7 @@ * @author cz * @since 2023-02-02 */ +@Slf4j @Service @AllArgsConstructor public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService, PrefixCodeEnum, OrderStatusEnum, SampleStatusEnum, MeasureTypeEnum { @@ -60,6 +67,7 @@ private final CustomerSampleService customerSampleService; private final BusinessOrderSampleRelationMapper sampleRelationMapper; private final BusinessDealRecordMapper dealRecordMapper; + private final MinioUtil minioUtil; /** * 1、分页查询 2、批量查询所有的委托书、样品关系 => 进行以sampleId为key主键map list 3、查询计算样品数量 @@ -86,7 +94,7 @@ */ @Override public BusinessOrder orderDetail(Long id) { - BusinessOrder businessOrder = this.baseMapper.selectById(id); + BusinessOrder businessOrder = this.baseMapper.selectDetailById(id); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("order_id", businessOrder.getId()); List orderSampleList = sampleRelationMapper.selectList(queryWrapper); @@ -251,6 +259,21 @@ return dealRecordMapper.selectList(dealRecordQueryWrapper); } + @Override + public void formExport(Long id, HttpServletResponse response) { + BusinessOrder businessOrder = this.orderDetail(id); + if (Objects.nonNull(businessOrder)) { + PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); + try { + DictCodeUtils.convertDictCodeToName(businessOrder); + String printFileName = printFileRegister.registerPrintFile(businessOrder, businessOrder.getOrderTypeName()); + minioUtil.downloadStream(printFileName, response); + } catch (Exception ex) { + log.error("委托书表单导出/打印异常，表单信息：{}，异常信息：{}", JSONObject.toJSON(businessOrder), ex); + } + } + } + /** * 新增操作记录 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 28746cf..b247f6b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -88,7 +88,7 @@ return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); } - @ApiOperation("委托书导出") + @ApiOperation("委托书列表导出") @PostMapping("/export") public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { businessOrderService.orderExport(request, response); @@ -115,7 +115,7 @@ @ApiOperation("委托书接收") @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -131,4 +131,10 @@ return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } + @ApiOperation("委托书表单打印/导出") + @PostMapping("/form/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.formExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a59f6af..3b092a0 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,6 +36,8 @@ template: calibration: "现场检定审批报告" environmental: "现场环境记录" + testOrder: "检测委托单" + calibrationOrder: "检定或校准委托单" logging: level.root: info diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java index c27b98e..f8727f9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -3,7 +3,7 @@ public interface CertificatePrintStatusEnum { /** - * 不可打印 + * 可打印 */ String PRINTABLE = "1"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java index a8f1f13..72500d6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java @@ -3,4 +3,6 @@ public interface FilePrintTypeEnum { String TEST_REPORT = "样品内部检校证书"; String CALIBRATION_CERTIFICATE = "自有设备内部检校证书"; + String TEST_ORDER = "检测委托单"; + String CALIBRATION_ORDER = "检定或校准委托单"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java index a17b733..f42477a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java @@ -10,10 +10,12 @@ { put(CALIBRATION_CERTIFICATE, CALIBRATION_CERTIFICATE_BEAN); //校准证书 put(TEST_REPORT, TEST_REPORT_BEAN); //测试报告 + put(TEST_ORDER, TEST_ORDER_BEAN); //检测委托单 + put(CALIBRATION_ORDER, CALIBRATION_ORDER_BEAN); //检定或校准委托单 } }); - public HashMap certificateTypeBeanMap; + public HashMap certificateTypeBeanMap; AwareFilePrintTypeEnum(HashMap certificateTypeBeanMap) { this.certificateTypeBeanMap = certificateTypeBeanMap; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java index 099faae..bf23ba3 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java @@ -10,5 +10,9 @@ String EXTERNAL_CALIBRATION_FILE_BEAN = "externalCalibrationFile"; String EXTERNAL_ENVIRONMENTAL_RECORD_BEAN = "environmentalRecordData"; + //检测委托单 + String TEST_ORDER_BEAN = "testOrderBean"; + //检定或校准委托单 + String CALIBRATION_ORDER_BEAN = "calibrationOrderBean"; } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java index 9fe66ff..6934768 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -36,4 +36,5 @@ List selectPreMonthCountByYear(); + BusinessOrder selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml index 0ac2a54..4cf3d9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -6,10 +6,23 @@ + + + + + + + + + + + + + @@ -29,7 +42,9 @@ - id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + id, order_code, order_type, order_time, deliverer_id, deliverer, deliverer_tel, fixed_tel, email, invoice_company, contact_return, direct_return, + need_accord_declare, need_advice, accord_lab, agree_other, staff_no, staff_name, receive_date, deliver_time, plan_deliver_time, + require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml index c0a59ae..7cbcf70 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml @@ -35,8 +35,8 @@ and boc.certificate_name like concat('%',#{request.certificateName},'%') - - and csi.sample_no like concat('%',#{request.sampleNo},'%') + + and csi.manufacturing_no like concat('%',#{request.manufacturingNo},'%') and csi.sample_name like concat('%',#{request.sampleName},'%') diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index e5f948e..8a4774e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -108,6 +108,8 @@ */ //委托书状态 String ORDER_STATUS = "orderStatus"; + //委托书类型 + String ORDER_TYPE = "orderType"; //检测状态 String MEASURE_STATUS = "measureStatus"; //打印状态 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java index 7fa62b6..80765bf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java @@ -30,6 +30,14 @@ @ExcelProperty(value = "委托书编号",order = 0) private String orderCode; + @ApiModelProperty(value = "委托书类型-字典code（1检测委托单，2检定或校准委托单）（检测委托单不出证书，检定或校准委托单出具证书）", dataType = "String") + @DictCodeField(message = "接收状态不合法", cacheName = MeterDictCode.ORDER_TYPE) + private String orderType; + + @ApiModelProperty(value = "委托书类型-字典value", dataType = "String") + @TableField(exist = false) + private String orderTypeName; + @ApiModelProperty(value = "委托方id", dataType = "String") // @ExcelProperty(value = "委托方id",order = 1) private String customerId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java index ac8351b..f0ced78 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java @@ -20,8 +20,8 @@ @ApiModelProperty(value = "证书名称", dataType = "String") private String certificateName; - @ApiModelProperty(value = "样品编号", dataType = "String") - private String sampleNo; + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; @ApiModelProperty(value = "样品名称", dataType = "String") private String sampleName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java index 7f126f9..965bc72 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.model.customer.CustomerSampleInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -33,6 +35,14 @@ @ApiModelProperty(value = "委托书编号", dataType = "String") private String orderCode; + @ApiModelProperty(value = "委托书类型-字典code（1检测委托单，2检定或校准委托单）（检测委托单不出证书，检定或校准委托单出具证书）", dataType = "String") + @DictCodeField(message = "委托书类型不合法", cacheName = MeterDictCode.ORDER_TYPE) + private String orderType; + + @ApiModelProperty(value = "委托书类型-字典value", dataType = "String") + @TableField(exist = false) + private String orderTypeName; + @ApiModelProperty(value = "委托日期", dataType = "String") private String orderTime; @@ -41,20 +51,68 @@ private Long delivererId; @TableField("deliverer") - @ApiModelProperty(value = "送样人/送检人", dataType = "String") + @ApiModelProperty(value = "送样人/送检人/联系人", dataType = "String") private String deliverer; @TableField("deliverer_tel") - @ApiModelProperty(value = "送样人联系方式", dataType = "String") + @ApiModelProperty(value = "移动电话", dataType = "String") private String delivererTel; + @TableField("fixed_tel") + @ApiModelProperty(value = "固定电话", dataType = "String") + private String fixedTel; + + @TableField("email") + @ApiModelProperty(value = "电子邮件/QQ", dataType = "String") + private String email; + + @TableField("invoice_company") + @ApiModelProperty(value = "发票单位名称", dataType = "String") + private String invoiceCompany; + + @TableField("contact_return") + @ApiModelProperty(value = "需联络后再做退件处理（1/0）", dataType = "Integer") + private Integer contactReturn; + + @TableField("direct_return") + @ApiModelProperty(value = "直接退件处理（1/0）", dataType = "Integer") + private Integer directReturn; + + @TableField("need_accord_declare") + @ApiModelProperty(value = "需要符合性声明（1/0）", dataType = "Integer") + private Integer needAccordDeclare; + + @TableField("need_advice") + @ApiModelProperty(value = "需要建议再校准日期（1/0）", dataType = "Integer") + private Integer needAdvice; + + @TableField("accord_lab") + @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准（1/0）", dataType = "Integer") + private Integer accordLab; + + @TableField("agree_other") + @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0）", dataType = "Integer") + private Integer agreeOther; + + @TableField("staff_no") + @ApiModelProperty(value = "收件人工号（计量人员编号）", dataType = "String") + private String staffNo; + + @TableField("staff_name") + @ApiModelProperty(value = "收件人姓名", dataType = "String") + private String staffName; + + @TableField("receive_date") + @ApiModelProperty(value = "收件日期", dataType = "String") + private String receiveDate; + @ApiModelProperty(value = "送检时间", dataType = "String") private String deliverTime; @ApiModelProperty(value = "预约送达时间", dataType = "String") private String planDeliverTime; - @ApiModelProperty(value = "要求检完时间", dataType = "String") + @ApiModelProperty(value = "预约取样时间/要求检完时间", dataType = "String") private String requireOverTime; @ApiModelProperty(value = "委托方id（客户id）", dataType = "Long") @@ -111,4 +169,8 @@ @TableField(exist = false) private List customerSampleInfoList = new ArrayList<>(); + @TableField(exist = false) + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java index 19b348a..79f1880 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -49,7 +49,7 @@ @ApiModelProperty(value = "样品型号", dataType = "String") private String sampleModel; - @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + @ApiModelProperty(value = "出厂编号/仪器编号-判重依据", dataType = "String") private String manufacturingNo; @ApiModelProperty(value = "生产厂家", dataType = "String") @@ -93,9 +93,15 @@ @TableField(exist = false) private String measureCategoryName; - @ApiModelProperty(value = "检定项目", dataType = "String") + @ApiModelProperty(value = "外观状态", dataType = "String") + private String appearanceStatus; + + @ApiModelProperty(value = "检定项目/检测项目", dataType = "String") private String measureContent; + @ApiModelProperty(value = "检测依据标准", dataType = "String") + private String accordStandard; + @ApiModelProperty(value = "检定周期(月)", dataType = "String") private String measurePeriod; @@ -158,4 +164,7 @@ @TableField(exist = false) @ApiModelProperty(value = "委托书样品关联表id", dataType = "Long") private Long relationId; + + @TableField(exist = false) + private int seq; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index c98eca2..c272790 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.business; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -29,9 +30,13 @@ import com.casic.missiles.model.customer.CustomerSampleInfo; import com.casic.missiles.service.business.IBusinessOrderService; import com.casic.missiles.service.customer.CustomerSampleService; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; +import com.casic.missiles.utils.SpringContextUtil; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,6 +46,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -51,6 +57,7 @@ * @author cz * @since 2023-02-02 */ +@Slf4j @Service @AllArgsConstructor public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService, PrefixCodeEnum, OrderStatusEnum, SampleStatusEnum, MeasureTypeEnum { @@ -60,6 +67,7 @@ private final CustomerSampleService customerSampleService; private final BusinessOrderSampleRelationMapper sampleRelationMapper; private final BusinessDealRecordMapper dealRecordMapper; + private final MinioUtil minioUtil; /** * 1、分页查询 2、批量查询所有的委托书、样品关系 => 进行以sampleId为key主键map list 3、查询计算样品数量 @@ -86,7 +94,7 @@ */ @Override public BusinessOrder orderDetail(Long id) { - BusinessOrder businessOrder = this.baseMapper.selectById(id); + BusinessOrder businessOrder = this.baseMapper.selectDetailById(id); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("order_id", businessOrder.getId()); List orderSampleList = sampleRelationMapper.selectList(queryWrapper); @@ -251,6 +259,21 @@ return dealRecordMapper.selectList(dealRecordQueryWrapper); } + @Override + public void formExport(Long id, HttpServletResponse response) { + BusinessOrder businessOrder = this.orderDetail(id); + if (Objects.nonNull(businessOrder)) { + PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); + try { + DictCodeUtils.convertDictCodeToName(businessOrder); + String printFileName = printFileRegister.registerPrintFile(businessOrder, businessOrder.getOrderTypeName()); + minioUtil.downloadStream(printFileName, response); + } catch (Exception ex) { + log.error("委托书表单导出/打印异常，表单信息：{}，异常信息：{}", JSONObject.toJSON(businessOrder), ex); + } + } + } + /** * 新增操作记录 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java index a8bcf13..d610ef8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java @@ -4,9 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.order.OrderCancelRequest; -import com.casic.missiles.dto.business.order.OrderListResponse; import com.casic.missiles.dto.business.order.OrderListRequest; -import com.casic.missiles.dto.business.order.labIncomeResponse; +import com.casic.missiles.dto.business.order.OrderListResponse; import com.casic.missiles.model.business.BusinessDealRecord; import com.casic.missiles.model.business.BusinessOrder; @@ -39,4 +38,5 @@ List optionRecord(Long id); + void formExport(Long id, HttpServletResponse response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 28746cf..b247f6b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -88,7 +88,7 @@ return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); } - @ApiOperation("委托书导出") + @ApiOperation("委托书列表导出") @PostMapping("/export") public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { businessOrderService.orderExport(request, response); @@ -115,7 +115,7 @@ @ApiOperation("委托书接收") @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -131,4 +131,10 @@ return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } + @ApiOperation("委托书表单打印/导出") + @PostMapping("/form/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.formExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a59f6af..3b092a0 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,6 +36,8 @@ template: calibration: "现场检定审批报告" environmental: "现场环境记录" + testOrder: "检测委托单" + calibrationOrder: "检定或校准委托单" logging: level.root: info diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java index c27b98e..f8727f9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -3,7 +3,7 @@ public interface CertificatePrintStatusEnum { /** - * 不可打印 + * 可打印 */ String PRINTABLE = "1"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java index a8f1f13..72500d6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java @@ -3,4 +3,6 @@ public interface FilePrintTypeEnum { String TEST_REPORT = "样品内部检校证书"; String CALIBRATION_CERTIFICATE = "自有设备内部检校证书"; + String TEST_ORDER = "检测委托单"; + String CALIBRATION_ORDER = "检定或校准委托单"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java index a17b733..f42477a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java @@ -10,10 +10,12 @@ { put(CALIBRATION_CERTIFICATE, CALIBRATION_CERTIFICATE_BEAN); //校准证书 put(TEST_REPORT, TEST_REPORT_BEAN); //测试报告 + put(TEST_ORDER, TEST_ORDER_BEAN); //检测委托单 + put(CALIBRATION_ORDER, CALIBRATION_ORDER_BEAN); //检定或校准委托单 } }); - public HashMap certificateTypeBeanMap; + public HashMap certificateTypeBeanMap; AwareFilePrintTypeEnum(HashMap certificateTypeBeanMap) { this.certificateTypeBeanMap = certificateTypeBeanMap; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java index 099faae..bf23ba3 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java @@ -10,5 +10,9 @@ String EXTERNAL_CALIBRATION_FILE_BEAN = "externalCalibrationFile"; String EXTERNAL_ENVIRONMENTAL_RECORD_BEAN = "environmentalRecordData"; + //检测委托单 + String TEST_ORDER_BEAN = "testOrderBean"; + //检定或校准委托单 + String CALIBRATION_ORDER_BEAN = "calibrationOrderBean"; } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java index 9fe66ff..6934768 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -36,4 +36,5 @@ List selectPreMonthCountByYear(); + BusinessOrder selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml index 0ac2a54..4cf3d9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -6,10 +6,23 @@ + + + + + + + + + + + + + @@ -29,7 +42,9 @@ - id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + id, order_code, order_type, order_time, deliverer_id, deliverer, deliverer_tel, fixed_tel, email, invoice_company, contact_return, direct_return, + need_accord_declare, need_advice, accord_lab, agree_other, staff_no, staff_name, receive_date, deliver_time, plan_deliver_time, + require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml index c0a59ae..7cbcf70 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml @@ -35,8 +35,8 @@ and boc.certificate_name like concat('%',#{request.certificateName},'%') - - and csi.sample_no like concat('%',#{request.sampleNo},'%') + + and csi.manufacturing_no like concat('%',#{request.manufacturingNo},'%') and csi.sample_name like concat('%',#{request.sampleName},'%') diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index e5f948e..8a4774e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -108,6 +108,8 @@ */ //委托书状态 String ORDER_STATUS = "orderStatus"; + //委托书类型 + String ORDER_TYPE = "orderType"; //检测状态 String MEASURE_STATUS = "measureStatus"; //打印状态 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java index 7fa62b6..80765bf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java @@ -30,6 +30,14 @@ @ExcelProperty(value = "委托书编号",order = 0) private String orderCode; + @ApiModelProperty(value = "委托书类型-字典code（1检测委托单，2检定或校准委托单）（检测委托单不出证书，检定或校准委托单出具证书）", dataType = "String") + @DictCodeField(message = "接收状态不合法", cacheName = MeterDictCode.ORDER_TYPE) + private String orderType; + + @ApiModelProperty(value = "委托书类型-字典value", dataType = "String") + @TableField(exist = false) + private String orderTypeName; + @ApiModelProperty(value = "委托方id", dataType = "String") // @ExcelProperty(value = "委托方id",order = 1) private String customerId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java index ac8351b..f0ced78 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java @@ -20,8 +20,8 @@ @ApiModelProperty(value = "证书名称", dataType = "String") private String certificateName; - @ApiModelProperty(value = "样品编号", dataType = "String") - private String sampleNo; + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; @ApiModelProperty(value = "样品名称", dataType = "String") private String sampleName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java index 7f126f9..965bc72 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.model.customer.CustomerSampleInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -33,6 +35,14 @@ @ApiModelProperty(value = "委托书编号", dataType = "String") private String orderCode; + @ApiModelProperty(value = "委托书类型-字典code（1检测委托单，2检定或校准委托单）（检测委托单不出证书，检定或校准委托单出具证书）", dataType = "String") + @DictCodeField(message = "委托书类型不合法", cacheName = MeterDictCode.ORDER_TYPE) + private String orderType; + + @ApiModelProperty(value = "委托书类型-字典value", dataType = "String") + @TableField(exist = false) + private String orderTypeName; + @ApiModelProperty(value = "委托日期", dataType = "String") private String orderTime; @@ -41,20 +51,68 @@ private Long delivererId; @TableField("deliverer") - @ApiModelProperty(value = "送样人/送检人", dataType = "String") + @ApiModelProperty(value = "送样人/送检人/联系人", dataType = "String") private String deliverer; @TableField("deliverer_tel") - @ApiModelProperty(value = "送样人联系方式", dataType = "String") + @ApiModelProperty(value = "移动电话", dataType = "String") private String delivererTel; + @TableField("fixed_tel") + @ApiModelProperty(value = "固定电话", dataType = "String") + private String fixedTel; + + @TableField("email") + @ApiModelProperty(value = "电子邮件/QQ", dataType = "String") + private String email; + + @TableField("invoice_company") + @ApiModelProperty(value = "发票单位名称", dataType = "String") + private String invoiceCompany; + + @TableField("contact_return") + @ApiModelProperty(value = "需联络后再做退件处理（1/0）", dataType = "Integer") + private Integer contactReturn; + + @TableField("direct_return") + @ApiModelProperty(value = "直接退件处理（1/0）", dataType = "Integer") + private Integer directReturn; + + @TableField("need_accord_declare") + @ApiModelProperty(value = "需要符合性声明（1/0）", dataType = "Integer") + private Integer needAccordDeclare; + + @TableField("need_advice") + @ApiModelProperty(value = "需要建议再校准日期（1/0）", dataType = "Integer") + private Integer needAdvice; + + @TableField("accord_lab") + @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准（1/0）", dataType = "Integer") + private Integer accordLab; + + @TableField("agree_other") + @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0）", dataType = "Integer") + private Integer agreeOther; + + @TableField("staff_no") + @ApiModelProperty(value = "收件人工号（计量人员编号）", dataType = "String") + private String staffNo; + + @TableField("staff_name") + @ApiModelProperty(value = "收件人姓名", dataType = "String") + private String staffName; + + @TableField("receive_date") + @ApiModelProperty(value = "收件日期", dataType = "String") + private String receiveDate; + @ApiModelProperty(value = "送检时间", dataType = "String") private String deliverTime; @ApiModelProperty(value = "预约送达时间", dataType = "String") private String planDeliverTime; - @ApiModelProperty(value = "要求检完时间", dataType = "String") + @ApiModelProperty(value = "预约取样时间/要求检完时间", dataType = "String") private String requireOverTime; @ApiModelProperty(value = "委托方id（客户id）", dataType = "Long") @@ -111,4 +169,8 @@ @TableField(exist = false) private List customerSampleInfoList = new ArrayList<>(); + @TableField(exist = false) + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java index 19b348a..79f1880 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -49,7 +49,7 @@ @ApiModelProperty(value = "样品型号", dataType = "String") private String sampleModel; - @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + @ApiModelProperty(value = "出厂编号/仪器编号-判重依据", dataType = "String") private String manufacturingNo; @ApiModelProperty(value = "生产厂家", dataType = "String") @@ -93,9 +93,15 @@ @TableField(exist = false) private String measureCategoryName; - @ApiModelProperty(value = "检定项目", dataType = "String") + @ApiModelProperty(value = "外观状态", dataType = "String") + private String appearanceStatus; + + @ApiModelProperty(value = "检定项目/检测项目", dataType = "String") private String measureContent; + @ApiModelProperty(value = "检测依据标准", dataType = "String") + private String accordStandard; + @ApiModelProperty(value = "检定周期(月)", dataType = "String") private String measurePeriod; @@ -158,4 +164,7 @@ @TableField(exist = false) @ApiModelProperty(value = "委托书样品关联表id", dataType = "Long") private Long relationId; + + @TableField(exist = false) + private int seq; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index c98eca2..c272790 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.business; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -29,9 +30,13 @@ import com.casic.missiles.model.customer.CustomerSampleInfo; import com.casic.missiles.service.business.IBusinessOrderService; import com.casic.missiles.service.customer.CustomerSampleService; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; +import com.casic.missiles.utils.SpringContextUtil; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,6 +46,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -51,6 +57,7 @@ * @author cz * @since 2023-02-02 */ +@Slf4j @Service @AllArgsConstructor public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService, PrefixCodeEnum, OrderStatusEnum, SampleStatusEnum, MeasureTypeEnum { @@ -60,6 +67,7 @@ private final CustomerSampleService customerSampleService; private final BusinessOrderSampleRelationMapper sampleRelationMapper; private final BusinessDealRecordMapper dealRecordMapper; + private final MinioUtil minioUtil; /** * 1、分页查询 2、批量查询所有的委托书、样品关系 => 进行以sampleId为key主键map list 3、查询计算样品数量 @@ -86,7 +94,7 @@ */ @Override public BusinessOrder orderDetail(Long id) { - BusinessOrder businessOrder = this.baseMapper.selectById(id); + BusinessOrder businessOrder = this.baseMapper.selectDetailById(id); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("order_id", businessOrder.getId()); List orderSampleList = sampleRelationMapper.selectList(queryWrapper); @@ -251,6 +259,21 @@ return dealRecordMapper.selectList(dealRecordQueryWrapper); } + @Override + public void formExport(Long id, HttpServletResponse response) { + BusinessOrder businessOrder = this.orderDetail(id); + if (Objects.nonNull(businessOrder)) { + PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); + try { + DictCodeUtils.convertDictCodeToName(businessOrder); + String printFileName = printFileRegister.registerPrintFile(businessOrder, businessOrder.getOrderTypeName()); + minioUtil.downloadStream(printFileName, response); + } catch (Exception ex) { + log.error("委托书表单导出/打印异常，表单信息：{}，异常信息：{}", JSONObject.toJSON(businessOrder), ex); + } + } + } + /** * 新增操作记录 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java index a8bcf13..d610ef8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java @@ -4,9 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.order.OrderCancelRequest; -import com.casic.missiles.dto.business.order.OrderListResponse; import com.casic.missiles.dto.business.order.OrderListRequest; -import com.casic.missiles.dto.business.order.labIncomeResponse; +import com.casic.missiles.dto.business.order.OrderListResponse; import com.casic.missiles.model.business.BusinessDealRecord; import com.casic.missiles.model.business.BusinessOrder; @@ -39,4 +38,5 @@ List optionRecord(Long id); + void formExport(Long id, HttpServletResponse response); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java index 0766e9b..557d006 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java @@ -88,7 +88,7 @@ PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); try { DictCodeUtils.convertDictCodeToName(certificateReport); - String printFileName = printFileRegister.registerPrintFile(certificateReport, certificateReport.getCertificateReportTypeName()); + String printFileName = printFileRegister.registerPrintFile(certificateReport, certificateReport.getCertificateReportTypeName()); //生成证书打印信息 CertificatePrintBuilder(certificateReport, printFileName); } catch (Exception ex) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 28746cf..b247f6b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -88,7 +88,7 @@ return ReturnUtil.success(businessOrderService.addOrder(businessOrder)); } - @ApiOperation("委托书导出") + @ApiOperation("委托书列表导出") @PostMapping("/export") public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) { businessOrderService.orderExport(request, response); @@ -115,7 +115,7 @@ @ApiOperation("委托书接收") @PostMapping("/receive") - public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { + public ReturnDTO receiveOrder(@RequestBody @Valid OrderCancelRequest orderCancelRequest) { Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); @@ -131,4 +131,10 @@ return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } + @ApiOperation("委托书表单打印/导出") + @PostMapping("/form/export") + public void formExport(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) { + businessOrderService.formExport(idDTO.getId(), response); + } + } diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index a59f6af..3b092a0 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -36,6 +36,8 @@ template: calibration: "现场检定审批报告" environmental: "现场环境记录" + testOrder: "检测委托单" + calibrationOrder: "检定或校准委托单" logging: level.root: info diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java index c27b98e..f8727f9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -3,7 +3,7 @@ public interface CertificatePrintStatusEnum { /** - * 不可打印 + * 可打印 */ String PRINTABLE = "1"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java index a8f1f13..72500d6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java @@ -3,4 +3,6 @@ public interface FilePrintTypeEnum { String TEST_REPORT = "样品内部检校证书"; String CALIBRATION_CERTIFICATE = "自有设备内部检校证书"; + String TEST_ORDER = "检测委托单"; + String CALIBRATION_ORDER = "检定或校准委托单"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java index a17b733..f42477a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java @@ -10,10 +10,12 @@ { put(CALIBRATION_CERTIFICATE, CALIBRATION_CERTIFICATE_BEAN); //校准证书 put(TEST_REPORT, TEST_REPORT_BEAN); //测试报告 + put(TEST_ORDER, TEST_ORDER_BEAN); //检测委托单 + put(CALIBRATION_ORDER, CALIBRATION_ORDER_BEAN); //检定或校准委托单 } }); - public HashMap certificateTypeBeanMap; + public HashMap certificateTypeBeanMap; AwareFilePrintTypeEnum(HashMap certificateTypeBeanMap) { this.certificateTypeBeanMap = certificateTypeBeanMap; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java index 099faae..bf23ba3 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java @@ -10,5 +10,9 @@ String EXTERNAL_CALIBRATION_FILE_BEAN = "externalCalibrationFile"; String EXTERNAL_ENVIRONMENTAL_RECORD_BEAN = "environmentalRecordData"; + //检测委托单 + String TEST_ORDER_BEAN = "testOrderBean"; + //检定或校准委托单 + String CALIBRATION_ORDER_BEAN = "calibrationOrderBean"; } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java index 9fe66ff..6934768 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java @@ -36,4 +36,5 @@ List selectPreMonthCountByYear(); + BusinessOrder selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml index 0ac2a54..4cf3d9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml @@ -6,10 +6,23 @@ + + + + + + + + + + + + + @@ -29,7 +42,9 @@ - id, order_code, order_time, deliverer_id, deliverer, deliverer_tel, deliver_time, plan_deliver_time, require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + id, order_code, order_type, order_time, deliverer_id, deliverer, deliverer_tel, fixed_tel, email, invoice_company, contact_return, direct_return, + need_accord_declare, need_advice, accord_lab, agree_other, staff_no, staff_name, receive_date, deliver_time, plan_deliver_time, + require_over_time, customer_id, status, remark, minio_file_name, certifications, is_urgent, is_del, create_user, create_time, update_time + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml index c0a59ae..7cbcf70 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml @@ -35,8 +35,8 @@ and boc.certificate_name like concat('%',#{request.certificateName},'%') - - and csi.sample_no like concat('%',#{request.sampleNo},'%') + + and csi.manufacturing_no like concat('%',#{request.manufacturingNo},'%') and csi.sample_name like concat('%',#{request.sampleName},'%') diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index e5f948e..8a4774e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -108,6 +108,8 @@ */ //委托书状态 String ORDER_STATUS = "orderStatus"; + //委托书类型 + String ORDER_TYPE = "orderType"; //检测状态 String MEASURE_STATUS = "measureStatus"; //打印状态 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java index 7fa62b6..80765bf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListResponse.java @@ -30,6 +30,14 @@ @ExcelProperty(value = "委托书编号",order = 0) private String orderCode; + @ApiModelProperty(value = "委托书类型-字典code（1检测委托单，2检定或校准委托单）（检测委托单不出证书，检定或校准委托单出具证书）", dataType = "String") + @DictCodeField(message = "接收状态不合法", cacheName = MeterDictCode.ORDER_TYPE) + private String orderType; + + @ApiModelProperty(value = "委托书类型-字典value", dataType = "String") + @TableField(exist = false) + private String orderTypeName; + @ApiModelProperty(value = "委托方id", dataType = "String") // @ExcelProperty(value = "委托方id",order = 1) private String customerId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java index ac8351b..f0ced78 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceCertificateListRequest.java @@ -20,8 +20,8 @@ @ApiModelProperty(value = "证书名称", dataType = "String") private String certificateName; - @ApiModelProperty(value = "样品编号", dataType = "String") - private String sampleNo; + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; @ApiModelProperty(value = "样品名称", dataType = "String") private String sampleName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java index 7f126f9..965bc72 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.model.customer.CustomerSampleInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -33,6 +35,14 @@ @ApiModelProperty(value = "委托书编号", dataType = "String") private String orderCode; + @ApiModelProperty(value = "委托书类型-字典code（1检测委托单，2检定或校准委托单）（检测委托单不出证书，检定或校准委托单出具证书）", dataType = "String") + @DictCodeField(message = "委托书类型不合法", cacheName = MeterDictCode.ORDER_TYPE) + private String orderType; + + @ApiModelProperty(value = "委托书类型-字典value", dataType = "String") + @TableField(exist = false) + private String orderTypeName; + @ApiModelProperty(value = "委托日期", dataType = "String") private String orderTime; @@ -41,20 +51,68 @@ private Long delivererId; @TableField("deliverer") - @ApiModelProperty(value = "送样人/送检人", dataType = "String") + @ApiModelProperty(value = "送样人/送检人/联系人", dataType = "String") private String deliverer; @TableField("deliverer_tel") - @ApiModelProperty(value = "送样人联系方式", dataType = "String") + @ApiModelProperty(value = "移动电话", dataType = "String") private String delivererTel; + @TableField("fixed_tel") + @ApiModelProperty(value = "固定电话", dataType = "String") + private String fixedTel; + + @TableField("email") + @ApiModelProperty(value = "电子邮件/QQ", dataType = "String") + private String email; + + @TableField("invoice_company") + @ApiModelProperty(value = "发票单位名称", dataType = "String") + private String invoiceCompany; + + @TableField("contact_return") + @ApiModelProperty(value = "需联络后再做退件处理（1/0）", dataType = "Integer") + private Integer contactReturn; + + @TableField("direct_return") + @ApiModelProperty(value = "直接退件处理（1/0）", dataType = "Integer") + private Integer directReturn; + + @TableField("need_accord_declare") + @ApiModelProperty(value = "需要符合性声明（1/0）", dataType = "Integer") + private Integer needAccordDeclare; + + @TableField("need_advice") + @ApiModelProperty(value = "需要建议再校准日期（1/0）", dataType = "Integer") + private Integer needAdvice; + + @TableField("accord_lab") + @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准（1/0）", dataType = "Integer") + private Integer accordLab; + + @TableField("agree_other") + @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0）", dataType = "Integer") + private Integer agreeOther; + + @TableField("staff_no") + @ApiModelProperty(value = "收件人工号（计量人员编号）", dataType = "String") + private String staffNo; + + @TableField("staff_name") + @ApiModelProperty(value = "收件人姓名", dataType = "String") + private String staffName; + + @TableField("receive_date") + @ApiModelProperty(value = "收件日期", dataType = "String") + private String receiveDate; + @ApiModelProperty(value = "送检时间", dataType = "String") private String deliverTime; @ApiModelProperty(value = "预约送达时间", dataType = "String") private String planDeliverTime; - @ApiModelProperty(value = "要求检完时间", dataType = "String") + @ApiModelProperty(value = "预约取样时间/要求检完时间", dataType = "String") private String requireOverTime; @ApiModelProperty(value = "委托方id（客户id）", dataType = "Long") @@ -111,4 +169,8 @@ @TableField(exist = false) private List customerSampleInfoList = new ArrayList<>(); + @TableField(exist = false) + @ApiModelProperty(value = "邮编", dataType = "String") + private String postalCode; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java index 19b348a..79f1880 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -49,7 +49,7 @@ @ApiModelProperty(value = "样品型号", dataType = "String") private String sampleModel; - @ApiModelProperty(value = "出厂编号-判重依据", dataType = "String") + @ApiModelProperty(value = "出厂编号/仪器编号-判重依据", dataType = "String") private String manufacturingNo; @ApiModelProperty(value = "生产厂家", dataType = "String") @@ -93,9 +93,15 @@ @TableField(exist = false) private String measureCategoryName; - @ApiModelProperty(value = "检定项目", dataType = "String") + @ApiModelProperty(value = "外观状态", dataType = "String") + private String appearanceStatus; + + @ApiModelProperty(value = "检定项目/检测项目", dataType = "String") private String measureContent; + @ApiModelProperty(value = "检测依据标准", dataType = "String") + private String accordStandard; + @ApiModelProperty(value = "检定周期(月)", dataType = "String") private String measurePeriod; @@ -158,4 +164,7 @@ @TableField(exist = false) @ApiModelProperty(value = "委托书样品关联表id", dataType = "Long") private Long relationId; + + @TableField(exist = false) + private int seq; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index c98eca2..c272790 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.business; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -29,9 +30,13 @@ import com.casic.missiles.model.customer.CustomerSampleInfo; import com.casic.missiles.service.business.IBusinessOrderService; import com.casic.missiles.service.customer.CustomerSampleService; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.NumberGeneratorUtil; +import com.casic.missiles.utils.SpringContextUtil; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,6 +46,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -51,6 +57,7 @@ * @author cz * @since 2023-02-02 */ +@Slf4j @Service @AllArgsConstructor public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService, PrefixCodeEnum, OrderStatusEnum, SampleStatusEnum, MeasureTypeEnum { @@ -60,6 +67,7 @@ private final CustomerSampleService customerSampleService; private final BusinessOrderSampleRelationMapper sampleRelationMapper; private final BusinessDealRecordMapper dealRecordMapper; + private final MinioUtil minioUtil; /** * 1、分页查询 2、批量查询所有的委托书、样品关系 => 进行以sampleId为key主键map list 3、查询计算样品数量 @@ -86,7 +94,7 @@ */ @Override public BusinessOrder orderDetail(Long id) { - BusinessOrder businessOrder = this.baseMapper.selectById(id); + BusinessOrder businessOrder = this.baseMapper.selectDetailById(id); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("order_id", businessOrder.getId()); List orderSampleList = sampleRelationMapper.selectList(queryWrapper); @@ -251,6 +259,21 @@ return dealRecordMapper.selectList(dealRecordQueryWrapper); } + @Override + public void formExport(Long id, HttpServletResponse response) { + BusinessOrder businessOrder = this.orderDetail(id); + if (Objects.nonNull(businessOrder)) { + PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); + try { + DictCodeUtils.convertDictCodeToName(businessOrder); + String printFileName = printFileRegister.registerPrintFile(businessOrder, businessOrder.getOrderTypeName()); + minioUtil.downloadStream(printFileName, response); + } catch (Exception ex) { + log.error("委托书表单导出/打印异常，表单信息：{}，异常信息：{}", JSONObject.toJSON(businessOrder), ex); + } + } + } + /** * 新增操作记录 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java index a8bcf13..d610ef8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java @@ -4,9 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.order.OrderCancelRequest; -import com.casic.missiles.dto.business.order.OrderListResponse; import com.casic.missiles.dto.business.order.OrderListRequest; -import com.casic.missiles.dto.business.order.labIncomeResponse; +import com.casic.missiles.dto.business.order.OrderListResponse; import com.casic.missiles.model.business.BusinessDealRecord; import com.casic.missiles.model.business.BusinessOrder; @@ -39,4 +38,5 @@ List optionRecord(Long id); + void formExport(Long id, HttpServletResponse response); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java index 0766e9b..557d006 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java @@ -88,7 +88,7 @@ PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); try { DictCodeUtils.convertDictCodeToName(certificateReport); - String printFileName = printFileRegister.registerPrintFile(certificateReport, certificateReport.getCertificateReportTypeName()); + String printFileName = printFileRegister.registerPrintFile(certificateReport, certificateReport.getCertificateReportTypeName()); //生成证书打印信息 CertificatePrintBuilder(certificateReport, printFileName); } catch (Exception ex) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/order/TestOrderPrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/order/TestOrderPrintFileData.java new file mode 100644 index 0000000..0b713c2 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/order/TestOrderPrintFileData.java @@ -0,0 +1,83 @@ +package com.casic.missiles.service.listeners.register.data.order; + +import com.casic.missiles.dto.business.file.FilePrintRegister; +import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum; +import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.service.listeners.register.data.PrintFileDataGeneric; +import com.casic.missiles.service.listeners.register.data.PrintFileDataSupport; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 检测委托单参数生成 + */ +@Component(PrintFileDataBeanNameAliasEnum.TEST_ORDER_BEAN) +public class TestOrderPrintFileData extends PrintFileDataSupport implements PrintFileDataGeneric { + @Value("${casic.template.testOrder}") + private String testOrderTemplateName; + + @Override + public FilePrintRegister CustomizedPrintFileRegister(Object object, String templateFileDir) { + BusinessOrder metaData = (BusinessOrder) object; + //初始化，生成模板文件 + FilePrintRegister filePrintRegister = initialization(templateFileDir, metaData.getId(), getTemplateName(testOrderTemplateName)); + //关联数据 + this.orderBaseInfoPopulate(filePrintRegister, metaData) + //样品数据 + .sampleInfoPopulate(filePrintRegister, metaData.getCustomerSampleInfoList()); + return filePrintRegister; + } + + private TestOrderPrintFileData sampleInfoPopulate(FilePrintRegister filePrintRegister, List customerSampleInfoList) { + List> sampleList = new ArrayList<>(); + if(!CollectionUtils.isEmpty(customerSampleInfoList)){ + for (int i = 0; i < customerSampleInfoList.size(); i++) { + customerSampleInfoList.get(i).setSeq(i + 1); + Map map = new HashMap<>(); + map.put("seq", customerSampleInfoList.get(i).getSeq()); + map.put("sampleName", customerSampleInfoList.get(i).getSampleName()); + map.put("sampleModel", customerSampleInfoList.get(i).getSampleModel()); + map.put("manufacturingNo", customerSampleInfoList.get(i).getManufacturingNo()); + map.put("sampleNo", customerSampleInfoList.get(i).getSampleNo()); + map.put("appearanceStatus", customerSampleInfoList.get(i).getAppearanceStatus()); + map.put("measureContent", customerSampleInfoList.get(i).getMeasureContent()); + map.put("accordStandard", customerSampleInfoList.get(i).getAccordStandard()); + map.put("remark", customerSampleInfoList.get(i).getRemark()); + sampleList.add(map); + } + } + filePrintRegister.getParams().put("sampleList", sampleList); + return this; + } + + private TestOrderPrintFileData orderBaseInfoPopulate(FilePrintRegister filePrintRegister, BusinessOrder metaData) { + Map environmentDataParams = new HashMap<>(); + environmentDataParams.put("orderCode", metaData.getOrderCode()); + environmentDataParams.put("customerName", metaData.getCustomerName()); + environmentDataParams.put("customerAddress", metaData.getCustomerAddress()); + environmentDataParams.put("deliverer", metaData.getDeliverer()); + environmentDataParams.put("fixedTel", metaData.getFixedTel()); + environmentDataParams.put("delivererTel", metaData.getDelivererTel()); + environmentDataParams.put("postalCode", metaData.getPostalCode()); + environmentDataParams.put("certificationCompany", metaData.getCertificationCompany()); + environmentDataParams.put("certificationCompanyAddress", metaData.getCertificationCompanyAddress()); + environmentDataParams.put("invoiceCompany", metaData.getInvoiceCompany()); + environmentDataParams.put("email", metaData.getEmail()); + environmentDataParams.put("requireOverTime", metaData.getRequireOverTime()); + environmentDataParams.put("staffNo", metaData.getStaffNo()); + environmentDataParams.put("receiveDate", metaData.getReceiveDate()); + Map params = new HashMap<>(); + params.putAll(environmentDataParams); + filePrintRegister.setParams(params); + return this; + } + + +}