Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -2895,7 +2895,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         } else {
             // 处理非批量导入数据，更新关联业务状态
             processElseDataByStatus(oldStatus, jgUseRegistration);
-            // 注册事务提交后的操作
+            // 统一处理设备的纳管状态【注册事务提交后的操作】
             registerAfterCommitTask(records);
         }
         return jgUseRegistration;
@@ -3053,10 +3053,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 esEquipmentCategoryDto.setUSC_UNIT_NAME(jgConstructionInfo.getUscUnitName());
                 esEquipmentCategoryDto.setUSC_UNIT_CREDIT_CODE(jgConstructionInfo.getUscUnitCreditCode());
             }
-            //如果是历史电站已纳管改为未纳管
-            if("1".equals(jgUseRegistration.getRegType())){
-                esEquipmentCategoryDto.setIS_INTO_MANAGEMENT(false);
-            }
             esEquipmentCategory.save(esEquipmentCategoryDto);
         }
     }