diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java index 7d27b96..4a811ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java @@ -190,7 +190,7 @@ } @Override - public String doCreateOriginalFile(BizBusinessDeviceMeasureApproval request) { + public List doCreateOriginalFile(BizBusinessDeviceMeasureApproval request) { try { if (ObjectUtil.isEmpty(request)) { return null; @@ -275,9 +275,14 @@ map.put("id", snowflakeUtil.nextId()); log.debug("original before ----"); //除了选用的模板不一致,模板配置流程是一致的 - String originalUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, templateUrls); - log.debug("originalUrlFile after------------{}", originalUrlFile); - return originalUrlFile; + String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, templateUrls); + log.debug("originalUrlFile after------------{}", originalWordUrlFile); + List urlList = new ArrayList<>(); + urlList.add(originalWordUrlFile); + if (map.containsKey("pdfUrl")) { + urlList.add((String) map.get("pdfUrl")); + } + return urlList; } catch (Exception ex) { log.debug("doCreateOriginalFile Exception is -----------{}", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED);