fix(jg):改造告知接口调整

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java

@@ -814,7 +814,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             List<Object> factoryNumList = deviceList.stream().limit(3).map(item -> item.get("pipelineNumber")).collect(Collectors.toList());
             placeholders.put("equipTypeList", equipTypeList);
             placeholders.put("produceCodeList", factoryNumList);
-            placeholders.put("productName", historyJson.get("projectContraption"));
+            placeholders.put("productName", Optional.ofNullable(historyJson.get("projectContraption")).orElse(historyJson.get("PROJECT_CONTRAPTION")));
         } else {
             placeholders.put("equipType", getValue.apply("equType"));
             placeholders.put("produceCode", getValue.apply("factoryNum"));

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgReformNoticeServiceImpl.java

@@ -295,11 +295,17 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                     notice.setNextTaskId(workflowResultDto.getNextTaskId());
                     notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                     notice.setCreateDate(new Date());
-                    updateById(notice);
                     // 上个代办改为已办
                     TaskV2Model taskV2Model = this.updateLastTodo(notice, FlowStatusEnum.TO_BE_PROCESSED);
                     // 创建新的代办
                     this.createNewTodo(notice, workflowResultDto, taskV2Model, FlowStatusEnum.TO_BE_PROCESSED);
+                    // 压力管道情况处理
+                    if (EquipmentClassifityEnum.YLGD.getCode().equals(notice.getEquListCode())) {
+                        oldPipJsonData = this.getNowPipJsonData(noticeDto.getProjectContraptionId());
+                        notice.setPipeLengthChanged(this.calculatePipeLengthChange(JSONArray.parseArray(JSON.toJSONString(oldPipJsonData.get(DEVICE_LIST))),
+                                                                                   JSONArray.parseArray(JSON.toJSONString(noticeDto.getDeviceList()))));
+                    }
+                    this.updateById(notice);
                 }
                 commonService.saveExecuteFlowData2Redis(notice.getInstanceId(), this.buildInstanceRuntimeData(notice));
             } else {
@@ -423,14 +429,23 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         String tempFileName = "改造告知单_" + System.currentTimeMillis() + "_temp";
         Map<String, Object> data = new HashMap<>();
         ArrayList<Map<String, Object>> maps = new ArrayList<>();
-        for (JgReformNoticeEq noticeEq : noticeEqs) {
-
-            Map<String, Object> information = jgReformNoticeMapper.queryEquipInformation(noticeEq.getSequenceNbr());
+        // 管道按照装置打一份告知书
+        if (EquipmentClassifityEnum.YLGD.getCode().equals(notice.getEquListCode()) && !noticeEqs.isEmpty()) {
+            Map<String, Object> information = jgReformNoticeMapper.queryEquipInformation(noticeEqs.get(0).getSequenceNbr());
             if (CollectionUtils.isEmpty(information)) {
                 throw new IllegalArgumentException("改造告知单不存在");
             }
             Map<String, Object> stringObjectMap = jgInstallationNoticeService.fullFillTemplateObj(Collections.singletonList(information), BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getName().substring(0, 2));
             maps.add(stringObjectMap);
+        } else {
+            for (JgReformNoticeEq noticeEq : noticeEqs) {
+                Map<String, Object> information = jgReformNoticeMapper.queryEquipInformation(noticeEq.getSequenceNbr());
+                if (CollectionUtils.isEmpty(information)) {
+                    throw new IllegalArgumentException("改造告知单不存在");
+                }
+                Map<String, Object> stringObjectMap = jgInstallationNoticeService.fullFillTemplateObj(Collections.singletonList(information), BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getName().substring(0, 2));
+                maps.add(stringObjectMap);
+            }
         }
         data.put("equipBasicInfoList", maps);
         WordTemplateUtils.templateToPdfDownload(tempFileName, "installation-notification-report.ftl", data, response);
@@ -1051,13 +1066,19 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfoList = new ArrayList<>(15);
         List<IdxBizJgTechParamsPipeline> paramsPipelineList = new ArrayList<>(15);
         List<ESEquipmentCategoryDto> esEquipmentCategoryList = new ArrayList<>(15);
+        // eq关系表
+        List<JgReformNoticeEq> noticeEqs = new ArrayList<>(15);
         // 设备信息
         toAddPipData.forEach(pipData -> {
             String record = UUID.randomUUID().toString();
             Date date = new Date();
+            // eq表
+            JgReformNoticeEq jgRelationEquip = new JgReformNoticeEq();
+            jgRelationEquip.setEquId(record);
+            jgRelationEquip.setEquipTransferId(String.valueOf(notice.getSequenceNbr()));
+            noticeEqs.add(jgRelationEquip);
             // 使用信息
             IdxBizJgUseInfo useInfo = JSON.parseObject(toJSONString(pipData), IdxBizJgUseInfo.class);
-            // 使用信息
             useInfo.setRecord(record);
             useInfo.setSequenceNbr(null);
             useInfo.setRecDate(date);
@@ -1173,6 +1194,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         idxBizJgInspectionDetectionInfoService.saveBatch(inspectionDetectionInfoList);
         iIdxBizJgTechParamsPipelineService.saveBatch(paramsPipelineList);
         esEquipmentCategory.saveAll(esEquipmentCategoryList);
+        jgReformNoticeEqMapper.insertBatchSomeColumn(noticeEqs);
     }