diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index d9b2bab..f3d9334 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -174,8 +174,8 @@ @ApiOperation("导出word打印") @PostMapping("/exportFile") - public void exportOriginalFile(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) throws Exception { - certificateReportService.exportOriginalFile(idDTO, response); + public void exportOriginalFile(@RequestBody @Valid BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception { + certificateReportService.exportOriginalFile(certificateReport, response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index d9b2bab..f3d9334 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -174,8 +174,8 @@ @ApiOperation("导出word打印") @PostMapping("/exportFile") - public void exportOriginalFile(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) throws Exception { - certificateReportService.exportOriginalFile(idDTO, response); + public void exportOriginalFile(@RequestBody @Valid BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception { + certificateReportService.exportOriginalFile(certificateReport, response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java index ad1431a..d09d8d8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java @@ -101,8 +101,8 @@ @ApiOperation("导出word打印") @PostMapping("/exportFile") - public void exportOriginalFile(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) throws Exception { - businessOriginalRecordService.exportOriginalFile(idDTO, response); + public void exportOriginalFile(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, HttpServletResponse response) throws Exception { + businessOriginalRecordService.exportOriginalFile(businessOriginalRecord, response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index d9b2bab..f3d9334 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -174,8 +174,8 @@ @ApiOperation("导出word打印") @PostMapping("/exportFile") - public void exportOriginalFile(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) throws Exception { - certificateReportService.exportOriginalFile(idDTO, response); + public void exportOriginalFile(@RequestBody @Valid BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception { + certificateReportService.exportOriginalFile(certificateReport, response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java index ad1431a..d09d8d8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java @@ -101,8 +101,8 @@ @ApiOperation("导出word打印") @PostMapping("/exportFile") - public void exportOriginalFile(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) throws Exception { - businessOriginalRecordService.exportOriginalFile(idDTO, response); + public void exportOriginalFile(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, HttpServletResponse response) throws Exception { + businessOriginalRecordService.exportOriginalFile(businessOriginalRecord, response); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml index 2e3b594..a8e07f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml @@ -100,7 +100,7 @@ SELECT bcp.id,bcp.certificate_report_code AS "certificateNo",bcp.certificate_report_name AS "certificateName",csi.sample_no AS "sampleNo", csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS - "manufacturingNo",bo.order_code AS "orderNo", + "manufacturingNo",bo.order_code AS "orderNo",customer_name AS "customerName", csi.measure_type AS "measureType",bcp.certificate_report_type AS "certificateType",bcp.print_status AS "printStatus",bcp.print_num AS "printNum",bcp.print_file_name AS "printFileName",process_id AS "processId", bcp.approval_status AS "approvalStatus",bcp.create_time AS "createTime",bcp.measure_person_id AS "measurePersonId" diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index d9b2bab..f3d9334 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -174,8 +174,8 @@ @ApiOperation("导出word打印") @PostMapping("/exportFile") - public void exportOriginalFile(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) throws Exception { - certificateReportService.exportOriginalFile(idDTO, response); + public void exportOriginalFile(@RequestBody @Valid BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception { + certificateReportService.exportOriginalFile(certificateReport, response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java index ad1431a..d09d8d8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java @@ -101,8 +101,8 @@ @ApiOperation("导出word打印") @PostMapping("/exportFile") - public void exportOriginalFile(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) throws Exception { - businessOriginalRecordService.exportOriginalFile(idDTO, response); + public void exportOriginalFile(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, HttpServletResponse response) throws Exception { + businessOriginalRecordService.exportOriginalFile(businessOriginalRecord, response); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml index 2e3b594..a8e07f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml @@ -100,7 +100,7 @@ SELECT bcp.id,bcp.certificate_report_code AS "certificateNo",bcp.certificate_report_name AS "certificateName",csi.sample_no AS "sampleNo", csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS - "manufacturingNo",bo.order_code AS "orderNo", + "manufacturingNo",bo.order_code AS "orderNo",customer_name AS "customerName", csi.measure_type AS "measureType",bcp.certificate_report_type AS "certificateType",bcp.print_status AS "printStatus",bcp.print_num AS "printNum",bcp.print_file_name AS "printFileName",process_id AS "processId", bcp.approval_status AS "approvalStatus",bcp.create_time AS "createTime",bcp.measure_person_id AS "measurePersonId" diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml index 349429a..09faa89 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -16,6 +16,13 @@ + + + + + + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index d9b2bab..f3d9334 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -174,8 +174,8 @@ @ApiOperation("导出word打印") @PostMapping("/exportFile") - public void exportOriginalFile(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) throws Exception { - certificateReportService.exportOriginalFile(idDTO, response); + public void exportOriginalFile(@RequestBody @Valid BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception { + certificateReportService.exportOriginalFile(certificateReport, response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java index ad1431a..d09d8d8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java @@ -101,8 +101,8 @@ @ApiOperation("导出word打印") @PostMapping("/exportFile") - public void exportOriginalFile(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) throws Exception { - businessOriginalRecordService.exportOriginalFile(idDTO, response); + public void exportOriginalFile(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, HttpServletResponse response) throws Exception { + businessOriginalRecordService.exportOriginalFile(businessOriginalRecord, response); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml index 2e3b594..a8e07f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml @@ -100,7 +100,7 @@ SELECT bcp.id,bcp.certificate_report_code AS "certificateNo",bcp.certificate_report_name AS "certificateName",csi.sample_no AS "sampleNo", csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS - "manufacturingNo",bo.order_code AS "orderNo", + "manufacturingNo",bo.order_code AS "orderNo",customer_name AS "customerName", csi.measure_type AS "measureType",bcp.certificate_report_type AS "certificateType",bcp.print_status AS "printStatus",bcp.print_num AS "printNum",bcp.print_file_name AS "printFileName",process_id AS "processId", bcp.approval_status AS "approvalStatus",bcp.create_time AS "createTime",bcp.measure_person_id AS "measurePersonId" diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml index 349429a..09faa89 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -16,6 +16,13 @@ + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java index f22e820..5be9325 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java @@ -48,6 +48,10 @@ @ExcelProperty(value = "出厂编号",order = 5) private String manufacturingNo; + @ApiModelProperty(value = "委托书名称", dataType = "String") + @ExcelProperty(value = "委托书名称",order = 6) + private String customerName; + @ApiModelProperty(value = "委托书编号", dataType = "String") @ExcelProperty(value = "委托书编号",order = 6) private String orderNo; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index d9b2bab..f3d9334 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -174,8 +174,8 @@ @ApiOperation("导出word打印") @PostMapping("/exportFile") - public void exportOriginalFile(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) throws Exception { - certificateReportService.exportOriginalFile(idDTO, response); + public void exportOriginalFile(@RequestBody @Valid BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception { + certificateReportService.exportOriginalFile(certificateReport, response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java index ad1431a..d09d8d8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java @@ -101,8 +101,8 @@ @ApiOperation("导出word打印") @PostMapping("/exportFile") - public void exportOriginalFile(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) throws Exception { - businessOriginalRecordService.exportOriginalFile(idDTO, response); + public void exportOriginalFile(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, HttpServletResponse response) throws Exception { + businessOriginalRecordService.exportOriginalFile(businessOriginalRecord, response); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml index 2e3b594..a8e07f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml @@ -100,7 +100,7 @@ SELECT bcp.id,bcp.certificate_report_code AS "certificateNo",bcp.certificate_report_name AS "certificateName",csi.sample_no AS "sampleNo", csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS - "manufacturingNo",bo.order_code AS "orderNo", + "manufacturingNo",bo.order_code AS "orderNo",customer_name AS "customerName", csi.measure_type AS "measureType",bcp.certificate_report_type AS "certificateType",bcp.print_status AS "printStatus",bcp.print_num AS "printNum",bcp.print_file_name AS "printFileName",process_id AS "processId", bcp.approval_status AS "approvalStatus",bcp.create_time AS "createTime",bcp.measure_person_id AS "measurePersonId" diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml index 349429a..09faa89 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -16,6 +16,13 @@ + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java index f22e820..5be9325 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java @@ -48,6 +48,10 @@ @ExcelProperty(value = "出厂编号",order = 5) private String manufacturingNo; + @ApiModelProperty(value = "委托书名称", dataType = "String") + @ExcelProperty(value = "委托书名称",order = 6) + private String customerName; + @ApiModelProperty(value = "委托书编号", dataType = "String") @ExcelProperty(value = "委托书编号",order = 6) private String orderNo; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java index 2306f21..746a365 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -252,7 +252,7 @@ @ApiModelProperty(value = "联系人Id", dataType = "Long") private Long verifierId; - @TableField("verifier") + @TableField(exist = false) @ApiModelProperty(value = "联系人", dataType = "String") private String verifier; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index d9b2bab..f3d9334 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -174,8 +174,8 @@ @ApiOperation("导出word打印") @PostMapping("/exportFile") - public void exportOriginalFile(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) throws Exception { - certificateReportService.exportOriginalFile(idDTO, response); + public void exportOriginalFile(@RequestBody @Valid BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception { + certificateReportService.exportOriginalFile(certificateReport, response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java index ad1431a..d09d8d8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java @@ -101,8 +101,8 @@ @ApiOperation("导出word打印") @PostMapping("/exportFile") - public void exportOriginalFile(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) throws Exception { - businessOriginalRecordService.exportOriginalFile(idDTO, response); + public void exportOriginalFile(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, HttpServletResponse response) throws Exception { + businessOriginalRecordService.exportOriginalFile(businessOriginalRecord, response); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml index 2e3b594..a8e07f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml @@ -100,7 +100,7 @@ SELECT bcp.id,bcp.certificate_report_code AS "certificateNo",bcp.certificate_report_name AS "certificateName",csi.sample_no AS "sampleNo", csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS - "manufacturingNo",bo.order_code AS "orderNo", + "manufacturingNo",bo.order_code AS "orderNo",customer_name AS "customerName", csi.measure_type AS "measureType",bcp.certificate_report_type AS "certificateType",bcp.print_status AS "printStatus",bcp.print_num AS "printNum",bcp.print_file_name AS "printFileName",process_id AS "processId", bcp.approval_status AS "approvalStatus",bcp.create_time AS "createTime",bcp.measure_person_id AS "measurePersonId" diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml index 349429a..09faa89 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -16,6 +16,13 @@ + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java index f22e820..5be9325 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java @@ -48,6 +48,10 @@ @ExcelProperty(value = "出厂编号",order = 5) private String manufacturingNo; + @ApiModelProperty(value = "委托书名称", dataType = "String") + @ExcelProperty(value = "委托书名称",order = 6) + private String customerName; + @ApiModelProperty(value = "委托书编号", dataType = "String") @ExcelProperty(value = "委托书编号",order = 6) private String orderNo; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java index 2306f21..746a365 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -252,7 +252,7 @@ @ApiModelProperty(value = "联系人Id", dataType = "Long") private Long verifierId; - @TableField("verifier") + @TableField(exist = false) @ApiModelProperty(value = "联系人", dataType = "String") private String verifier; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java index b9509c2..ed93fe8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -56,6 +56,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.util.ObjectUtils; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -340,21 +341,16 @@ } @Override - public void exportOriginalFile(@Valid IdDTO idDTO, HttpServletResponse response) { - BusinessCertificateReport certificateReport = this.baseMapper.detailById(idDTO.getId()); - getApprovalSignName(certificateReport); - if (certificateReport.getOriginalRecordId() != null) { - try { - certificateReport.setBusinessOriginalRecord(originalRecordService.originalDetail(certificateReport.getOriginalRecordId())); - if (Objects.isNull(certificateReport.getBusinessOriginalRecord())) { - certificateReport.setBusinessOriginalRecord(new BusinessOriginalRecord()); - } - certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS, certificateReport.getCertificateReportType())); - printFileRegister.registerPrintFile(certificateReport,CALIBRATION_CERTIFICATE,response); - } catch (Exception e) { - e.printStackTrace(); - } - } + public void exportOriginalFile(BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception{ + if(!ObjectUtils.isEmpty(certificateReport.getTemplateId())){ + certificateReport.setBusinessOriginalRecord(originalRecordService.originalDetail(certificateReport.getOriginalRecordId())); + if (Objects.isNull(certificateReport.getBusinessOriginalRecord())) { + certificateReport.setBusinessOriginalRecord(new BusinessOriginalRecord()); + } + certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS, certificateReport.getCertificateReportType())); + printFileRegister.registerPrintFile(certificateReport,CALIBRATION_CERTIFICATE,response); + } + throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES); } private List handleApprovalStatus(Page page, CertificateReportApprovalRequest request) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index d9b2bab..f3d9334 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -174,8 +174,8 @@ @ApiOperation("导出word打印") @PostMapping("/exportFile") - public void exportOriginalFile(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) throws Exception { - certificateReportService.exportOriginalFile(idDTO, response); + public void exportOriginalFile(@RequestBody @Valid BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception { + certificateReportService.exportOriginalFile(certificateReport, response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java index ad1431a..d09d8d8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java @@ -101,8 +101,8 @@ @ApiOperation("导出word打印") @PostMapping("/exportFile") - public void exportOriginalFile(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) throws Exception { - businessOriginalRecordService.exportOriginalFile(idDTO, response); + public void exportOriginalFile(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, HttpServletResponse response) throws Exception { + businessOriginalRecordService.exportOriginalFile(businessOriginalRecord, response); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml index 2e3b594..a8e07f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml @@ -100,7 +100,7 @@ SELECT bcp.id,bcp.certificate_report_code AS "certificateNo",bcp.certificate_report_name AS "certificateName",csi.sample_no AS "sampleNo", csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS - "manufacturingNo",bo.order_code AS "orderNo", + "manufacturingNo",bo.order_code AS "orderNo",customer_name AS "customerName", csi.measure_type AS "measureType",bcp.certificate_report_type AS "certificateType",bcp.print_status AS "printStatus",bcp.print_num AS "printNum",bcp.print_file_name AS "printFileName",process_id AS "processId", bcp.approval_status AS "approvalStatus",bcp.create_time AS "createTime",bcp.measure_person_id AS "measurePersonId" diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml index 349429a..09faa89 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -16,6 +16,13 @@ + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java index f22e820..5be9325 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java @@ -48,6 +48,10 @@ @ExcelProperty(value = "出厂编号",order = 5) private String manufacturingNo; + @ApiModelProperty(value = "委托书名称", dataType = "String") + @ExcelProperty(value = "委托书名称",order = 6) + private String customerName; + @ApiModelProperty(value = "委托书编号", dataType = "String") @ExcelProperty(value = "委托书编号",order = 6) private String orderNo; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java index 2306f21..746a365 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -252,7 +252,7 @@ @ApiModelProperty(value = "联系人Id", dataType = "Long") private Long verifierId; - @TableField("verifier") + @TableField(exist = false) @ApiModelProperty(value = "联系人", dataType = "String") private String verifier; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java index b9509c2..ed93fe8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -56,6 +56,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.util.ObjectUtils; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -340,21 +341,16 @@ } @Override - public void exportOriginalFile(@Valid IdDTO idDTO, HttpServletResponse response) { - BusinessCertificateReport certificateReport = this.baseMapper.detailById(idDTO.getId()); - getApprovalSignName(certificateReport); - if (certificateReport.getOriginalRecordId() != null) { - try { - certificateReport.setBusinessOriginalRecord(originalRecordService.originalDetail(certificateReport.getOriginalRecordId())); - if (Objects.isNull(certificateReport.getBusinessOriginalRecord())) { - certificateReport.setBusinessOriginalRecord(new BusinessOriginalRecord()); - } - certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS, certificateReport.getCertificateReportType())); - printFileRegister.registerPrintFile(certificateReport,CALIBRATION_CERTIFICATE,response); - } catch (Exception e) { - e.printStackTrace(); - } - } + public void exportOriginalFile(BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception{ + if(!ObjectUtils.isEmpty(certificateReport.getTemplateId())){ + certificateReport.setBusinessOriginalRecord(originalRecordService.originalDetail(certificateReport.getOriginalRecordId())); + if (Objects.isNull(certificateReport.getBusinessOriginalRecord())) { + certificateReport.setBusinessOriginalRecord(new BusinessOriginalRecord()); + } + certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS, certificateReport.getCertificateReportType())); + printFileRegister.registerPrintFile(certificateReport,CALIBRATION_CERTIFICATE,response); + } + throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES); } private List handleApprovalStatus(Page page, CertificateReportApprovalRequest request) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java index 64a34fe..a93f5cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -345,11 +345,11 @@ List originalRecords = originalRecordMapper.selectList(null); Map originalRecordMap = originalRecords.stream() - .collect(Collectors.toMap(e -> String.valueOf(e.getSampleId() + e.getOrderId()), e -> e.getMeasureCategory(),(e1,e2)->e1)); + .collect(Collectors.toMap(e -> String.valueOf(e.getSampleId()) + e.getOrderId(), e -> e.getMeasureCategory(), (e1, e2) -> e1)); //需要审批状态， List certificateReportList = certificateReportMapper.selectList(null); Map certificateReportMap = certificateReportList.stream() - .collect(Collectors.toMap(e -> String.valueOf(e.getSampleId() + e.getOrderId()), e -> e,(e1,e2)->e1)); + .collect(Collectors.toMap(e -> String.valueOf(e.getSampleId()) + e.getOrderId(), e -> e, (e1, e2) -> e1)); resultPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page, labExecutiveListRequest, userId, MeasureStatusEnum.IN_MEASURE); //获取所有的原始记录和证书 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index d9b2bab..f3d9334 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -174,8 +174,8 @@ @ApiOperation("导出word打印") @PostMapping("/exportFile") - public void exportOriginalFile(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) throws Exception { - certificateReportService.exportOriginalFile(idDTO, response); + public void exportOriginalFile(@RequestBody @Valid BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception { + certificateReportService.exportOriginalFile(certificateReport, response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java index ad1431a..d09d8d8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java @@ -101,8 +101,8 @@ @ApiOperation("导出word打印") @PostMapping("/exportFile") - public void exportOriginalFile(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) throws Exception { - businessOriginalRecordService.exportOriginalFile(idDTO, response); + public void exportOriginalFile(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, HttpServletResponse response) throws Exception { + businessOriginalRecordService.exportOriginalFile(businessOriginalRecord, response); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml index 2e3b594..a8e07f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml @@ -100,7 +100,7 @@ SELECT bcp.id,bcp.certificate_report_code AS "certificateNo",bcp.certificate_report_name AS "certificateName",csi.sample_no AS "sampleNo", csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS - "manufacturingNo",bo.order_code AS "orderNo", + "manufacturingNo",bo.order_code AS "orderNo",customer_name AS "customerName", csi.measure_type AS "measureType",bcp.certificate_report_type AS "certificateType",bcp.print_status AS "printStatus",bcp.print_num AS "printNum",bcp.print_file_name AS "printFileName",process_id AS "processId", bcp.approval_status AS "approvalStatus",bcp.create_time AS "createTime",bcp.measure_person_id AS "measurePersonId" diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml index 349429a..09faa89 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -16,6 +16,13 @@ + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java index f22e820..5be9325 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java @@ -48,6 +48,10 @@ @ExcelProperty(value = "出厂编号",order = 5) private String manufacturingNo; + @ApiModelProperty(value = "委托书名称", dataType = "String") + @ExcelProperty(value = "委托书名称",order = 6) + private String customerName; + @ApiModelProperty(value = "委托书编号", dataType = "String") @ExcelProperty(value = "委托书编号",order = 6) private String orderNo; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java index 2306f21..746a365 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -252,7 +252,7 @@ @ApiModelProperty(value = "联系人Id", dataType = "Long") private Long verifierId; - @TableField("verifier") + @TableField(exist = false) @ApiModelProperty(value = "联系人", dataType = "String") private String verifier; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java index b9509c2..ed93fe8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -56,6 +56,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.util.ObjectUtils; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -340,21 +341,16 @@ } @Override - public void exportOriginalFile(@Valid IdDTO idDTO, HttpServletResponse response) { - BusinessCertificateReport certificateReport = this.baseMapper.detailById(idDTO.getId()); - getApprovalSignName(certificateReport); - if (certificateReport.getOriginalRecordId() != null) { - try { - certificateReport.setBusinessOriginalRecord(originalRecordService.originalDetail(certificateReport.getOriginalRecordId())); - if (Objects.isNull(certificateReport.getBusinessOriginalRecord())) { - certificateReport.setBusinessOriginalRecord(new BusinessOriginalRecord()); - } - certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS, certificateReport.getCertificateReportType())); - printFileRegister.registerPrintFile(certificateReport,CALIBRATION_CERTIFICATE,response); - } catch (Exception e) { - e.printStackTrace(); - } - } + public void exportOriginalFile(BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception{ + if(!ObjectUtils.isEmpty(certificateReport.getTemplateId())){ + certificateReport.setBusinessOriginalRecord(originalRecordService.originalDetail(certificateReport.getOriginalRecordId())); + if (Objects.isNull(certificateReport.getBusinessOriginalRecord())) { + certificateReport.setBusinessOriginalRecord(new BusinessOriginalRecord()); + } + certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS, certificateReport.getCertificateReportType())); + printFileRegister.registerPrintFile(certificateReport,CALIBRATION_CERTIFICATE,response); + } + throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES); } private List handleApprovalStatus(Page page, CertificateReportApprovalRequest request) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java index 64a34fe..a93f5cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -345,11 +345,11 @@ List originalRecords = originalRecordMapper.selectList(null); Map originalRecordMap = originalRecords.stream() - .collect(Collectors.toMap(e -> String.valueOf(e.getSampleId() + e.getOrderId()), e -> e.getMeasureCategory(),(e1,e2)->e1)); + .collect(Collectors.toMap(e -> String.valueOf(e.getSampleId()) + e.getOrderId(), e -> e.getMeasureCategory(), (e1, e2) -> e1)); //需要审批状态， List certificateReportList = certificateReportMapper.selectList(null); Map certificateReportMap = certificateReportList.stream() - .collect(Collectors.toMap(e -> String.valueOf(e.getSampleId() + e.getOrderId()), e -> e,(e1,e2)->e1)); + .collect(Collectors.toMap(e -> String.valueOf(e.getSampleId()) + e.getOrderId(), e -> e, (e1, e2) -> e1)); resultPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page, labExecutiveListRequest, userId, MeasureStatusEnum.IN_MEASURE); //获取所有的原始记录和证书 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java index 84d5f00..e750416 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -184,7 +184,7 @@ @Transactional public ReturnDTO addOriginal(BusinessOriginalRecord businessOriginalRecord) { initBusinessEnvironmentRecord(businessOriginalRecord); - if (baseMapper.insert(businessOriginalRecord) > 0) { + if (this.baseMapper.insert(businessOriginalRecord) > 0) { //加入技术文件绑定 if (ObjectUtil.isNotEmpty(businessOriginalRecord.getFileList()) && businessOriginalRecord.getFileList().size() > 0) { originalRecordFileRelationService.saveBatch(businessOriginalRecord.getId(), businessOriginalRecord.getFileList()); @@ -213,38 +213,15 @@ } @Override - public void exportOriginalFile(IdDTO idDTO, HttpServletResponse response) throws Exception { - BusinessOriginalRecord businessOriginalRecord = this.baseMapper.selectById(idDTO.getId()); - if (businessOriginalRecord != null) { - //查询样品详情 - if (businessOriginalRecord.getSampleId() != null) { - businessOriginalRecord.setCustomerSampleInfo(customerSampleService.sampleDetail(businessOriginalRecord.getSampleId())); - } - //查询环境记录单详情 - if (businessOriginalRecord.getEnvironmentId() != null) { - businessOriginalRecord.setBusinessEnvironmentRecord(businessEnvironmentRecordService.environmentDetail(businessOriginalRecord.getEnvironmentId())); - } - //查询委托单详情 - if (businessOriginalRecord.getOrderId() != null) { - businessOriginalRecord.setBusinessOrder(businessOrderService.orderDetail(businessOriginalRecord.getOrderId())); - } - - //查询是否有关联的计量文件 - businessOriginalRecord.setFileList(originalRecordFileRelationService.getFilesByOriginalRecordId(idDTO.getId())); - //查询是否有关联的监测设备 - businessOriginalRecord.setEquipmentInfoList(originalRecordEquipmentRelationService.getEquipmentsByOriginalRecordId(idDTO.getId())); - - //字典值转换 - DictCodeUtils.convertDictCodeToName(businessOriginalRecord); - - //显示模板名称 - if (null != businessOriginalRecord.getTemplateId()) { - SystemTemplate systemTemplate = templateService.getById(businessOriginalRecord.getTemplateId()); - if (systemTemplate != null) { - printFileRegister.registerPrintFile(businessOriginalRecord, ORIGINAL_RECORD, response); - } + public void exportOriginalFile(BusinessOriginalRecord businessOriginalRecord, HttpServletResponse response) throws Exception { + //显示模板名称 + if (null != businessOriginalRecord.getTemplateId()) { + SystemTemplate systemTemplate = templateService.getById(businessOriginalRecord.getTemplateId()); + if (systemTemplate != null) { + printFileRegister.registerPrintFile(businessOriginalRecord, ORIGINAL_RECORD, response); } } + throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES); } private void initBusinessEnvironmentRecord(BusinessOriginalRecord businessOriginalRecord) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index d9b2bab..f3d9334 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -174,8 +174,8 @@ @ApiOperation("导出word打印") @PostMapping("/exportFile") - public void exportOriginalFile(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) throws Exception { - certificateReportService.exportOriginalFile(idDTO, response); + public void exportOriginalFile(@RequestBody @Valid BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception { + certificateReportService.exportOriginalFile(certificateReport, response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java index ad1431a..d09d8d8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java @@ -101,8 +101,8 @@ @ApiOperation("导出word打印") @PostMapping("/exportFile") - public void exportOriginalFile(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) throws Exception { - businessOriginalRecordService.exportOriginalFile(idDTO, response); + public void exportOriginalFile(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, HttpServletResponse response) throws Exception { + businessOriginalRecordService.exportOriginalFile(businessOriginalRecord, response); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml index 2e3b594..a8e07f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml @@ -100,7 +100,7 @@ SELECT bcp.id,bcp.certificate_report_code AS "certificateNo",bcp.certificate_report_name AS "certificateName",csi.sample_no AS "sampleNo", csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS - "manufacturingNo",bo.order_code AS "orderNo", + "manufacturingNo",bo.order_code AS "orderNo",customer_name AS "customerName", csi.measure_type AS "measureType",bcp.certificate_report_type AS "certificateType",bcp.print_status AS "printStatus",bcp.print_num AS "printNum",bcp.print_file_name AS "printFileName",process_id AS "processId", bcp.approval_status AS "approvalStatus",bcp.create_time AS "createTime",bcp.measure_person_id AS "measurePersonId" diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml index 349429a..09faa89 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -16,6 +16,13 @@ + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java index f22e820..5be9325 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java @@ -48,6 +48,10 @@ @ExcelProperty(value = "出厂编号",order = 5) private String manufacturingNo; + @ApiModelProperty(value = "委托书名称", dataType = "String") + @ExcelProperty(value = "委托书名称",order = 6) + private String customerName; + @ApiModelProperty(value = "委托书编号", dataType = "String") @ExcelProperty(value = "委托书编号",order = 6) private String orderNo; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java index 2306f21..746a365 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -252,7 +252,7 @@ @ApiModelProperty(value = "联系人Id", dataType = "Long") private Long verifierId; - @TableField("verifier") + @TableField(exist = false) @ApiModelProperty(value = "联系人", dataType = "String") private String verifier; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java index b9509c2..ed93fe8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -56,6 +56,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.util.ObjectUtils; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -340,21 +341,16 @@ } @Override - public void exportOriginalFile(@Valid IdDTO idDTO, HttpServletResponse response) { - BusinessCertificateReport certificateReport = this.baseMapper.detailById(idDTO.getId()); - getApprovalSignName(certificateReport); - if (certificateReport.getOriginalRecordId() != null) { - try { - certificateReport.setBusinessOriginalRecord(originalRecordService.originalDetail(certificateReport.getOriginalRecordId())); - if (Objects.isNull(certificateReport.getBusinessOriginalRecord())) { - certificateReport.setBusinessOriginalRecord(new BusinessOriginalRecord()); - } - certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS, certificateReport.getCertificateReportType())); - printFileRegister.registerPrintFile(certificateReport,CALIBRATION_CERTIFICATE,response); - } catch (Exception e) { - e.printStackTrace(); - } - } + public void exportOriginalFile(BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception{ + if(!ObjectUtils.isEmpty(certificateReport.getTemplateId())){ + certificateReport.setBusinessOriginalRecord(originalRecordService.originalDetail(certificateReport.getOriginalRecordId())); + if (Objects.isNull(certificateReport.getBusinessOriginalRecord())) { + certificateReport.setBusinessOriginalRecord(new BusinessOriginalRecord()); + } + certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS, certificateReport.getCertificateReportType())); + printFileRegister.registerPrintFile(certificateReport,CALIBRATION_CERTIFICATE,response); + } + throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES); } private List handleApprovalStatus(Page page, CertificateReportApprovalRequest request) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java index 64a34fe..a93f5cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -345,11 +345,11 @@ List originalRecords = originalRecordMapper.selectList(null); Map originalRecordMap = originalRecords.stream() - .collect(Collectors.toMap(e -> String.valueOf(e.getSampleId() + e.getOrderId()), e -> e.getMeasureCategory(),(e1,e2)->e1)); + .collect(Collectors.toMap(e -> String.valueOf(e.getSampleId()) + e.getOrderId(), e -> e.getMeasureCategory(), (e1, e2) -> e1)); //需要审批状态， List certificateReportList = certificateReportMapper.selectList(null); Map certificateReportMap = certificateReportList.stream() - .collect(Collectors.toMap(e -> String.valueOf(e.getSampleId() + e.getOrderId()), e -> e,(e1,e2)->e1)); + .collect(Collectors.toMap(e -> String.valueOf(e.getSampleId()) + e.getOrderId(), e -> e, (e1, e2) -> e1)); resultPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page, labExecutiveListRequest, userId, MeasureStatusEnum.IN_MEASURE); //获取所有的原始记录和证书 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java index 84d5f00..e750416 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -184,7 +184,7 @@ @Transactional public ReturnDTO addOriginal(BusinessOriginalRecord businessOriginalRecord) { initBusinessEnvironmentRecord(businessOriginalRecord); - if (baseMapper.insert(businessOriginalRecord) > 0) { + if (this.baseMapper.insert(businessOriginalRecord) > 0) { //加入技术文件绑定 if (ObjectUtil.isNotEmpty(businessOriginalRecord.getFileList()) && businessOriginalRecord.getFileList().size() > 0) { originalRecordFileRelationService.saveBatch(businessOriginalRecord.getId(), businessOriginalRecord.getFileList()); @@ -213,38 +213,15 @@ } @Override - public void exportOriginalFile(IdDTO idDTO, HttpServletResponse response) throws Exception { - BusinessOriginalRecord businessOriginalRecord = this.baseMapper.selectById(idDTO.getId()); - if (businessOriginalRecord != null) { - //查询样品详情 - if (businessOriginalRecord.getSampleId() != null) { - businessOriginalRecord.setCustomerSampleInfo(customerSampleService.sampleDetail(businessOriginalRecord.getSampleId())); - } - //查询环境记录单详情 - if (businessOriginalRecord.getEnvironmentId() != null) { - businessOriginalRecord.setBusinessEnvironmentRecord(businessEnvironmentRecordService.environmentDetail(businessOriginalRecord.getEnvironmentId())); - } - //查询委托单详情 - if (businessOriginalRecord.getOrderId() != null) { - businessOriginalRecord.setBusinessOrder(businessOrderService.orderDetail(businessOriginalRecord.getOrderId())); - } - - //查询是否有关联的计量文件 - businessOriginalRecord.setFileList(originalRecordFileRelationService.getFilesByOriginalRecordId(idDTO.getId())); - //查询是否有关联的监测设备 - businessOriginalRecord.setEquipmentInfoList(originalRecordEquipmentRelationService.getEquipmentsByOriginalRecordId(idDTO.getId())); - - //字典值转换 - DictCodeUtils.convertDictCodeToName(businessOriginalRecord); - - //显示模板名称 - if (null != businessOriginalRecord.getTemplateId()) { - SystemTemplate systemTemplate = templateService.getById(businessOriginalRecord.getTemplateId()); - if (systemTemplate != null) { - printFileRegister.registerPrintFile(businessOriginalRecord, ORIGINAL_RECORD, response); - } + public void exportOriginalFile(BusinessOriginalRecord businessOriginalRecord, HttpServletResponse response) throws Exception { + //显示模板名称 + if (null != businessOriginalRecord.getTemplateId()) { + SystemTemplate systemTemplate = templateService.getById(businessOriginalRecord.getTemplateId()); + if (systemTemplate != null) { + printFileRegister.registerPrintFile(businessOriginalRecord, ORIGINAL_RECORD, response); } } + throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES); } private void initBusinessEnvironmentRecord(BusinessOriginalRecord businessOriginalRecord) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java index 8460e4d..713dd83 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java @@ -50,7 +50,7 @@ Page certificateMonitorsById(CustomerSampleIdRequest customerSampleIdRequest) throws Exception; - void exportOriginalFile(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response); + void exportOriginalFile(@RequestBody @Valid BusinessCertificateReport certificateReport, HttpServletResponse response)throws Exception; Page certificateRecordsById(CustomerSampleIdRequest customerSampleIdRequest) throws Exception; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java index d9b2bab..f3d9334 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java @@ -174,8 +174,8 @@ @ApiOperation("导出word打印") @PostMapping("/exportFile") - public void exportOriginalFile(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) throws Exception { - certificateReportService.exportOriginalFile(idDTO, response); + public void exportOriginalFile(@RequestBody @Valid BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception { + certificateReportService.exportOriginalFile(certificateReport, response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java index ad1431a..d09d8d8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOriginalRecordController.java @@ -101,8 +101,8 @@ @ApiOperation("导出word打印") @PostMapping("/exportFile") - public void exportOriginalFile(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response) throws Exception { - businessOriginalRecordService.exportOriginalFile(idDTO, response); + public void exportOriginalFile(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, HttpServletResponse response) throws Exception { + businessOriginalRecordService.exportOriginalFile(businessOriginalRecord, response); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml index 2e3b594..a8e07f8 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml @@ -100,7 +100,7 @@ SELECT bcp.id,bcp.certificate_report_code AS "certificateNo",bcp.certificate_report_name AS "certificateName",csi.sample_no AS "sampleNo", csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS - "manufacturingNo",bo.order_code AS "orderNo", + "manufacturingNo",bo.order_code AS "orderNo",customer_name AS "customerName", csi.measure_type AS "measureType",bcp.certificate_report_type AS "certificateType",bcp.print_status AS "printStatus",bcp.print_num AS "printNum",bcp.print_file_name AS "printFileName",process_id AS "processId", bcp.approval_status AS "approvalStatus",bcp.create_time AS "createTime",bcp.measure_person_id AS "measurePersonId" diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml index 349429a..09faa89 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordMapper.xml @@ -16,6 +16,13 @@ + + + + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java index f22e820..5be9325 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java @@ -48,6 +48,10 @@ @ExcelProperty(value = "出厂编号",order = 5) private String manufacturingNo; + @ApiModelProperty(value = "委托书名称", dataType = "String") + @ExcelProperty(value = "委托书名称",order = 6) + private String customerName; + @ApiModelProperty(value = "委托书编号", dataType = "String") @ExcelProperty(value = "委托书编号",order = 6) private String orderNo; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java index 2306f21..746a365 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -252,7 +252,7 @@ @ApiModelProperty(value = "联系人Id", dataType = "Long") private Long verifierId; - @TableField("verifier") + @TableField(exist = false) @ApiModelProperty(value = "联系人", dataType = "String") private String verifier; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java index b9509c2..ed93fe8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -56,6 +56,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.util.ObjectUtils; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -340,21 +341,16 @@ } @Override - public void exportOriginalFile(@Valid IdDTO idDTO, HttpServletResponse response) { - BusinessCertificateReport certificateReport = this.baseMapper.detailById(idDTO.getId()); - getApprovalSignName(certificateReport); - if (certificateReport.getOriginalRecordId() != null) { - try { - certificateReport.setBusinessOriginalRecord(originalRecordService.originalDetail(certificateReport.getOriginalRecordId())); - if (Objects.isNull(certificateReport.getBusinessOriginalRecord())) { - certificateReport.setBusinessOriginalRecord(new BusinessOriginalRecord()); - } - certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS, certificateReport.getCertificateReportType())); - printFileRegister.registerPrintFile(certificateReport,CALIBRATION_CERTIFICATE,response); - } catch (Exception e) { - e.printStackTrace(); - } - } + public void exportOriginalFile(BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception{ + if(!ObjectUtils.isEmpty(certificateReport.getTemplateId())){ + certificateReport.setBusinessOriginalRecord(originalRecordService.originalDetail(certificateReport.getOriginalRecordId())); + if (Objects.isNull(certificateReport.getBusinessOriginalRecord())) { + certificateReport.setBusinessOriginalRecord(new BusinessOriginalRecord()); + } + certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS, certificateReport.getCertificateReportType())); + printFileRegister.registerPrintFile(certificateReport,CALIBRATION_CERTIFICATE,response); + } + throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES); } private List handleApprovalStatus(Page page, CertificateReportApprovalRequest request) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java index 64a34fe..a93f5cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -345,11 +345,11 @@ List originalRecords = originalRecordMapper.selectList(null); Map originalRecordMap = originalRecords.stream() - .collect(Collectors.toMap(e -> String.valueOf(e.getSampleId() + e.getOrderId()), e -> e.getMeasureCategory(),(e1,e2)->e1)); + .collect(Collectors.toMap(e -> String.valueOf(e.getSampleId()) + e.getOrderId(), e -> e.getMeasureCategory(), (e1, e2) -> e1)); //需要审批状态， List certificateReportList = certificateReportMapper.selectList(null); Map certificateReportMap = certificateReportList.stream() - .collect(Collectors.toMap(e -> String.valueOf(e.getSampleId() + e.getOrderId()), e -> e,(e1,e2)->e1)); + .collect(Collectors.toMap(e -> String.valueOf(e.getSampleId()) + e.getOrderId(), e -> e, (e1, e2) -> e1)); resultPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page, labExecutiveListRequest, userId, MeasureStatusEnum.IN_MEASURE); //获取所有的原始记录和证书 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java index 84d5f00..e750416 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java @@ -184,7 +184,7 @@ @Transactional public ReturnDTO addOriginal(BusinessOriginalRecord businessOriginalRecord) { initBusinessEnvironmentRecord(businessOriginalRecord); - if (baseMapper.insert(businessOriginalRecord) > 0) { + if (this.baseMapper.insert(businessOriginalRecord) > 0) { //加入技术文件绑定 if (ObjectUtil.isNotEmpty(businessOriginalRecord.getFileList()) && businessOriginalRecord.getFileList().size() > 0) { originalRecordFileRelationService.saveBatch(businessOriginalRecord.getId(), businessOriginalRecord.getFileList()); @@ -213,38 +213,15 @@ } @Override - public void exportOriginalFile(IdDTO idDTO, HttpServletResponse response) throws Exception { - BusinessOriginalRecord businessOriginalRecord = this.baseMapper.selectById(idDTO.getId()); - if (businessOriginalRecord != null) { - //查询样品详情 - if (businessOriginalRecord.getSampleId() != null) { - businessOriginalRecord.setCustomerSampleInfo(customerSampleService.sampleDetail(businessOriginalRecord.getSampleId())); - } - //查询环境记录单详情 - if (businessOriginalRecord.getEnvironmentId() != null) { - businessOriginalRecord.setBusinessEnvironmentRecord(businessEnvironmentRecordService.environmentDetail(businessOriginalRecord.getEnvironmentId())); - } - //查询委托单详情 - if (businessOriginalRecord.getOrderId() != null) { - businessOriginalRecord.setBusinessOrder(businessOrderService.orderDetail(businessOriginalRecord.getOrderId())); - } - - //查询是否有关联的计量文件 - businessOriginalRecord.setFileList(originalRecordFileRelationService.getFilesByOriginalRecordId(idDTO.getId())); - //查询是否有关联的监测设备 - businessOriginalRecord.setEquipmentInfoList(originalRecordEquipmentRelationService.getEquipmentsByOriginalRecordId(idDTO.getId())); - - //字典值转换 - DictCodeUtils.convertDictCodeToName(businessOriginalRecord); - - //显示模板名称 - if (null != businessOriginalRecord.getTemplateId()) { - SystemTemplate systemTemplate = templateService.getById(businessOriginalRecord.getTemplateId()); - if (systemTemplate != null) { - printFileRegister.registerPrintFile(businessOriginalRecord, ORIGINAL_RECORD, response); - } + public void exportOriginalFile(BusinessOriginalRecord businessOriginalRecord, HttpServletResponse response) throws Exception { + //显示模板名称 + if (null != businessOriginalRecord.getTemplateId()) { + SystemTemplate systemTemplate = templateService.getById(businessOriginalRecord.getTemplateId()); + if (systemTemplate != null) { + printFileRegister.registerPrintFile(businessOriginalRecord, ORIGINAL_RECORD, response); } } + throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES); } private void initBusinessEnvironmentRecord(BusinessOriginalRecord businessOriginalRecord) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java index 8460e4d..713dd83 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java @@ -50,7 +50,7 @@ Page certificateMonitorsById(CustomerSampleIdRequest customerSampleIdRequest) throws Exception; - void exportOriginalFile(@RequestBody @Valid IdDTO idDTO, HttpServletResponse response); + void exportOriginalFile(@RequestBody @Valid BusinessCertificateReport certificateReport, HttpServletResponse response)throws Exception; Page certificateRecordsById(CustomerSampleIdRequest customerSampleIdRequest) throws Exception; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java index 047f931..e026a8b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOriginalRecordService.java @@ -34,7 +34,7 @@ void originExport(OriginRecordRequest request, HttpServletResponse response); - void exportOriginalFile(IdDTO idDTO, HttpServletResponse response) throws Exception; + void exportOriginalFile(BusinessOriginalRecord businessOriginalRecord, HttpServletResponse response) throws Exception; }