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 763a3c1..d2a3ee1 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 @@ -268,13 +268,14 @@ * @param tableIndex 删除的表格下标 * @param titleKeyWords 待删除的标题关键字 */ - protected void checkRemoveItem(Map measureDataMap, String key, Map map, String titleParam, Integer titleIndex, + protected Integer checkRemoveItem(Map measureDataMap, String key, Map map, String titleParam, Integer titleIndex, List dataItems, Integer tableIndex, String titleKeyWords) { if (measureDataMap.containsKey(key)) { map.put(titleParam, (titleIndex++) + "."); } else { addDataRemoveItem(dataItems, tableIndex, titleKeyWords); } + return titleIndex; } protected Integer checkRemoveList(List indexList, String key, Map map, String titleParam, Integer titleIndex, 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 763a3c1..d2a3ee1 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 @@ -268,13 +268,14 @@ * @param tableIndex 删除的表格下标 * @param titleKeyWords 待删除的标题关键字 */ - protected void checkRemoveItem(Map measureDataMap, String key, Map map, String titleParam, Integer titleIndex, + protected Integer checkRemoveItem(Map measureDataMap, String key, Map map, String titleParam, Integer titleIndex, List dataItems, Integer tableIndex, String titleKeyWords) { if (measureDataMap.containsKey(key)) { map.put(titleParam, (titleIndex++) + "."); } else { addDataRemoveItem(dataItems, tableIndex, titleKeyWords); } + return titleIndex; } protected Integer checkRemoveList(List indexList, String key, Map map, String titleParam, Integer titleIndex, diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java index 03c6121..86c774f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java @@ -68,7 +68,8 @@ List dataItems = new ArrayList<>(); int titleIndex = 1; Map map = BeanUtil.beanToMap(request); - + map.put("surveyor", "{{@surveyor}}"); + map.put("auditor", "{{@auditor}}"); //划分为最佳点，最差点，典型点 String[] pointStr = {BEST_POINT, WORST_POINT, MODEL_POINT}; //稳定性、重复性 @@ -90,14 +91,13 @@ } else { //选择性删除 addDataRemoveItem(dataItems, titleIndex++, ""); + continue; } BizEquipmentStandardCheckDataCalibrator checkDataCalibrator = new BizEquipmentStandardCheckDataCalibrator(); for (int k = repMapList.size(); k < standardEquipmentColConfig.getMultiCalibration(); k++) { populateCheckData(repMapList, checkDataCalibrator); } map.put(REPEAT_PREFIX + (i + 1), repMapList); - map.put("surveyor", "{{@surveyor}}"); - map.put("auditor", "{{@auditor}}"); repMapList = new ArrayList<>(); //稳定性 List staList = request.getCheckDataCalibratorList() @@ -416,9 +416,9 @@ Map> measureDataMap = measureItemInfo.getMeasureDataCalibratorList().stream().collect( Collectors.groupingBy(BizBusinessDeviceMeasureDataCalibrator::getParams) ); - checkRemoveItem(measureDataMap, "ACI", map, "firstSeq", titleIndex, dataItems, startIndex, "交流电流"); - checkRemoveItem(measureDataMap, "ACV", map, "secondSeq", titleIndex, dataItems, startIndex + 1, "交流电压"); - checkRemoveItem(measureDataMap, "DCI", map, "thirdSeq", titleIndex, dataItems, startIndex + 2, "直流电流"); + titleIndex = checkRemoveItem(measureDataMap, "ACI", map, "firstSeq", titleIndex, dataItems, startIndex, "交流电流"); + titleIndex = checkRemoveItem(measureDataMap, "ACV", map, "secondSeq", titleIndex, dataItems, startIndex + 1, "交流电压"); + titleIndex = checkRemoveItem(measureDataMap, "DCI", map, "thirdSeq", titleIndex, dataItems, startIndex + 2, "直流电流"); checkRemoveItem(measureDataMap, "DCV", map, "fourthSeq", titleIndex, dataItems, startIndex + 3, "直流电压"); } else {//其他检查项 if (CollectionUtils.isEmpty(measureItemInfo.getMeasureDataCalibratorList())) { 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 763a3c1..d2a3ee1 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 @@ -268,13 +268,14 @@ * @param tableIndex 删除的表格下标 * @param titleKeyWords 待删除的标题关键字 */ - protected void checkRemoveItem(Map measureDataMap, String key, Map map, String titleParam, Integer titleIndex, + protected Integer checkRemoveItem(Map measureDataMap, String key, Map map, String titleParam, Integer titleIndex, List dataItems, Integer tableIndex, String titleKeyWords) { if (measureDataMap.containsKey(key)) { map.put(titleParam, (titleIndex++) + "."); } else { addDataRemoveItem(dataItems, tableIndex, titleKeyWords); } + return titleIndex; } protected Integer checkRemoveList(List indexList, String key, Map map, String titleParam, Integer titleIndex, diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java index 03c6121..86c774f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java @@ -68,7 +68,8 @@ List dataItems = new ArrayList<>(); int titleIndex = 1; Map map = BeanUtil.beanToMap(request); - + map.put("surveyor", "{{@surveyor}}"); + map.put("auditor", "{{@auditor}}"); //划分为最佳点，最差点，典型点 String[] pointStr = {BEST_POINT, WORST_POINT, MODEL_POINT}; //稳定性、重复性 @@ -90,14 +91,13 @@ } else { //选择性删除 addDataRemoveItem(dataItems, titleIndex++, ""); + continue; } BizEquipmentStandardCheckDataCalibrator checkDataCalibrator = new BizEquipmentStandardCheckDataCalibrator(); for (int k = repMapList.size(); k < standardEquipmentColConfig.getMultiCalibration(); k++) { populateCheckData(repMapList, checkDataCalibrator); } map.put(REPEAT_PREFIX + (i + 1), repMapList); - map.put("surveyor", "{{@surveyor}}"); - map.put("auditor", "{{@auditor}}"); repMapList = new ArrayList<>(); //稳定性 List staList = request.getCheckDataCalibratorList() @@ -416,9 +416,9 @@ Map> measureDataMap = measureItemInfo.getMeasureDataCalibratorList().stream().collect( Collectors.groupingBy(BizBusinessDeviceMeasureDataCalibrator::getParams) ); - checkRemoveItem(measureDataMap, "ACI", map, "firstSeq", titleIndex, dataItems, startIndex, "交流电流"); - checkRemoveItem(measureDataMap, "ACV", map, "secondSeq", titleIndex, dataItems, startIndex + 1, "交流电压"); - checkRemoveItem(measureDataMap, "DCI", map, "thirdSeq", titleIndex, dataItems, startIndex + 2, "直流电流"); + titleIndex = checkRemoveItem(measureDataMap, "ACI", map, "firstSeq", titleIndex, dataItems, startIndex, "交流电流"); + titleIndex = checkRemoveItem(measureDataMap, "ACV", map, "secondSeq", titleIndex, dataItems, startIndex + 1, "交流电压"); + titleIndex = checkRemoveItem(measureDataMap, "DCI", map, "thirdSeq", titleIndex, dataItems, startIndex + 2, "直流电流"); checkRemoveItem(measureDataMap, "DCV", map, "fourthSeq", titleIndex, dataItems, startIndex + 3, "直流电压"); } else {//其他检查项 if (CollectionUtils.isEmpty(measureItemInfo.getMeasureDataCalibratorList())) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java index 57a9fac..f467e00 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java @@ -59,9 +59,13 @@ } Map map = BeanUtil.beanToMap(request); processCheckAccord(map, request.getLabCode()); + map.put("surveyor", "{{@surveyor}}"); + map.put("auditor", "{{@auditor}}"); String[] pointStr = {DC_VOLTAGE, RESISTANCE_MEASUREMENT}; //重复性、稳定性 final String[] checkTypes = {REPEATABILITY, STABILITY}; + List dataItems = new ArrayList<>(); + int titleIndex = 1; List pointList = Arrays.asList(pointStr); Map numMap = new HashMap<>(); numMap.put(1, 6); @@ -85,6 +89,11 @@ repMapList.add(safetyMap); } map.put(REPEAT_PREFIX + (i + 1), repMapList); + titleIndex++; + }else{ + //选择性删除 + addDataRemoveItem(dataItems, titleIndex++, ""); + continue; } List staList = request.getCheckDataElectricalSafetyList() @@ -130,7 +139,12 @@ //除了选用的模板不一致，模板配置流程是一致的 map.put("pdfStatus", 1); PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); - String wordUrl = printFileRegister.registerPrintFile(ELECTRICAL_SAFETY_CHECK_DATA, "数据打印", null, map, false, null, null); + String wordUrl = printFileRegister.registerPrintFile(ELECTRICAL_SAFETY_CHECK_DATA, "数据打印",null, + RegisterCustomParameters.builder() + .customParam(map) + .dataItems(dataItems) + .pdf(false) + .build()); List urlList = new ArrayList<>(); if (StringUtils.isNotEmpty(wordUrl)) { urlList.add(wordUrl); @@ -172,6 +186,10 @@ if (ObjectUtils.isEmpty(request)) { return null; } +// if (examineOriginalFile(request)) { +// log.debug("校验没有原始记录"); +// return null; +// } if (CollectionUtils.isEmpty(request.getMeasureDataElectricalSafetyList())) { List list = Collections.emptyList(); request.setMeasureDataElectricalSafetyList(list); @@ -236,11 +254,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -254,7 +267,7 @@ //填充参数 prepareParams(safetyList, map); //准备封面参数 - List dataItems = checkParamAddRomveItem(request, 3, map); + List dataItems = checkParamAddRomveItem(request, 4, map); replaceSlash(map); List customTemplateUrls = new ArrayList<>(); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); @@ -269,7 +282,13 @@ PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); - String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, + RegisterCustomParameters.builder() + .customParam(map) + .dataItems(dataItems) + .pdf(false) + .customTemplateUrls(customTemplateUrls) + .build()); urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -299,18 +318,18 @@ map.put("zeroSeq", (titleIndex++) + "."); } //如果是功能校准源，则进行一下删除 - if (measureItemInfo.getItemCategoryName().contains("数字接地电阻表")) { - if (CollectionUtils.isEmpty(measureItemInfo.getMeasureDataCalibratorList())) { - addDataRemoveItem(dataItems, startIndex, measureItemInfo.getItemCategoryName().contains("交流电压") ? "基本误差" : "辅助接地"); - } else { - map.put("firstSeq", (titleIndex++) + "."); - } - } else {//其他检查项 - Map> measureDataMap = measureItemInfo.getMeasureDataCalibratorList().stream().collect( - Collectors.groupingBy(BizBusinessDeviceMeasureDataCalibrator::getParams) + if (measureItemInfo.getItemCategoryName().contains("数字式接地电阻表")) { + Map> measureDataMap = measureItemInfo.getMeasureDataElectricalSafetyList().stream().collect( + Collectors.groupingBy(BizBusinessDeviceMeasureDataElectricalSafety::getDataType) ); - checkRemoveItem(measureDataMap, "ACI", map, "firstSeq", titleIndex, dataItems, startIndex, "开路电压"); - checkRemoveItem(measureDataMap, "ACV", map, "secondSeq", titleIndex, dataItems, startIndex + 1, "示值误差"); + titleIndex=checkRemoveItem(measureDataMap, "1", map, "firstSeq", titleIndex, dataItems, startIndex+1, "示值误差"); + checkRemoveItem(measureDataMap, "2", map, "secondSeq", titleIndex, dataItems, startIndex + 2, "辅助接地电阻"); + } else {//其他检查项 + Map> measureDataMap = measureItemInfo.getMeasureDataElectricalSafetyList().stream().collect( + Collectors.groupingBy(BizBusinessDeviceMeasureDataElectricalSafety::getDataType) + ); + titleIndex=checkRemoveItem(measureDataMap, "1", map, "firstSeq", titleIndex, dataItems, startIndex, "开路电压"); + checkRemoveItem(measureDataMap, "2", map, "secondSeq", titleIndex, dataItems, startIndex + 1, "示值误差"); } return dataItems; } 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 763a3c1..d2a3ee1 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 @@ -268,13 +268,14 @@ * @param tableIndex 删除的表格下标 * @param titleKeyWords 待删除的标题关键字 */ - protected void checkRemoveItem(Map measureDataMap, String key, Map map, String titleParam, Integer titleIndex, + protected Integer checkRemoveItem(Map measureDataMap, String key, Map map, String titleParam, Integer titleIndex, List dataItems, Integer tableIndex, String titleKeyWords) { if (measureDataMap.containsKey(key)) { map.put(titleParam, (titleIndex++) + "."); } else { addDataRemoveItem(dataItems, tableIndex, titleKeyWords); } + return titleIndex; } protected Integer checkRemoveList(List indexList, String key, Map map, String titleParam, Integer titleIndex, diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java index 03c6121..86c774f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java @@ -68,7 +68,8 @@ List dataItems = new ArrayList<>(); int titleIndex = 1; Map map = BeanUtil.beanToMap(request); - + map.put("surveyor", "{{@surveyor}}"); + map.put("auditor", "{{@auditor}}"); //划分为最佳点，最差点，典型点 String[] pointStr = {BEST_POINT, WORST_POINT, MODEL_POINT}; //稳定性、重复性 @@ -90,14 +91,13 @@ } else { //选择性删除 addDataRemoveItem(dataItems, titleIndex++, ""); + continue; } BizEquipmentStandardCheckDataCalibrator checkDataCalibrator = new BizEquipmentStandardCheckDataCalibrator(); for (int k = repMapList.size(); k < standardEquipmentColConfig.getMultiCalibration(); k++) { populateCheckData(repMapList, checkDataCalibrator); } map.put(REPEAT_PREFIX + (i + 1), repMapList); - map.put("surveyor", "{{@surveyor}}"); - map.put("auditor", "{{@auditor}}"); repMapList = new ArrayList<>(); //稳定性 List staList = request.getCheckDataCalibratorList() @@ -416,9 +416,9 @@ Map> measureDataMap = measureItemInfo.getMeasureDataCalibratorList().stream().collect( Collectors.groupingBy(BizBusinessDeviceMeasureDataCalibrator::getParams) ); - checkRemoveItem(measureDataMap, "ACI", map, "firstSeq", titleIndex, dataItems, startIndex, "交流电流"); - checkRemoveItem(measureDataMap, "ACV", map, "secondSeq", titleIndex, dataItems, startIndex + 1, "交流电压"); - checkRemoveItem(measureDataMap, "DCI", map, "thirdSeq", titleIndex, dataItems, startIndex + 2, "直流电流"); + titleIndex = checkRemoveItem(measureDataMap, "ACI", map, "firstSeq", titleIndex, dataItems, startIndex, "交流电流"); + titleIndex = checkRemoveItem(measureDataMap, "ACV", map, "secondSeq", titleIndex, dataItems, startIndex + 1, "交流电压"); + titleIndex = checkRemoveItem(measureDataMap, "DCI", map, "thirdSeq", titleIndex, dataItems, startIndex + 2, "直流电流"); checkRemoveItem(measureDataMap, "DCV", map, "fourthSeq", titleIndex, dataItems, startIndex + 3, "直流电压"); } else {//其他检查项 if (CollectionUtils.isEmpty(measureItemInfo.getMeasureDataCalibratorList())) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java index 57a9fac..f467e00 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java @@ -59,9 +59,13 @@ } Map map = BeanUtil.beanToMap(request); processCheckAccord(map, request.getLabCode()); + map.put("surveyor", "{{@surveyor}}"); + map.put("auditor", "{{@auditor}}"); String[] pointStr = {DC_VOLTAGE, RESISTANCE_MEASUREMENT}; //重复性、稳定性 final String[] checkTypes = {REPEATABILITY, STABILITY}; + List dataItems = new ArrayList<>(); + int titleIndex = 1; List pointList = Arrays.asList(pointStr); Map numMap = new HashMap<>(); numMap.put(1, 6); @@ -85,6 +89,11 @@ repMapList.add(safetyMap); } map.put(REPEAT_PREFIX + (i + 1), repMapList); + titleIndex++; + }else{ + //选择性删除 + addDataRemoveItem(dataItems, titleIndex++, ""); + continue; } List staList = request.getCheckDataElectricalSafetyList() @@ -130,7 +139,12 @@ //除了选用的模板不一致，模板配置流程是一致的 map.put("pdfStatus", 1); PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); - String wordUrl = printFileRegister.registerPrintFile(ELECTRICAL_SAFETY_CHECK_DATA, "数据打印", null, map, false, null, null); + String wordUrl = printFileRegister.registerPrintFile(ELECTRICAL_SAFETY_CHECK_DATA, "数据打印",null, + RegisterCustomParameters.builder() + .customParam(map) + .dataItems(dataItems) + .pdf(false) + .build()); List urlList = new ArrayList<>(); if (StringUtils.isNotEmpty(wordUrl)) { urlList.add(wordUrl); @@ -172,6 +186,10 @@ if (ObjectUtils.isEmpty(request)) { return null; } +// if (examineOriginalFile(request)) { +// log.debug("校验没有原始记录"); +// return null; +// } if (CollectionUtils.isEmpty(request.getMeasureDataElectricalSafetyList())) { List list = Collections.emptyList(); request.setMeasureDataElectricalSafetyList(list); @@ -236,11 +254,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -254,7 +267,7 @@ //填充参数 prepareParams(safetyList, map); //准备封面参数 - List dataItems = checkParamAddRomveItem(request, 3, map); + List dataItems = checkParamAddRomveItem(request, 4, map); replaceSlash(map); List customTemplateUrls = new ArrayList<>(); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); @@ -269,7 +282,13 @@ PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); - String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, + RegisterCustomParameters.builder() + .customParam(map) + .dataItems(dataItems) + .pdf(false) + .customTemplateUrls(customTemplateUrls) + .build()); urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -299,18 +318,18 @@ map.put("zeroSeq", (titleIndex++) + "."); } //如果是功能校准源，则进行一下删除 - if (measureItemInfo.getItemCategoryName().contains("数字接地电阻表")) { - if (CollectionUtils.isEmpty(measureItemInfo.getMeasureDataCalibratorList())) { - addDataRemoveItem(dataItems, startIndex, measureItemInfo.getItemCategoryName().contains("交流电压") ? "基本误差" : "辅助接地"); - } else { - map.put("firstSeq", (titleIndex++) + "."); - } - } else {//其他检查项 - Map> measureDataMap = measureItemInfo.getMeasureDataCalibratorList().stream().collect( - Collectors.groupingBy(BizBusinessDeviceMeasureDataCalibrator::getParams) + if (measureItemInfo.getItemCategoryName().contains("数字式接地电阻表")) { + Map> measureDataMap = measureItemInfo.getMeasureDataElectricalSafetyList().stream().collect( + Collectors.groupingBy(BizBusinessDeviceMeasureDataElectricalSafety::getDataType) ); - checkRemoveItem(measureDataMap, "ACI", map, "firstSeq", titleIndex, dataItems, startIndex, "开路电压"); - checkRemoveItem(measureDataMap, "ACV", map, "secondSeq", titleIndex, dataItems, startIndex + 1, "示值误差"); + titleIndex=checkRemoveItem(measureDataMap, "1", map, "firstSeq", titleIndex, dataItems, startIndex+1, "示值误差"); + checkRemoveItem(measureDataMap, "2", map, "secondSeq", titleIndex, dataItems, startIndex + 2, "辅助接地电阻"); + } else {//其他检查项 + Map> measureDataMap = measureItemInfo.getMeasureDataElectricalSafetyList().stream().collect( + Collectors.groupingBy(BizBusinessDeviceMeasureDataElectricalSafety::getDataType) + ); + titleIndex=checkRemoveItem(measureDataMap, "1", map, "firstSeq", titleIndex, dataItems, startIndex, "开路电压"); + checkRemoveItem(measureDataMap, "2", map, "secondSeq", titleIndex, dataItems, startIndex + 1, "示值误差"); } return dataItems; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 5a23427..4e5ac51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -53,9 +53,9 @@ wrapper.eq("data_id", request.getDataId()); wrapper.ne("approval_status", ApprovalStatusEnum.FAILED); List existList = this.baseMapper.selectList(wrapper); -// if (CollectionUtils.isNotEmpty(existList)) { -// throw new BusinessException(BusinessExceptionEnum.CHECK_RECORD_ALREADY_EXIST); -// } + if (CollectionUtils.isNotEmpty(existList)) { + throw new BusinessException(BusinessExceptionEnum.CHECK_RECORD_ALREADY_EXIST); + } //生成编号 String labCode = request.getLabCode(); String groupCode = request.getGroupCode(); 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 763a3c1..d2a3ee1 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 @@ -268,13 +268,14 @@ * @param tableIndex 删除的表格下标 * @param titleKeyWords 待删除的标题关键字 */ - protected void checkRemoveItem(Map measureDataMap, String key, Map map, String titleParam, Integer titleIndex, + protected Integer checkRemoveItem(Map measureDataMap, String key, Map map, String titleParam, Integer titleIndex, List dataItems, Integer tableIndex, String titleKeyWords) { if (measureDataMap.containsKey(key)) { map.put(titleParam, (titleIndex++) + "."); } else { addDataRemoveItem(dataItems, tableIndex, titleKeyWords); } + return titleIndex; } protected Integer checkRemoveList(List indexList, String key, Map map, String titleParam, Integer titleIndex, diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java index 03c6121..86c774f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java @@ -68,7 +68,8 @@ List dataItems = new ArrayList<>(); int titleIndex = 1; Map map = BeanUtil.beanToMap(request); - + map.put("surveyor", "{{@surveyor}}"); + map.put("auditor", "{{@auditor}}"); //划分为最佳点，最差点，典型点 String[] pointStr = {BEST_POINT, WORST_POINT, MODEL_POINT}; //稳定性、重复性 @@ -90,14 +91,13 @@ } else { //选择性删除 addDataRemoveItem(dataItems, titleIndex++, ""); + continue; } BizEquipmentStandardCheckDataCalibrator checkDataCalibrator = new BizEquipmentStandardCheckDataCalibrator(); for (int k = repMapList.size(); k < standardEquipmentColConfig.getMultiCalibration(); k++) { populateCheckData(repMapList, checkDataCalibrator); } map.put(REPEAT_PREFIX + (i + 1), repMapList); - map.put("surveyor", "{{@surveyor}}"); - map.put("auditor", "{{@auditor}}"); repMapList = new ArrayList<>(); //稳定性 List staList = request.getCheckDataCalibratorList() @@ -416,9 +416,9 @@ Map> measureDataMap = measureItemInfo.getMeasureDataCalibratorList().stream().collect( Collectors.groupingBy(BizBusinessDeviceMeasureDataCalibrator::getParams) ); - checkRemoveItem(measureDataMap, "ACI", map, "firstSeq", titleIndex, dataItems, startIndex, "交流电流"); - checkRemoveItem(measureDataMap, "ACV", map, "secondSeq", titleIndex, dataItems, startIndex + 1, "交流电压"); - checkRemoveItem(measureDataMap, "DCI", map, "thirdSeq", titleIndex, dataItems, startIndex + 2, "直流电流"); + titleIndex = checkRemoveItem(measureDataMap, "ACI", map, "firstSeq", titleIndex, dataItems, startIndex, "交流电流"); + titleIndex = checkRemoveItem(measureDataMap, "ACV", map, "secondSeq", titleIndex, dataItems, startIndex + 1, "交流电压"); + titleIndex = checkRemoveItem(measureDataMap, "DCI", map, "thirdSeq", titleIndex, dataItems, startIndex + 2, "直流电流"); checkRemoveItem(measureDataMap, "DCV", map, "fourthSeq", titleIndex, dataItems, startIndex + 3, "直流电压"); } else {//其他检查项 if (CollectionUtils.isEmpty(measureItemInfo.getMeasureDataCalibratorList())) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java index 57a9fac..f467e00 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java @@ -59,9 +59,13 @@ } Map map = BeanUtil.beanToMap(request); processCheckAccord(map, request.getLabCode()); + map.put("surveyor", "{{@surveyor}}"); + map.put("auditor", "{{@auditor}}"); String[] pointStr = {DC_VOLTAGE, RESISTANCE_MEASUREMENT}; //重复性、稳定性 final String[] checkTypes = {REPEATABILITY, STABILITY}; + List dataItems = new ArrayList<>(); + int titleIndex = 1; List pointList = Arrays.asList(pointStr); Map numMap = new HashMap<>(); numMap.put(1, 6); @@ -85,6 +89,11 @@ repMapList.add(safetyMap); } map.put(REPEAT_PREFIX + (i + 1), repMapList); + titleIndex++; + }else{ + //选择性删除 + addDataRemoveItem(dataItems, titleIndex++, ""); + continue; } List staList = request.getCheckDataElectricalSafetyList() @@ -130,7 +139,12 @@ //除了选用的模板不一致，模板配置流程是一致的 map.put("pdfStatus", 1); PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); - String wordUrl = printFileRegister.registerPrintFile(ELECTRICAL_SAFETY_CHECK_DATA, "数据打印", null, map, false, null, null); + String wordUrl = printFileRegister.registerPrintFile(ELECTRICAL_SAFETY_CHECK_DATA, "数据打印",null, + RegisterCustomParameters.builder() + .customParam(map) + .dataItems(dataItems) + .pdf(false) + .build()); List urlList = new ArrayList<>(); if (StringUtils.isNotEmpty(wordUrl)) { urlList.add(wordUrl); @@ -172,6 +186,10 @@ if (ObjectUtils.isEmpty(request)) { return null; } +// if (examineOriginalFile(request)) { +// log.debug("校验没有原始记录"); +// return null; +// } if (CollectionUtils.isEmpty(request.getMeasureDataElectricalSafetyList())) { List list = Collections.emptyList(); request.setMeasureDataElectricalSafetyList(list); @@ -236,11 +254,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -254,7 +267,7 @@ //填充参数 prepareParams(safetyList, map); //准备封面参数 - List dataItems = checkParamAddRomveItem(request, 3, map); + List dataItems = checkParamAddRomveItem(request, 4, map); replaceSlash(map); List customTemplateUrls = new ArrayList<>(); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); @@ -269,7 +282,13 @@ PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); - String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, + RegisterCustomParameters.builder() + .customParam(map) + .dataItems(dataItems) + .pdf(false) + .customTemplateUrls(customTemplateUrls) + .build()); urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -299,18 +318,18 @@ map.put("zeroSeq", (titleIndex++) + "."); } //如果是功能校准源，则进行一下删除 - if (measureItemInfo.getItemCategoryName().contains("数字接地电阻表")) { - if (CollectionUtils.isEmpty(measureItemInfo.getMeasureDataCalibratorList())) { - addDataRemoveItem(dataItems, startIndex, measureItemInfo.getItemCategoryName().contains("交流电压") ? "基本误差" : "辅助接地"); - } else { - map.put("firstSeq", (titleIndex++) + "."); - } - } else {//其他检查项 - Map> measureDataMap = measureItemInfo.getMeasureDataCalibratorList().stream().collect( - Collectors.groupingBy(BizBusinessDeviceMeasureDataCalibrator::getParams) + if (measureItemInfo.getItemCategoryName().contains("数字式接地电阻表")) { + Map> measureDataMap = measureItemInfo.getMeasureDataElectricalSafetyList().stream().collect( + Collectors.groupingBy(BizBusinessDeviceMeasureDataElectricalSafety::getDataType) ); - checkRemoveItem(measureDataMap, "ACI", map, "firstSeq", titleIndex, dataItems, startIndex, "开路电压"); - checkRemoveItem(measureDataMap, "ACV", map, "secondSeq", titleIndex, dataItems, startIndex + 1, "示值误差"); + titleIndex=checkRemoveItem(measureDataMap, "1", map, "firstSeq", titleIndex, dataItems, startIndex+1, "示值误差"); + checkRemoveItem(measureDataMap, "2", map, "secondSeq", titleIndex, dataItems, startIndex + 2, "辅助接地电阻"); + } else {//其他检查项 + Map> measureDataMap = measureItemInfo.getMeasureDataElectricalSafetyList().stream().collect( + Collectors.groupingBy(BizBusinessDeviceMeasureDataElectricalSafety::getDataType) + ); + titleIndex=checkRemoveItem(measureDataMap, "1", map, "firstSeq", titleIndex, dataItems, startIndex, "开路电压"); + checkRemoveItem(measureDataMap, "2", map, "secondSeq", titleIndex, dataItems, startIndex + 1, "示值误差"); } return dataItems; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 5a23427..4e5ac51 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -53,9 +53,9 @@ wrapper.eq("data_id", request.getDataId()); wrapper.ne("approval_status", ApprovalStatusEnum.FAILED); List existList = this.baseMapper.selectList(wrapper); -// if (CollectionUtils.isNotEmpty(existList)) { -// throw new BusinessException(BusinessExceptionEnum.CHECK_RECORD_ALREADY_EXIST); -// } + if (CollectionUtils.isNotEmpty(existList)) { + throw new BusinessException(BusinessExceptionEnum.CHECK_RECORD_ALREADY_EXIST); + } //生成编号 String labCode = request.getLabCode(); String groupCode = request.getGroupCode(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/WordUtil.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/WordUtil.java index 2c751e9..8db5801 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/WordUtil.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/WordUtil.java @@ -101,6 +101,7 @@ || "\n".equals(document.getParagraphs().get(paragraphIndex).getText()) )) { document.removeBodyElement(tableIndex + paragraphIndex); + paragraphIndex--; } else { break; }