diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index f71529b..64aa8e6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -23,6 +23,7 @@ String MEASURE_DATA = "检定数据管理"; String MULTIFUNCTION_CHECK_DATA = "多功能核查数据"; + String CHECK_DATA_APPROVAL = "核查数据审批"; String MEASURE_DATA_APPROVAL = "检定数据管理审批"; String ORIGINAL_RECORD_APPROVAL = "检定数据原始记录审批"; String RESISTANCE_CHECK_DATA = "活塞式压力"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index f71529b..64aa8e6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -23,6 +23,7 @@ String MEASURE_DATA = "检定数据管理"; String MULTIFUNCTION_CHECK_DATA = "多功能核查数据"; + String CHECK_DATA_APPROVAL = "核查数据审批"; String MEASURE_DATA_APPROVAL = "检定数据管理审批"; String ORIGINAL_RECORD_APPROVAL = "检定数据原始记录审批"; String RESISTANCE_CHECK_DATA = "活塞式压力"; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index f52ba6f..bcd29fa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -195,7 +195,7 @@ TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); //生成证书报告的 CompletableFuture certificateFutureTask = CompletableFuture.supplyAsync( - () -> printFileRegister.registerPrintFile(MULTIFUNCTION_CHECK_DATA, "数据打印", null, map, true, null, customTemplateUrls), threadPool); + () -> printFileRegister.registerPrintFile(CHECK_DATA_APPROVAL, "数据打印", null, map, true, null, customTemplateUrls), threadPool); certificateFutureTask.thenRun( () -> { String certificateFileUrl = certificateFutureTask.join(); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index f71529b..64aa8e6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -23,6 +23,7 @@ String MEASURE_DATA = "检定数据管理"; String MULTIFUNCTION_CHECK_DATA = "多功能核查数据"; + String CHECK_DATA_APPROVAL = "核查数据审批"; String MEASURE_DATA_APPROVAL = "检定数据管理审批"; String ORIGINAL_RECORD_APPROVAL = "检定数据原始记录审批"; String RESISTANCE_CHECK_DATA = "活塞式压力"; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index f52ba6f..bcd29fa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -195,7 +195,7 @@ TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); //生成证书报告的 CompletableFuture certificateFutureTask = CompletableFuture.supplyAsync( - () -> printFileRegister.registerPrintFile(MULTIFUNCTION_CHECK_DATA, "数据打印", null, map, true, null, customTemplateUrls), threadPool); + () -> printFileRegister.registerPrintFile(CHECK_DATA_APPROVAL, "数据打印", null, map, true, null, customTemplateUrls), threadPool); certificateFutureTask.thenRun( () -> { String certificateFileUrl = certificateFutureTask.join(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java index 0fe7f02..51cd506 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java @@ -13,6 +13,7 @@ import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataPistonGauge; import com.casic.missiles.model.business.BizBusinessDeviceMeasureItemConfigPistonGauge; import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataPistonGauge; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentSupport; @@ -56,9 +57,17 @@ bizEquipmentInfoList.add(new BizEquipmentInfo()); request.setCheckEquipmentList(bizEquipmentInfoList); } + if (CollectionUtil.isEmpty(request.getCheckDataPistonGaugeList())) { + List checkDataPistonGaugeList = new ArrayList<>(); + checkDataPistonGaugeList.add(new BizEquipmentStandardCheckDataPistonGauge()); + request.setCheckDataPistonGaugeList(checkDataPistonGaugeList); + } Map map = BeanUtil.beanToMap(request); map.put(UP_STANDARD, "\uF0A3"); map.put(BELOW_STANDARD, "\uF0A3"); + //核查依据文件为空，则设置为无 + request.getEquipmentInfo().setTechnicalFile(StringUtils.isNotEmpty(request.getEquipmentInfo().getTechnicalFile()) ? + request.getEquipmentInfo().getTechnicalFile() : "无"); List customTemplateUrls = new ArrayList<>(1); AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class); String name = dictService.getDictNameByCode("conclusion", request.getConclusion());