feat(大编辑)：管道增减功能开发

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/backup/EquipBackupHandler.java

@@ -146,8 +146,8 @@ public class EquipBackupHandler {
                     }
                     // 技术参数
                     techParamsBackupService.save(registerInfo.getEquList(), eq.getString(BACKUP_JSON_KEY_TECH_PARAM_INFO));
-                    // 设备es数据
-                    equipmentCategory.save(JSONObject.parseObject(eq.getString(BACKUP_JSON_KEY_INSPECTION_ES_INFO), ESEquipmentCategoryDto.class));
+                    // 设备es数据-兼容有数据没es的脏数据
+                    Optional.ofNullable(eq.getString(BACKUP_JSON_KEY_INSPECTION_ES_INFO)).ifPresent(v->equipmentCategory.save(JSONObject.parseObject(v, ESEquipmentCategoryDto.class)));
                 });
             });
             // insert的删除

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/PieLineDataChangeServiceImpl.java

@@ -151,10 +151,6 @@ public class PieLineDataChangeServiceImpl {
         // 检验信息
         IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = BeanUtil.copyProperties(newPieLine, IdxBizJgInspectionDetectionInfo.class);
         if (!ValidationUtil.isEmpty(inspectionDetectionInfo)) {
-            List<Map<String, Object>> inspectionAndTestingInstitutions = commonEquipDataProcessService.getCommonService().getUnitListByType("inspection", "gasCylindersForCars", false);
-            Optional<Map<String, Object>> optional = inspectionAndTestingInstitutions.stream().filter(x -> x.get("useCode").equals(inspectionDetectionInfo.getInspectOrgCode())).findFirst();
-            Map<String, Object> mapOrDefault = optional.orElse(Collections.emptyMap());
-            inspectionDetectionInfo.setInspectOrgName((String) mapOrDefault.getOrDefault("useUnit", inspectionDetectionInfo.getInspectOrgName()));
             inspectionDetectionInfo.setRecord(record);
             inspectionDetectionInfo.setRecDate(new Date());
             inspectionDetectionInfo.setSequenceNbr(null);
@@ -162,6 +158,7 @@ public class PieLineDataChangeServiceImpl {
                 inspectionDetectionInfo.setNextInspectDate(DateUtil.parse(DateUtil.format(inspectionDetectionInfo.getNextInspectDate(), DatePattern.NORM_DATE_PATTERN)));
             }
             commonEquipDataProcessService.getJgUseRegistrationService().getInspectionDetectionInfoService().getBaseMapper().insert(inspectionDetectionInfo);
+            newPieLine.setJySeq(inspectionDetectionInfo.getSequenceNbr());
         }
 
         // 使用信息

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

@@ -1158,6 +1158,9 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             IdxBizJgRegisterInfo registerInfo = JSON.parseObject(toJSONString(pipData), IdxBizJgRegisterInfo.class);
             registerInfo.setRecord(record);
             registerInfo.setRecDate(date);
+            registerInfo.setEquList(projectContraption.getEquList());
+            registerInfo.setEquCategory(projectContraption.getEquCategory());
+            registerInfo.setEquDefine(projectContraption.getEquDefine());
             registerInfo.setSequenceNbr(null);
             registerInfo.setEquCodeType("2");
             registerInfo.setRegisterState("6045");