fix(jg):一个工程装置分多次告知，第二批告知管道录入后会自动纳入到第一批已经告知完成的装置中

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationUnit.java

@@ -26,7 +26,7 @@ public class JgChangeRegistrationUnit extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 变更类型（0转出，1转入）
+     * 变更类型（0-区内，1-区外）
      */
 	@TableField("change_type")
     private String changeType;

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/DataDockServiceImpl.java

@@ -3381,18 +3381,19 @@ public class DataDockServiceImpl {
     private void saveInspectInfo(Map<String, Object> equ, String record) {
         InspectionDetectionInfo inspectionDetectionInfo = new InspectionDetectionInfo();
         BeanUtil.copyProperties(equ, inspectionDetectionInfo);
+        inspectionDetectionInfo.setRecord(record);
+        inspectionDetectionInfo.setRecDate(new Date());
+        inspectionDetectionInfo.setSequenceNbr(String.valueOf(sequence.nextId()));
+        //杨生元说：不管有没有数据，都新增一条，防止编辑设备检验信息，保存不了
         if (inspectionDetectionInfo.getInspectType() != null && inspectionDetectionInfo.getInspectConclusion() != null) {
-            inspectionDetectionInfo.setRecord(record);
-            inspectionDetectionInfo.setRecDate(new Date());
-            inspectionDetectionInfo.setSequenceNbr(String.valueOf(sequence.nextId()));
             if (!ValidationUtil.isEmpty(equ.get("xaSerial"))) {
                 inspectionDetectionInfo.setInspectType(InspectTypeConverter.dictMap.get(inspectionDetectionInfo.getInspectType()));
                 inspectionDetectionInfo.setInspectConclusion(InspectConclusionConverter.dictMap.get(inspectionDetectionInfo.getInspectConclusion()));
             }
-            inspectionDetectionInfoMapper.insert(inspectionDetectionInfo);
             equ.put("inspectType",inspectionDetectionInfo.getInspectType());
             equ.put("inspectConclusion",inspectionDetectionInfo.getInspectConclusion());
         }
+        inspectionDetectionInfoMapper.insert(inspectionDetectionInfo);
     }
 
     public String updatePipingUseInfo() {

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/JgChangeRegistrationUnitServiceImpl.java

@@ -1961,10 +1961,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                         List<JgUseRegistrationManage> newList = new ArrayList<>();
                         for (JgUseRegistrationManage registrationManage : list) {
                             // 修改使用登记证管理使用单位信息
-                            registrationManage.setUseUnitName(registration.getNewUseUnitName());
-                            registrationManage.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
-                            registrationManage.setReceiveOrgName(registration.getReceiveOrgName());
-                            registrationManage.setReceiveCompanyCode(registration.getReceiveOrgCode());
                             registrationManage.setAuditPassDate(registration.getAuditPassDate());
                             registrationManage.setVersion(registrationManage.getVersion() + 1);
                             if ("1".equals(registration.getChangeType()) && EQU_CODE_CC.equals(dto.getEquListCode())) {
@@ -1984,6 +1980,12 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                                 newManage.setVersion(1);
                                 newManage.setRegistrationType("0");
                                 newManage.setEquUseAddress(registration.getEquAddress());
+                                newManage.setUseUnitName(registration.getNewUseUnitName());
+                                newManage.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
+                                newManage.setReceiveOrgName(registration.getReceiveOrgName());
+                                newManage.setReceiveCompanyCode(registration.getReceiveOrgCode());
+                                newManage.setSuperviseOrgCode(registration.getOrgBranchCode());
+                                newManage.setSuperviseOrgName(registration.getOrgBranchName());
                                 // 如果 equListCode = 5000，则设置车牌号
                                 if (EQU_CODE_CC.equals(registrationManage.getEquListCode())) {
                                     String targetCode = registrationManage.getUseRegistrationCode();
@@ -2010,6 +2012,12 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                                 newManage.setSequenceNbr(null);
                                 newList.add(newManage);
                             } else {
+                                registrationManage.setUseUnitName(registration.getNewUseUnitName());
+                                registrationManage.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
+                                registrationManage.setReceiveOrgName(registration.getReceiveOrgName());
+                                registrationManage.setReceiveCompanyCode(registration.getReceiveOrgCode());
+                                registrationManage.setSuperviseOrgCode(registration.getOrgBranchCode());
+                                registrationManage.setSuperviseOrgName(registration.getOrgBranchName());
                                 registrationManage.setCertificateStatus("已登记");
                                 if (EQU_CODE_CC.equals(registrationManage.getEquListCode())) {
                                     String targetCode = registrationManage.getUseRegistrationCode();