diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 896fd33..54ba2f2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -115,6 +115,9 @@ MEASURE_DATA_ALREADY_EXIST(2634,"当前检定数据已生成原始记录及证书,无法删除"), MEASURE_DATA_IS_AUTO(2635,"当前检定数据由自动检定系统生成,无法删除"), MEASURE_CERT_ALREADY_EXIST(2634,"当前检定数据已存在原始记录及证书"), + ORIGINAL_RECORD_CREATE_FAILED(2635, "生成的原始记录异常,无法保存到草稿箱"), + CERTIFICATE_CREATE_FAILED(2636, "生成的检定证书异常,无法保存到草稿箱"), + CHECK_RECORD_CREATE_FAILED(2637, "核查数据的证书生成异常,无法保存到草稿箱"), /** * 历史遗留备用 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 896fd33..54ba2f2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -115,6 +115,9 @@ MEASURE_DATA_ALREADY_EXIST(2634,"当前检定数据已生成原始记录及证书,无法删除"), MEASURE_DATA_IS_AUTO(2635,"当前检定数据由自动检定系统生成,无法删除"), MEASURE_CERT_ALREADY_EXIST(2634,"当前检定数据已存在原始记录及证书"), + ORIGINAL_RECORD_CREATE_FAILED(2635, "生成的原始记录异常,无法保存到草稿箱"), + CERTIFICATE_CREATE_FAILED(2636, "生成的检定证书异常,无法保存到草稿箱"), + CHECK_RECORD_CREATE_FAILED(2637, "核查数据的证书生成异常,无法保存到草稿箱"), /** * 历史遗留备用 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityInternalAuditManagementVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityInternalAuditManagementVO.java index ee7be99..e182380 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityInternalAuditManagementVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityInternalAuditManagementVO.java @@ -6,7 +6,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.w3c.dom.stylesheets.LinkStyle; import java.util.Date; import java.util.List; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 896fd33..54ba2f2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -115,6 +115,9 @@ MEASURE_DATA_ALREADY_EXIST(2634,"当前检定数据已生成原始记录及证书,无法删除"), MEASURE_DATA_IS_AUTO(2635,"当前检定数据由自动检定系统生成,无法删除"), MEASURE_CERT_ALREADY_EXIST(2634,"当前检定数据已存在原始记录及证书"), + ORIGINAL_RECORD_CREATE_FAILED(2635, "生成的原始记录异常,无法保存到草稿箱"), + CERTIFICATE_CREATE_FAILED(2636, "生成的检定证书异常,无法保存到草稿箱"), + CHECK_RECORD_CREATE_FAILED(2637, "核查数据的证书生成异常,无法保存到草稿箱"), /** * 历史遗留备用 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityInternalAuditManagementVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityInternalAuditManagementVO.java index ee7be99..e182380 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityInternalAuditManagementVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityInternalAuditManagementVO.java @@ -6,7 +6,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.w3c.dom.stylesheets.LinkStyle; import java.util.Date; import java.util.List; 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 82e26ca..70d5182 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 @@ -59,6 +59,11 @@ StandardEquipmentPrint standardEquipmentPrint = SpringContextUtil.getBean(request.getBelongStandardEquipment()); List checkCertificateFileList = standardEquipmentPrint.doCheckCertificateFile(request); BizEquipmentStandardCheckRecordApprovalMapper bizRecordApprovalMapper = SpringContextUtil.getBean(BizEquipmentStandardCheckRecordApprovalMapper.class); + if (checkCertificateFileList != null && CollectionUtils.isEmpty(checkCertificateFileList)) { + //生成证书失败,删除保存的记录 + bizRecordApprovalMapper.deleteById(request); + throw new BusinessException(BusinessExceptionEnum.CHECK_RECORD_CREATE_FAILED); + } if (CollectionUtils.isNotEmpty(checkCertificateFileList)) { //原始记录文件 request.setCheckRecordFile(checkCertificateFileList.size() > 1 ? checkCertificateFileList.get(1) : ""); @@ -68,10 +73,6 @@ Assert.isFalse(updateFlag <= 0, () -> { throw new BusinessException(BusinessExceptionEnum.CHECK_APPROVAL_UPDATE_FAILED); }); - } else { - //生成证书失败,删除保存的记录 - bizRecordApprovalMapper.deleteById(request); - throw new BusinessException(BusinessExceptionEnum.CHECK_FILE_CREATE_FAILED); } } @@ -250,29 +251,32 @@ List certificateFileUrl = certificateFutureTask.join(); List originalRecordFileUrl = originalFutureTask.join(); log.debug("----------------get result orign is {},certificate is {}", originalRecordFileUrl, certificateFileUrl); - if (CollectionUtils.isNotEmpty(certificateFileUrl) || CollectionUtils.isNotEmpty(originalRecordFileUrl)) { - //生成证书文件 - if (CollectionUtils.isNotEmpty(certificateFileUrl)) { - request.setCertificateFile(certificateFileUrl.size() > 1 ? certificateFileUrl.get(1) : ""); - request.setCertificateWordFile(certificateFileUrl.get(0)); - } - //原始记录文件 - if (CollectionUtils.isNotEmpty(originalRecordFileUrl)) { - request.setOriginalRecordFile(originalRecordFileUrl.size() > 1 ? originalRecordFileUrl.get(1) : ""); - request.setOriginalRecordWordFile(originalRecordFileUrl.get(0)); - } - //更新记录 - int updateFlag = bizBusinessMapper.updateById(request); - log.debug("----------------update flag {}", updateFlag); - Assert.isFalse(updateFlag <= 0, () -> { - throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); - }); - } else { - log.debug("----------------delete is{}", originalFutureTask.join()); + if (certificateFileUrl != null && CollectionUtils.isEmpty(certificateFileUrl)) { //生成证书失败,删除保存的记录 bizBusinessMapper.deleteById(request); - throw new BusinessException(BusinessExceptionEnum.MEASURE_FILE_CREATE_FAILED); + throw new BusinessException(BusinessExceptionEnum.ORIGINAL_RECORD_CREATE_FAILED); } + if (originalRecordFileUrl != null && CollectionUtils.isEmpty(originalRecordFileUrl)) { + //生成证书失败,删除保存的记录 + bizBusinessMapper.deleteById(request); + throw new BusinessException(BusinessExceptionEnum.CERTIFICATE_CREATE_FAILED); + } + //生成证书文件 + if (CollectionUtils.isNotEmpty(certificateFileUrl)) { + request.setCertificateFile(certificateFileUrl.size() > 1 ? certificateFileUrl.get(1) : ""); + request.setCertificateWordFile(certificateFileUrl.get(0)); + } + //原始记录文件 + if (CollectionUtils.isNotEmpty(originalRecordFileUrl)) { + request.setOriginalRecordFile(originalRecordFileUrl.size() > 1 ? originalRecordFileUrl.get(1) : ""); + request.setOriginalRecordWordFile(originalRecordFileUrl.get(0)); + } + //更新记录 + int updateFlag = bizBusinessMapper.updateById(request); + log.debug("----------------update flag {}", updateFlag); + Assert.isFalse(updateFlag <= 0, () -> { + throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); + }); } catch (Exception ex) { log.debug("---- data is exception,ex this is {}", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_GET_FAILED); @@ -318,7 +322,8 @@ } } - private BizBusinessCertificatePrint getCertificatePrintByReport(BizBusinessDeviceMeasureApproval measureApproval) { + private BizBusinessCertificatePrint getCertificatePrintByReport(BizBusinessDeviceMeasureApproval + measureApproval) { BizBusinessCertificatePrint certificatePrint = new BizBusinessCertificatePrint(); certificatePrint.setReportId(measureApproval.getId()); certificatePrint.setPrintNum(0); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 896fd33..54ba2f2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -115,6 +115,9 @@ MEASURE_DATA_ALREADY_EXIST(2634,"当前检定数据已生成原始记录及证书,无法删除"), MEASURE_DATA_IS_AUTO(2635,"当前检定数据由自动检定系统生成,无法删除"), MEASURE_CERT_ALREADY_EXIST(2634,"当前检定数据已存在原始记录及证书"), + ORIGINAL_RECORD_CREATE_FAILED(2635, "生成的原始记录异常,无法保存到草稿箱"), + CERTIFICATE_CREATE_FAILED(2636, "生成的检定证书异常,无法保存到草稿箱"), + CHECK_RECORD_CREATE_FAILED(2637, "核查数据的证书生成异常,无法保存到草稿箱"), /** * 历史遗留备用 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityInternalAuditManagementVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityInternalAuditManagementVO.java index ee7be99..e182380 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityInternalAuditManagementVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityInternalAuditManagementVO.java @@ -6,7 +6,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.w3c.dom.stylesheets.LinkStyle; import java.util.Date; import java.util.List; 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 82e26ca..70d5182 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 @@ -59,6 +59,11 @@ StandardEquipmentPrint standardEquipmentPrint = SpringContextUtil.getBean(request.getBelongStandardEquipment()); List checkCertificateFileList = standardEquipmentPrint.doCheckCertificateFile(request); BizEquipmentStandardCheckRecordApprovalMapper bizRecordApprovalMapper = SpringContextUtil.getBean(BizEquipmentStandardCheckRecordApprovalMapper.class); + if (checkCertificateFileList != null && CollectionUtils.isEmpty(checkCertificateFileList)) { + //生成证书失败,删除保存的记录 + bizRecordApprovalMapper.deleteById(request); + throw new BusinessException(BusinessExceptionEnum.CHECK_RECORD_CREATE_FAILED); + } if (CollectionUtils.isNotEmpty(checkCertificateFileList)) { //原始记录文件 request.setCheckRecordFile(checkCertificateFileList.size() > 1 ? checkCertificateFileList.get(1) : ""); @@ -68,10 +73,6 @@ Assert.isFalse(updateFlag <= 0, () -> { throw new BusinessException(BusinessExceptionEnum.CHECK_APPROVAL_UPDATE_FAILED); }); - } else { - //生成证书失败,删除保存的记录 - bizRecordApprovalMapper.deleteById(request); - throw new BusinessException(BusinessExceptionEnum.CHECK_FILE_CREATE_FAILED); } } @@ -250,29 +251,32 @@ List certificateFileUrl = certificateFutureTask.join(); List originalRecordFileUrl = originalFutureTask.join(); log.debug("----------------get result orign is {},certificate is {}", originalRecordFileUrl, certificateFileUrl); - if (CollectionUtils.isNotEmpty(certificateFileUrl) || CollectionUtils.isNotEmpty(originalRecordFileUrl)) { - //生成证书文件 - if (CollectionUtils.isNotEmpty(certificateFileUrl)) { - request.setCertificateFile(certificateFileUrl.size() > 1 ? certificateFileUrl.get(1) : ""); - request.setCertificateWordFile(certificateFileUrl.get(0)); - } - //原始记录文件 - if (CollectionUtils.isNotEmpty(originalRecordFileUrl)) { - request.setOriginalRecordFile(originalRecordFileUrl.size() > 1 ? originalRecordFileUrl.get(1) : ""); - request.setOriginalRecordWordFile(originalRecordFileUrl.get(0)); - } - //更新记录 - int updateFlag = bizBusinessMapper.updateById(request); - log.debug("----------------update flag {}", updateFlag); - Assert.isFalse(updateFlag <= 0, () -> { - throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); - }); - } else { - log.debug("----------------delete is{}", originalFutureTask.join()); + if (certificateFileUrl != null && CollectionUtils.isEmpty(certificateFileUrl)) { //生成证书失败,删除保存的记录 bizBusinessMapper.deleteById(request); - throw new BusinessException(BusinessExceptionEnum.MEASURE_FILE_CREATE_FAILED); + throw new BusinessException(BusinessExceptionEnum.ORIGINAL_RECORD_CREATE_FAILED); } + if (originalRecordFileUrl != null && CollectionUtils.isEmpty(originalRecordFileUrl)) { + //生成证书失败,删除保存的记录 + bizBusinessMapper.deleteById(request); + throw new BusinessException(BusinessExceptionEnum.CERTIFICATE_CREATE_FAILED); + } + //生成证书文件 + if (CollectionUtils.isNotEmpty(certificateFileUrl)) { + request.setCertificateFile(certificateFileUrl.size() > 1 ? certificateFileUrl.get(1) : ""); + request.setCertificateWordFile(certificateFileUrl.get(0)); + } + //原始记录文件 + if (CollectionUtils.isNotEmpty(originalRecordFileUrl)) { + request.setOriginalRecordFile(originalRecordFileUrl.size() > 1 ? originalRecordFileUrl.get(1) : ""); + request.setOriginalRecordWordFile(originalRecordFileUrl.get(0)); + } + //更新记录 + int updateFlag = bizBusinessMapper.updateById(request); + log.debug("----------------update flag {}", updateFlag); + Assert.isFalse(updateFlag <= 0, () -> { + throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); + }); } catch (Exception ex) { log.debug("---- data is exception,ex this is {}", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_GET_FAILED); @@ -318,7 +322,8 @@ } } - private BizBusinessCertificatePrint getCertificatePrintByReport(BizBusinessDeviceMeasureApproval measureApproval) { + private BizBusinessCertificatePrint getCertificatePrintByReport(BizBusinessDeviceMeasureApproval + measureApproval) { BizBusinessCertificatePrint certificatePrint = new BizBusinessCertificatePrint(); certificatePrint.setReportId(measureApproval.getId()); certificatePrint.setPrintNum(0); 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 03f10cb..80503da 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 @@ -7,7 +7,9 @@ import com.casic.missiles.dto.certificate.ToBeRemoveDataItem; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.business.MeasureCategoryEnum; +import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import com.casic.missiles.utils.SpringContextUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -81,8 +83,9 @@ return false; } - protected void readyForCoverParams(Map map, String labCode) { + protected String readyForCoverParams(Map map, String labCode) { //定制参数 + String customUrl = ""; //初始化方框 map.put("test", "\uF0A3"); map.put("calibrate", "\uF0A3"); @@ -91,14 +94,22 @@ switch ((String) map.get("measureCategoryName")) { case TEST_REPORT: map.put("test", "\uF052"); + map.put("title", "测试结果"); break; case CALIBRATE_REPORT: map.put("calibrate", "\uF052"); + map.put("title", "校准结果"); break; case MEASURE_REPORT: map.put("measure", "\uF052"); + map.put("title", "检定结果"); + BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); + if (map.containsKey("outcome") && "不合格".equals((String) map.get("conclusion"))) { + customUrl = bizBusinessMapper.customTemplateUrl("检定数据", "2", "校验"); + } break; default: + map.put("title", "校验结果"); break; } //技术文件处理 @@ -145,7 +156,7 @@ //健壮性校验 if (StringUtils.isEmpty(labCode)) { log.warn("组织接口不能传入为空,打印文档生成文档填充组织失败..."); - return; + return customUrl; } //选择方框 switch ((String) map.get("measureCategoryName")) { @@ -181,19 +192,14 @@ String traceDate = (String) map.get(MEASURE_TRACE_DATE); DateTime dateTime = DateUtil.parseDate(traceDate); map.put(MEASURE_TRACE_DATE, DateUtil.formatChineseDate(dateTime, false, false)); -// map.put(YEAR, DateUtil.year(dateTime)); -// map.put(MONTH, DateUtil.month(dateTime) + 1); -// map.put(DAY, DateUtil.dayOfMonth(dateTime)); } //填充有效日期 if (ObjectUtils.isNotEmpty(map.get(MEASURE_VALID_DATE))) { String measureValidDate = (String) map.get(MEASURE_VALID_DATE); DateTime dateTime = DateUtil.parseDate(measureValidDate); map.put(MEASURE_VALID_DATE, DateUtil.formatChineseDate(dateTime, false, false)); -// map.put(MEASURE_YEAR, DateUtil.year(dateTime)); -// map.put(MEASURE_MONTH, DateUtil.month(dateTime) + 1); -// map.put(MEASURE_DAY, DateUtil.dayOfMonth(dateTime)); } + return customUrl; } @@ -269,7 +275,7 @@ */ protected Integer checkRemoveItem(Map measureDataMap, String key, Map map, String titleParam, Integer titleIndex, List dataItems, Integer tableIndex, String titleKeyWords) { - if (map.containsKey(key)&&ObjectUtils.isNotEmpty(map.get(key))) { + if (map.containsKey(key) && ObjectUtils.isNotEmpty(map.get(key))) { map.put(titleParam, (titleIndex++) + "."); } else { addDataRemoveItem(dataItems, tableIndex, titleKeyWords); @@ -279,7 +285,7 @@ protected Integer checkRemoveList(List indexList, String key, Map map, String titleParam, Integer titleIndex, List dataItems, Integer tableIndex, String titleKeyWords) { - if (map.containsKey(key)&&ObjectUtils.isNotEmpty(map.get(key))) { + if (map.containsKey(key) && ObjectUtils.isNotEmpty(map.get(key))) { if (StringUtils.isNotEmpty(titleParam)) { map.put(titleParam, indexList.get(titleIndex++)); } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 896fd33..54ba2f2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -115,6 +115,9 @@ MEASURE_DATA_ALREADY_EXIST(2634,"当前检定数据已生成原始记录及证书,无法删除"), MEASURE_DATA_IS_AUTO(2635,"当前检定数据由自动检定系统生成,无法删除"), MEASURE_CERT_ALREADY_EXIST(2634,"当前检定数据已存在原始记录及证书"), + ORIGINAL_RECORD_CREATE_FAILED(2635, "生成的原始记录异常,无法保存到草稿箱"), + CERTIFICATE_CREATE_FAILED(2636, "生成的检定证书异常,无法保存到草稿箱"), + CHECK_RECORD_CREATE_FAILED(2637, "核查数据的证书生成异常,无法保存到草稿箱"), /** * 历史遗留备用 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityInternalAuditManagementVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityInternalAuditManagementVO.java index ee7be99..e182380 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityInternalAuditManagementVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityInternalAuditManagementVO.java @@ -6,7 +6,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.w3c.dom.stylesheets.LinkStyle; import java.util.Date; import java.util.List; 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 82e26ca..70d5182 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 @@ -59,6 +59,11 @@ StandardEquipmentPrint standardEquipmentPrint = SpringContextUtil.getBean(request.getBelongStandardEquipment()); List checkCertificateFileList = standardEquipmentPrint.doCheckCertificateFile(request); BizEquipmentStandardCheckRecordApprovalMapper bizRecordApprovalMapper = SpringContextUtil.getBean(BizEquipmentStandardCheckRecordApprovalMapper.class); + if (checkCertificateFileList != null && CollectionUtils.isEmpty(checkCertificateFileList)) { + //生成证书失败,删除保存的记录 + bizRecordApprovalMapper.deleteById(request); + throw new BusinessException(BusinessExceptionEnum.CHECK_RECORD_CREATE_FAILED); + } if (CollectionUtils.isNotEmpty(checkCertificateFileList)) { //原始记录文件 request.setCheckRecordFile(checkCertificateFileList.size() > 1 ? checkCertificateFileList.get(1) : ""); @@ -68,10 +73,6 @@ Assert.isFalse(updateFlag <= 0, () -> { throw new BusinessException(BusinessExceptionEnum.CHECK_APPROVAL_UPDATE_FAILED); }); - } else { - //生成证书失败,删除保存的记录 - bizRecordApprovalMapper.deleteById(request); - throw new BusinessException(BusinessExceptionEnum.CHECK_FILE_CREATE_FAILED); } } @@ -250,29 +251,32 @@ List certificateFileUrl = certificateFutureTask.join(); List originalRecordFileUrl = originalFutureTask.join(); log.debug("----------------get result orign is {},certificate is {}", originalRecordFileUrl, certificateFileUrl); - if (CollectionUtils.isNotEmpty(certificateFileUrl) || CollectionUtils.isNotEmpty(originalRecordFileUrl)) { - //生成证书文件 - if (CollectionUtils.isNotEmpty(certificateFileUrl)) { - request.setCertificateFile(certificateFileUrl.size() > 1 ? certificateFileUrl.get(1) : ""); - request.setCertificateWordFile(certificateFileUrl.get(0)); - } - //原始记录文件 - if (CollectionUtils.isNotEmpty(originalRecordFileUrl)) { - request.setOriginalRecordFile(originalRecordFileUrl.size() > 1 ? originalRecordFileUrl.get(1) : ""); - request.setOriginalRecordWordFile(originalRecordFileUrl.get(0)); - } - //更新记录 - int updateFlag = bizBusinessMapper.updateById(request); - log.debug("----------------update flag {}", updateFlag); - Assert.isFalse(updateFlag <= 0, () -> { - throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); - }); - } else { - log.debug("----------------delete is{}", originalFutureTask.join()); + if (certificateFileUrl != null && CollectionUtils.isEmpty(certificateFileUrl)) { //生成证书失败,删除保存的记录 bizBusinessMapper.deleteById(request); - throw new BusinessException(BusinessExceptionEnum.MEASURE_FILE_CREATE_FAILED); + throw new BusinessException(BusinessExceptionEnum.ORIGINAL_RECORD_CREATE_FAILED); } + if (originalRecordFileUrl != null && CollectionUtils.isEmpty(originalRecordFileUrl)) { + //生成证书失败,删除保存的记录 + bizBusinessMapper.deleteById(request); + throw new BusinessException(BusinessExceptionEnum.CERTIFICATE_CREATE_FAILED); + } + //生成证书文件 + if (CollectionUtils.isNotEmpty(certificateFileUrl)) { + request.setCertificateFile(certificateFileUrl.size() > 1 ? certificateFileUrl.get(1) : ""); + request.setCertificateWordFile(certificateFileUrl.get(0)); + } + //原始记录文件 + if (CollectionUtils.isNotEmpty(originalRecordFileUrl)) { + request.setOriginalRecordFile(originalRecordFileUrl.size() > 1 ? originalRecordFileUrl.get(1) : ""); + request.setOriginalRecordWordFile(originalRecordFileUrl.get(0)); + } + //更新记录 + int updateFlag = bizBusinessMapper.updateById(request); + log.debug("----------------update flag {}", updateFlag); + Assert.isFalse(updateFlag <= 0, () -> { + throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); + }); } catch (Exception ex) { log.debug("---- data is exception,ex this is {}", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_GET_FAILED); @@ -318,7 +322,8 @@ } } - private BizBusinessCertificatePrint getCertificatePrintByReport(BizBusinessDeviceMeasureApproval measureApproval) { + private BizBusinessCertificatePrint getCertificatePrintByReport(BizBusinessDeviceMeasureApproval + measureApproval) { BizBusinessCertificatePrint certificatePrint = new BizBusinessCertificatePrint(); certificatePrint.setReportId(measureApproval.getId()); certificatePrint.setPrintNum(0); 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 03f10cb..80503da 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 @@ -7,7 +7,9 @@ import com.casic.missiles.dto.certificate.ToBeRemoveDataItem; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.business.MeasureCategoryEnum; +import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import com.casic.missiles.utils.SpringContextUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -81,8 +83,9 @@ return false; } - protected void readyForCoverParams(Map map, String labCode) { + protected String readyForCoverParams(Map map, String labCode) { //定制参数 + String customUrl = ""; //初始化方框 map.put("test", "\uF0A3"); map.put("calibrate", "\uF0A3"); @@ -91,14 +94,22 @@ switch ((String) map.get("measureCategoryName")) { case TEST_REPORT: map.put("test", "\uF052"); + map.put("title", "测试结果"); break; case CALIBRATE_REPORT: map.put("calibrate", "\uF052"); + map.put("title", "校准结果"); break; case MEASURE_REPORT: map.put("measure", "\uF052"); + map.put("title", "检定结果"); + BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); + if (map.containsKey("outcome") && "不合格".equals((String) map.get("conclusion"))) { + customUrl = bizBusinessMapper.customTemplateUrl("检定数据", "2", "校验"); + } break; default: + map.put("title", "校验结果"); break; } //技术文件处理 @@ -145,7 +156,7 @@ //健壮性校验 if (StringUtils.isEmpty(labCode)) { log.warn("组织接口不能传入为空,打印文档生成文档填充组织失败..."); - return; + return customUrl; } //选择方框 switch ((String) map.get("measureCategoryName")) { @@ -181,19 +192,14 @@ String traceDate = (String) map.get(MEASURE_TRACE_DATE); DateTime dateTime = DateUtil.parseDate(traceDate); map.put(MEASURE_TRACE_DATE, DateUtil.formatChineseDate(dateTime, false, false)); -// map.put(YEAR, DateUtil.year(dateTime)); -// map.put(MONTH, DateUtil.month(dateTime) + 1); -// map.put(DAY, DateUtil.dayOfMonth(dateTime)); } //填充有效日期 if (ObjectUtils.isNotEmpty(map.get(MEASURE_VALID_DATE))) { String measureValidDate = (String) map.get(MEASURE_VALID_DATE); DateTime dateTime = DateUtil.parseDate(measureValidDate); map.put(MEASURE_VALID_DATE, DateUtil.formatChineseDate(dateTime, false, false)); -// map.put(MEASURE_YEAR, DateUtil.year(dateTime)); -// map.put(MEASURE_MONTH, DateUtil.month(dateTime) + 1); -// map.put(MEASURE_DAY, DateUtil.dayOfMonth(dateTime)); } + return customUrl; } @@ -269,7 +275,7 @@ */ protected Integer checkRemoveItem(Map measureDataMap, String key, Map map, String titleParam, Integer titleIndex, List dataItems, Integer tableIndex, String titleKeyWords) { - if (map.containsKey(key)&&ObjectUtils.isNotEmpty(map.get(key))) { + if (map.containsKey(key) && ObjectUtils.isNotEmpty(map.get(key))) { map.put(titleParam, (titleIndex++) + "."); } else { addDataRemoveItem(dataItems, tableIndex, titleKeyWords); @@ -279,7 +285,7 @@ protected Integer checkRemoveList(List indexList, String key, Map map, String titleParam, Integer titleIndex, List dataItems, Integer tableIndex, String titleKeyWords) { - if (map.containsKey(key)&&ObjectUtils.isNotEmpty(map.get(key))) { + if (map.containsKey(key) && ObjectUtils.isNotEmpty(map.get(key))) { if (StringUtils.isNotEmpty(titleParam)) { map.put(titleParam, indexList.get(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 86c774f..d78ccf3 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 @@ -138,6 +138,9 @@ .pdf(false) .build()); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } if (StringUtils.isNotEmpty(wordUrl)) { urlList.add(wordUrl); } @@ -215,6 +218,9 @@ .build()); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -266,7 +272,7 @@ //准备填充参数 map.put("measureDataCalibratorList", safetyList); //准备封面参数 - readyForCoverParams(map, measureItemInfo.getLabCode()); + String customUrl = readyForCoverParams(map, measureItemInfo.getLabCode()); if (!map.containsKey("equipmentList") || org.springframework.util.CollectionUtils.isEmpty((List) map.get("equipmentList"))) { List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); if (org.springframework.util.CollectionUtils.isEmpty(equipmentList)) { @@ -279,7 +285,9 @@ BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); log.debug("--------get Certificate template is ...."); //这一块逻辑比较复杂 - 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(MEASURE_DATA, "2", "数字记录表内容")); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -295,6 +303,9 @@ .pdf(false) .customTemplateUrls(customTemplateUrls) .build()); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 896fd33..54ba2f2 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -115,6 +115,9 @@ MEASURE_DATA_ALREADY_EXIST(2634,"当前检定数据已生成原始记录及证书,无法删除"), MEASURE_DATA_IS_AUTO(2635,"当前检定数据由自动检定系统生成,无法删除"), MEASURE_CERT_ALREADY_EXIST(2634,"当前检定数据已存在原始记录及证书"), + ORIGINAL_RECORD_CREATE_FAILED(2635, "生成的原始记录异常,无法保存到草稿箱"), + CERTIFICATE_CREATE_FAILED(2636, "生成的检定证书异常,无法保存到草稿箱"), + CHECK_RECORD_CREATE_FAILED(2637, "核查数据的证书生成异常,无法保存到草稿箱"), /** * 历史遗留备用 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityInternalAuditManagementVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityInternalAuditManagementVO.java index ee7be99..e182380 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityInternalAuditManagementVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityInternalAuditManagementVO.java @@ -6,7 +6,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.w3c.dom.stylesheets.LinkStyle; import java.util.Date; import java.util.List; 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 82e26ca..70d5182 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 @@ -59,6 +59,11 @@ StandardEquipmentPrint standardEquipmentPrint = SpringContextUtil.getBean(request.getBelongStandardEquipment()); List checkCertificateFileList = standardEquipmentPrint.doCheckCertificateFile(request); BizEquipmentStandardCheckRecordApprovalMapper bizRecordApprovalMapper = SpringContextUtil.getBean(BizEquipmentStandardCheckRecordApprovalMapper.class); + if (checkCertificateFileList != null && CollectionUtils.isEmpty(checkCertificateFileList)) { + //生成证书失败,删除保存的记录 + bizRecordApprovalMapper.deleteById(request); + throw new BusinessException(BusinessExceptionEnum.CHECK_RECORD_CREATE_FAILED); + } if (CollectionUtils.isNotEmpty(checkCertificateFileList)) { //原始记录文件 request.setCheckRecordFile(checkCertificateFileList.size() > 1 ? checkCertificateFileList.get(1) : ""); @@ -68,10 +73,6 @@ Assert.isFalse(updateFlag <= 0, () -> { throw new BusinessException(BusinessExceptionEnum.CHECK_APPROVAL_UPDATE_FAILED); }); - } else { - //生成证书失败,删除保存的记录 - bizRecordApprovalMapper.deleteById(request); - throw new BusinessException(BusinessExceptionEnum.CHECK_FILE_CREATE_FAILED); } } @@ -250,29 +251,32 @@ List certificateFileUrl = certificateFutureTask.join(); List originalRecordFileUrl = originalFutureTask.join(); log.debug("----------------get result orign is {},certificate is {}", originalRecordFileUrl, certificateFileUrl); - if (CollectionUtils.isNotEmpty(certificateFileUrl) || CollectionUtils.isNotEmpty(originalRecordFileUrl)) { - //生成证书文件 - if (CollectionUtils.isNotEmpty(certificateFileUrl)) { - request.setCertificateFile(certificateFileUrl.size() > 1 ? certificateFileUrl.get(1) : ""); - request.setCertificateWordFile(certificateFileUrl.get(0)); - } - //原始记录文件 - if (CollectionUtils.isNotEmpty(originalRecordFileUrl)) { - request.setOriginalRecordFile(originalRecordFileUrl.size() > 1 ? originalRecordFileUrl.get(1) : ""); - request.setOriginalRecordWordFile(originalRecordFileUrl.get(0)); - } - //更新记录 - int updateFlag = bizBusinessMapper.updateById(request); - log.debug("----------------update flag {}", updateFlag); - Assert.isFalse(updateFlag <= 0, () -> { - throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); - }); - } else { - log.debug("----------------delete is{}", originalFutureTask.join()); + if (certificateFileUrl != null && CollectionUtils.isEmpty(certificateFileUrl)) { //生成证书失败,删除保存的记录 bizBusinessMapper.deleteById(request); - throw new BusinessException(BusinessExceptionEnum.MEASURE_FILE_CREATE_FAILED); + throw new BusinessException(BusinessExceptionEnum.ORIGINAL_RECORD_CREATE_FAILED); } + if (originalRecordFileUrl != null && CollectionUtils.isEmpty(originalRecordFileUrl)) { + //生成证书失败,删除保存的记录 + bizBusinessMapper.deleteById(request); + throw new BusinessException(BusinessExceptionEnum.CERTIFICATE_CREATE_FAILED); + } + //生成证书文件 + if (CollectionUtils.isNotEmpty(certificateFileUrl)) { + request.setCertificateFile(certificateFileUrl.size() > 1 ? certificateFileUrl.get(1) : ""); + request.setCertificateWordFile(certificateFileUrl.get(0)); + } + //原始记录文件 + if (CollectionUtils.isNotEmpty(originalRecordFileUrl)) { + request.setOriginalRecordFile(originalRecordFileUrl.size() > 1 ? originalRecordFileUrl.get(1) : ""); + request.setOriginalRecordWordFile(originalRecordFileUrl.get(0)); + } + //更新记录 + int updateFlag = bizBusinessMapper.updateById(request); + log.debug("----------------update flag {}", updateFlag); + Assert.isFalse(updateFlag <= 0, () -> { + throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); + }); } catch (Exception ex) { log.debug("---- data is exception,ex this is {}", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_GET_FAILED); @@ -318,7 +322,8 @@ } } - private BizBusinessCertificatePrint getCertificatePrintByReport(BizBusinessDeviceMeasureApproval measureApproval) { + private BizBusinessCertificatePrint getCertificatePrintByReport(BizBusinessDeviceMeasureApproval + measureApproval) { BizBusinessCertificatePrint certificatePrint = new BizBusinessCertificatePrint(); certificatePrint.setReportId(measureApproval.getId()); certificatePrint.setPrintNum(0); 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 03f10cb..80503da 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 @@ -7,7 +7,9 @@ import com.casic.missiles.dto.certificate.ToBeRemoveDataItem; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.business.MeasureCategoryEnum; +import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import com.casic.missiles.utils.SpringContextUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -81,8 +83,9 @@ return false; } - protected void readyForCoverParams(Map map, String labCode) { + protected String readyForCoverParams(Map map, String labCode) { //定制参数 + String customUrl = ""; //初始化方框 map.put("test", "\uF0A3"); map.put("calibrate", "\uF0A3"); @@ -91,14 +94,22 @@ switch ((String) map.get("measureCategoryName")) { case TEST_REPORT: map.put("test", "\uF052"); + map.put("title", "测试结果"); break; case CALIBRATE_REPORT: map.put("calibrate", "\uF052"); + map.put("title", "校准结果"); break; case MEASURE_REPORT: map.put("measure", "\uF052"); + map.put("title", "检定结果"); + BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); + if (map.containsKey("outcome") && "不合格".equals((String) map.get("conclusion"))) { + customUrl = bizBusinessMapper.customTemplateUrl("检定数据", "2", "校验"); + } break; default: + map.put("title", "校验结果"); break; } //技术文件处理 @@ -145,7 +156,7 @@ //健壮性校验 if (StringUtils.isEmpty(labCode)) { log.warn("组织接口不能传入为空,打印文档生成文档填充组织失败..."); - return; + return customUrl; } //选择方框 switch ((String) map.get("measureCategoryName")) { @@ -181,19 +192,14 @@ String traceDate = (String) map.get(MEASURE_TRACE_DATE); DateTime dateTime = DateUtil.parseDate(traceDate); map.put(MEASURE_TRACE_DATE, DateUtil.formatChineseDate(dateTime, false, false)); -// map.put(YEAR, DateUtil.year(dateTime)); -// map.put(MONTH, DateUtil.month(dateTime) + 1); -// map.put(DAY, DateUtil.dayOfMonth(dateTime)); } //填充有效日期 if (ObjectUtils.isNotEmpty(map.get(MEASURE_VALID_DATE))) { String measureValidDate = (String) map.get(MEASURE_VALID_DATE); DateTime dateTime = DateUtil.parseDate(measureValidDate); map.put(MEASURE_VALID_DATE, DateUtil.formatChineseDate(dateTime, false, false)); -// map.put(MEASURE_YEAR, DateUtil.year(dateTime)); -// map.put(MEASURE_MONTH, DateUtil.month(dateTime) + 1); -// map.put(MEASURE_DAY, DateUtil.dayOfMonth(dateTime)); } + return customUrl; } @@ -269,7 +275,7 @@ */ protected Integer checkRemoveItem(Map measureDataMap, String key, Map map, String titleParam, Integer titleIndex, List dataItems, Integer tableIndex, String titleKeyWords) { - if (map.containsKey(key)&&ObjectUtils.isNotEmpty(map.get(key))) { + if (map.containsKey(key) && ObjectUtils.isNotEmpty(map.get(key))) { map.put(titleParam, (titleIndex++) + "."); } else { addDataRemoveItem(dataItems, tableIndex, titleKeyWords); @@ -279,7 +285,7 @@ protected Integer checkRemoveList(List indexList, String key, Map map, String titleParam, Integer titleIndex, List dataItems, Integer tableIndex, String titleKeyWords) { - if (map.containsKey(key)&&ObjectUtils.isNotEmpty(map.get(key))) { + if (map.containsKey(key) && ObjectUtils.isNotEmpty(map.get(key))) { if (StringUtils.isNotEmpty(titleParam)) { map.put(titleParam, indexList.get(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 86c774f..d78ccf3 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 @@ -138,6 +138,9 @@ .pdf(false) .build()); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } if (StringUtils.isNotEmpty(wordUrl)) { urlList.add(wordUrl); } @@ -215,6 +218,9 @@ .build()); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -266,7 +272,7 @@ //准备填充参数 map.put("measureDataCalibratorList", safetyList); //准备封面参数 - readyForCoverParams(map, measureItemInfo.getLabCode()); + String customUrl = readyForCoverParams(map, measureItemInfo.getLabCode()); if (!map.containsKey("equipmentList") || org.springframework.util.CollectionUtils.isEmpty((List) map.get("equipmentList"))) { List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); if (org.springframework.util.CollectionUtils.isEmpty(equipmentList)) { @@ -279,7 +285,9 @@ BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); log.debug("--------get Certificate template is ...."); //这一块逻辑比较复杂 - 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(MEASURE_DATA, "2", "数字记录表内容")); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -295,6 +303,9 @@ .pdf(false) .customTemplateUrls(customTemplateUrls) .build()); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 6c91e18..5e9c44f 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 @@ -93,9 +93,10 @@ .customTemplateUrls(customTemplateUrls) .build()); List urlList = new ArrayList<>(); - if (StringUtils.isNotEmpty(wordUrl)) { - urlList.add(wordUrl); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; } + urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); } @@ -194,6 +195,9 @@ .build()); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -273,6 +277,9 @@ .pdf(false) .customTemplateUrls(customTemplateUrls) .build()); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -651,7 +658,7 @@ public Integer checkRemoveItem(String key, Map map, String titleParam, Integer titleIndex, List dataItems, Integer tableIndex, String titleKeyWords) { - if (map.containsKey(key)&&ObjectUtils.isNotEmpty(map.get(key))) { + if (map.containsKey(key) && ObjectUtils.isNotEmpty(map.get(key))) { map.put(titleParam, (titleIndex++) + "."); } else { addDataRemoveItem(dataItems, tableIndex, titleKeyWords);