diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FileParamDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FileParamDataProvider.java index 2d4681e..3f825b1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FileParamDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FileParamDataProvider.java @@ -66,8 +66,12 @@ FileParamDataProvider customerSample(Long sampleId) { CustomerSampleInfo customerSampleInfo = customerSampleService.sampleDetail(sampleId); fileParamData.put("customerSampleName", customerSampleInfo.getSampleName()); + fileParamData.put("sampleModel", customerSampleInfo.getSampleModel()); + fileParamData.put("manufacturingNo", customerSampleInfo.getManufacturingNo()); + fileParamData.put("sampleNo", customerSampleInfo.getSampleNo()); + fileParamData.put("sampleName", customerSampleInfo.getSampleName()); fileParamData.put("customerSampleNo", customerSampleInfo.getSampleNo()); - fileParamData.put("customerAddress", customerSampleInfo.getCustomerAddress()); + fileParamData.put("customerAddress", customerSampleInfo.getCustomerAddress().replace("null","")); fileParamData.put("deliverer", customerSampleInfo.getDeliverer()); fileParamData.put("delivererTel", customerSampleInfo.getDelivererTel()); return this; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FileParamDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FileParamDataProvider.java index 2d4681e..3f825b1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FileParamDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FileParamDataProvider.java @@ -66,8 +66,12 @@ FileParamDataProvider customerSample(Long sampleId) { CustomerSampleInfo customerSampleInfo = customerSampleService.sampleDetail(sampleId); fileParamData.put("customerSampleName", customerSampleInfo.getSampleName()); + fileParamData.put("sampleModel", customerSampleInfo.getSampleModel()); + fileParamData.put("manufacturingNo", customerSampleInfo.getManufacturingNo()); + fileParamData.put("sampleNo", customerSampleInfo.getSampleNo()); + fileParamData.put("sampleName", customerSampleInfo.getSampleName()); fileParamData.put("customerSampleNo", customerSampleInfo.getSampleNo()); - fileParamData.put("customerAddress", customerSampleInfo.getCustomerAddress()); + fileParamData.put("customerAddress", customerSampleInfo.getCustomerAddress().replace("null","")); fileParamData.put("deliverer", customerSampleInfo.getDeliverer()); fileParamData.put("delivererTel", customerSampleInfo.getDelivererTel()); return this; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileDataSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileDataSupport.java index 2d50b62..3f7b303 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileDataSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileDataSupport.java @@ -68,6 +68,7 @@ protected final List signNamesCreator(Map> approvalLogMap, FilePrintRegister filePrintRegister) { List electronicImageList = new ArrayList<>(); for (int i = 0; i < keyParamList.size(); i++) { + //是不是当前的人员,不是就skip if (!approvalLogMap.containsKey(keyParamList.get(i))) { continue; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FileParamDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FileParamDataProvider.java index 2d4681e..3f825b1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FileParamDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FileParamDataProvider.java @@ -66,8 +66,12 @@ FileParamDataProvider customerSample(Long sampleId) { CustomerSampleInfo customerSampleInfo = customerSampleService.sampleDetail(sampleId); fileParamData.put("customerSampleName", customerSampleInfo.getSampleName()); + fileParamData.put("sampleModel", customerSampleInfo.getSampleModel()); + fileParamData.put("manufacturingNo", customerSampleInfo.getManufacturingNo()); + fileParamData.put("sampleNo", customerSampleInfo.getSampleNo()); + fileParamData.put("sampleName", customerSampleInfo.getSampleName()); fileParamData.put("customerSampleNo", customerSampleInfo.getSampleNo()); - fileParamData.put("customerAddress", customerSampleInfo.getCustomerAddress()); + fileParamData.put("customerAddress", customerSampleInfo.getCustomerAddress().replace("null","")); fileParamData.put("deliverer", customerSampleInfo.getDeliverer()); fileParamData.put("delivererTel", customerSampleInfo.getDelivererTel()); return this; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileDataSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileDataSupport.java index 2d50b62..3f7b303 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileDataSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileDataSupport.java @@ -68,6 +68,7 @@ protected final List signNamesCreator(Map> approvalLogMap, FilePrintRegister filePrintRegister) { List electronicImageList = new ArrayList<>(); for (int i = 0; i < keyParamList.size(); i++) { + //是不是当前的人员,不是就skip if (!approvalLogMap.containsKey(keyParamList.get(i))) { continue; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java index bc3d751..c9272ca 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java @@ -51,7 +51,7 @@ @Override protected void customizedSignNamesParamCreator() { - keyParamList = Arrays.asList("校准人", "核验人", "批准人" ); + keyParamList = Arrays.asList("发起人", "核验人", "审核人" ); customizedSignNames = Arrays.asList("校准人", "核验人", "批准人" ); }