diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 3b3c3bd..5a8ffd6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -16,6 +16,8 @@ import java.util.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.MEASURE_DATA; + @Slf4j public class StandardEquipmentSupport implements MeasureCategoryEnum { @@ -106,7 +108,7 @@ map.put("title", "检定结果"); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); if (map.containsKey("conclusion") && "不合格".equals((String) map.get("conclusion"))) { - customUrl = bizBusinessMapper.customTemplateUrl("检定数据", "2", "校验"); + customUrl = bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", "校验"); } break; default: diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 3b3c3bd..5a8ffd6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -16,6 +16,8 @@ import java.util.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.MEASURE_DATA; + @Slf4j public class StandardEquipmentSupport implements MeasureCategoryEnum { @@ -106,7 +108,7 @@ map.put("title", "检定结果"); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); if (map.containsKey("conclusion") && "不合格".equals((String) map.get("conclusion"))) { - customUrl = bizBusinessMapper.customTemplateUrl("检定数据", "2", "校验"); + customUrl = bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", "校验"); } break; default: 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 92fa356..84d1582 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 @@ -239,7 +239,7 @@ } Map map = BeanUtil.beanToMap(measureItemInfo); //准备封面参数 - readyForCoverParams(map, measureItemInfo.getLabCode()); + String customUrl = readyForCoverParams(map, measureItemInfo.getLabCode()); customParam(map, measureItemInfo); if (!map.containsKey("equipmentList") || CollectionUtils.isEmpty((List) map.get("equipmentList"))) { List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); @@ -255,7 +255,8 @@ List dataItems = checkCertificateRemoveItem(measureItemInfo, map); List customTemplateUrls = new ArrayList<>(); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); - customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", measureItemInfo.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", measureItemInfo.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(RESISTANCE_CHECK_DATA, "4", measureItemInfo.getItemCategoryName().equals("电接点一般压力表") ? "电接点" : measureItemInfo.getItemCategoryName())); map.put("id", snowflakeUtil.nextId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 3b3c3bd..5a8ffd6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -16,6 +16,8 @@ import java.util.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.MEASURE_DATA; + @Slf4j public class StandardEquipmentSupport implements MeasureCategoryEnum { @@ -106,7 +108,7 @@ map.put("title", "检定结果"); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); if (map.containsKey("conclusion") && "不合格".equals((String) map.get("conclusion"))) { - customUrl = bizBusinessMapper.customTemplateUrl("检定数据", "2", "校验"); + customUrl = bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", "校验"); } break; default: 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 92fa356..84d1582 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 @@ -239,7 +239,7 @@ } Map map = BeanUtil.beanToMap(measureItemInfo); //准备封面参数 - readyForCoverParams(map, measureItemInfo.getLabCode()); + String customUrl = readyForCoverParams(map, measureItemInfo.getLabCode()); customParam(map, measureItemInfo); if (!map.containsKey("equipmentList") || CollectionUtils.isEmpty((List) map.get("equipmentList"))) { List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); @@ -255,7 +255,8 @@ List dataItems = checkCertificateRemoveItem(measureItemInfo, map); List customTemplateUrls = new ArrayList<>(); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); - customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", measureItemInfo.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", measureItemInfo.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(RESISTANCE_CHECK_DATA, "4", measureItemInfo.getItemCategoryName().equals("电接点一般压力表") ? "电接点" : measureItemInfo.getItemCategoryName())); map.put("id", snowflakeUtil.nextId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SateyValueHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SateyValueHandler.java index c4fe2b2..3067e88 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SateyValueHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SateyValueHandler.java @@ -195,6 +195,7 @@ // urlList.add((String) map.get("pdfUrl")); // } // log.debug("certificate after------------{}", wordUrl); +// return urlList; return Collections.emptyList(); } catch (Exception ex) { log.debug("doCreateOriginalFile Exception is -----------{}", ex);