diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml index 4e89c6e..e277576 100644 --- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml @@ -22,7 +22,7 @@ SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel, bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse, fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee, - fbsi.received_amount,fbsi.invoice_amount + fbsi.received_amount,fbsi.invoice_amount, bo.order_time FROM finance_business_settlement_info fbsi LEFT JOIN business_order bo ON fbsi.order_id = bo.id WHERE bo.is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml index 4e89c6e..e277576 100644 --- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml @@ -22,7 +22,7 @@ SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel, bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse, fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee, - fbsi.received_amount,fbsi.invoice_amount + fbsi.received_amount,fbsi.invoice_amount, bo.order_time FROM finance_business_settlement_info fbsi LEFT JOIN business_order bo ON fbsi.order_id = bo.id WHERE bo.is_del = 0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java index 4db5fcb..9a6728e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java @@ -291,16 +291,20 @@ */ @TableField("mesure_result") @DictCodeField(message = "检定结果不合法", cacheName = MeterDictCode.MESURE_RESULT) - @ApiModelProperty(value = "检定结果", dataType = "String", required = false) + @ApiModelProperty(value = "检定结果", dataType = "String") private String mesureResult; /** * 检定结果名称 */ @TableField(exist = false) - @ApiModelProperty(value = "检定结果名称", dataType = "String", required = false) + @ApiModelProperty(value = "检定结果名称", dataType = "String") private String mesureResultName; + @TableField("certificate_no") + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificateNo; + /** * 是否是技术指标需要校准检定的设备 */ diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml index 4e89c6e..e277576 100644 --- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml @@ -22,7 +22,7 @@ SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel, bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse, fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee, - fbsi.received_amount,fbsi.invoice_amount + fbsi.received_amount,fbsi.invoice_amount, bo.order_time FROM finance_business_settlement_info fbsi LEFT JOIN business_order bo ON fbsi.order_id = bo.id WHERE bo.is_del = 0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java index 4db5fcb..9a6728e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java @@ -291,16 +291,20 @@ */ @TableField("mesure_result") @DictCodeField(message = "检定结果不合法", cacheName = MeterDictCode.MESURE_RESULT) - @ApiModelProperty(value = "检定结果", dataType = "String", required = false) + @ApiModelProperty(value = "检定结果", dataType = "String") private String mesureResult; /** * 检定结果名称 */ @TableField(exist = false) - @ApiModelProperty(value = "检定结果名称", dataType = "String", required = false) + @ApiModelProperty(value = "检定结果名称", dataType = "String") private String mesureResultName; + @TableField("certificate_no") + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificateNo; + /** * 是否是技术指标需要校准检定的设备 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java index 79fa4f9..c53c2d4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java @@ -112,6 +112,7 @@ for (EquipmentFixedAssets equipmentInfo : metaData.getEquipmentInfoList()) { Map map = BeanUtil.beanToMap(equipmentInfo); map.put("nameAndModel", equipmentInfo.getEquipmentName() + " " + equipmentInfo.getModelNo()); + map.put("deptNameAndCertificateNo", equipmentInfo.getMesureDeptName() + " " + equipmentInfo.getCertificateNo()); mapList.add(map); } } diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml index 4e89c6e..e277576 100644 --- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml @@ -22,7 +22,7 @@ SELECT bo.id AS order_id, fbsi.id, bo.order_code, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.deliverer_tel, bo.is_urgent, bo.create_time, fbsi.suggested_discount, fbsi.extra_charge, fbsi.extra_charge_illustration,fbsi.sample_warehouse, fbsi.cert_warehouse,fbsi.fee_status,fbsi.received,fbsi.remark,fbsi.should_test_fee,fbsi.actual_test_fee,fbsi.actual_total_fee, - fbsi.received_amount,fbsi.invoice_amount + fbsi.received_amount,fbsi.invoice_amount, bo.order_time FROM finance_business_settlement_info fbsi LEFT JOIN business_order bo ON fbsi.order_id = bo.id WHERE bo.is_del = 0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java index 4db5fcb..9a6728e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java @@ -291,16 +291,20 @@ */ @TableField("mesure_result") @DictCodeField(message = "检定结果不合法", cacheName = MeterDictCode.MESURE_RESULT) - @ApiModelProperty(value = "检定结果", dataType = "String", required = false) + @ApiModelProperty(value = "检定结果", dataType = "String") private String mesureResult; /** * 检定结果名称 */ @TableField(exist = false) - @ApiModelProperty(value = "检定结果名称", dataType = "String", required = false) + @ApiModelProperty(value = "检定结果名称", dataType = "String") private String mesureResultName; + @TableField("certificate_no") + @ApiModelProperty(value = "证书编号", dataType = "String") + private String certificateNo; + /** * 是否是技术指标需要校准检定的设备 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java index 79fa4f9..c53c2d4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java @@ -112,6 +112,7 @@ for (EquipmentFixedAssets equipmentInfo : metaData.getEquipmentInfoList()) { Map map = BeanUtil.beanToMap(equipmentInfo); map.put("nameAndModel", equipmentInfo.getEquipmentName() + " " + equipmentInfo.getModelNo()); + map.put("deptNameAndCertificateNo", equipmentInfo.getMesureDeptName() + " " + equipmentInfo.getCertificateNo()); mapList.add(map); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ExcelPrintUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ExcelPrintUtils.java index e1addc6..45a807b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ExcelPrintUtils.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ExcelPrintUtils.java @@ -61,7 +61,7 @@ * @return * @throws IOException */ - private static String exportParam(String tempLocalFileDir, FilePrintRegister filePrintRegister, String customFileName) throws IOException { + private static String exportParam(String tempLocalFileDir, FilePrintRegister filePrintRegister, String customFileName) { // 加载模板 customFileName = StringUtils.isNotEmpty(customFileName) ? customFileName + ".xls" : filePrintRegister.getFileName(); TemplateExportParams params = new TemplateExportParams(tempLocalFileDir + filePrintRegister.getFileName()); @@ -96,21 +96,6 @@ * @throws IOException */ private static void getQrCode(String tempDir, String customFileName, String pdfNewUrl, FilePrintRegister filePrintRegister) throws IOException { -// if (StringUtils.isEmpty(filePrintRegister.getQrCode())) { -// return; -// } -// String urlPath = StringUtils.isNotEmpty(customFileName) ? customFileName + ".jpg" : "检测.jpg"; -// String[] split = wordOldUrl.split("\\."); -// String content = ""; -// if (split.length > 1) { -// content = split[0] + "_" + System.currentTimeMillis() + ".pdf"; -// } else { -// content = wordOldUrl + System.currentTimeMillis(); -// } -// filePrintRegister.setQrCode(content); -// // 加载模板 -// OutputStream output = new FileOutputStream(tempDir + urlPath); -// QRCodeUtil.getQRCode(tempDir + content, output); if (StringUtils.isEmpty(filePrintRegister.getQrCode())) { return; } @@ -118,7 +103,7 @@ String[] split = pdfNewUrl.split("\\."); String content = split[0].replaceAll("[\\u4e00-\\u9fa5]", "") + System.currentTimeMillis() + ".png"; filePrintRegister.setQrCode(content); - // 加载模板 + //二维码生成至临时目录 OutputStream output = new FileOutputStream(tempDir + urlPath); MinioUtil minioUtil = SpringContextUtil.getBean(MinioUtil.class); QRCodeUtil.getQRCode(minioUtil.getPreviewUrl(content), output); @@ -127,7 +112,7 @@ /** * 填充图片 */ - private static void imageWrite(String filePath, List electronicImageList) throws Exception { + private static void imageWrite(String filePath, List electronicImageList) { Map> sameKeyWordSealMaps = null; if (CollectionUtils.isNotEmpty(electronicImageList)) { sameKeyWordSealMaps = electronicImageList.stream()