监管业务系统，作废的历史设备登记使用登记，设备的纳管状态未重置为未纳管、

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

@@ -2914,7 +2914,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 3.回滚更新idx_biz_jg_supervision_info表
             this.rollBackSupervisionInfo(record);
             // 4.es的EQU_STATE,  USE_ORG_CODE、ORG_BRANCH_CODE、ORG_BRANCH_NAME、STATUS
-            this.rollBackForEquipEsInfo(record, flag);
+            this.rollBackForEquipEsInfo(record, flag,jgUseRegistration);
             // 5.历史设备处理
             this.dealHisRegEquipData(jgUseRegistration, record);
         });
@@ -3007,7 +3007,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return jgRelationEquipMapper.selectList(eqLambdaQueryWrapper);
     }
 
-    private void rollBackForEquipEsInfo(String record, Boolean flag) {
+    private void rollBackForEquipEsInfo(String record, Boolean flag,JgUseRegistration jgUseRegistration) {
         LambdaQueryWrapper<IdxBizJgConstructionInfo> wrapper = new LambdaQueryWrapper<>();
         wrapper.select(IdxBizJgConstructionInfo::getUscUnitCreditCode,
                         IdxBizJgConstructionInfo::getUscUnitName,
@@ -3028,8 +3028,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             if (jgConstructionInfo != null){
                 esEquipmentCategoryDto.setUSC_UNIT_NAME(jgConstructionInfo.getUscUnitName());
                 esEquipmentCategoryDto.setUSC_UNIT_CREDIT_CODE(jgConstructionInfo.getUscUnitCreditCode());
-                esEquipmentCategory.save(esEquipmentCategoryDto);
             }
+            //如果是历史电站已纳管改为未纳管
+            if("1".equals(jgUseRegistration.getRegType())){
+                esEquipmentCategoryDto.setIS_INTO_MANAGEMENT(false);
+            }
+            esEquipmentCategory.save(esEquipmentCategoryDto);
         }
     }
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/IdxBizJgProjectContraptionMapper.xml

@@ -160,11 +160,11 @@
         (select SEQUENCE_NBR from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) detectionInfoSequenceNbr,
         (select INSPECT_ORG_NAME from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) inspectOrgName,
         (select name from cb_data_dictionary where type = 'JYJL' and code = (select INSPECT_CONCLUSION from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1)) inspectConclusion,
-        (select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) nextInspectDate,
+        to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1),'YYYY-MM-DD') nextInspectDate,
         (select USC_UNIT_NAME from idx_biz_jg_construction_info jci where ibjui.RECORD = jci.RECORD ORDER BY  jci."USC_DATE" DESC limit 1) as uscUnitName,
-        (select USC_DATE from idx_biz_jg_construction_info jci where ibjui.RECORD = jci.RECORD ORDER BY  jci."USC_DATE" DESC limit 1) as uscDate,
+        to_char((select USC_DATE from idx_biz_jg_construction_info jci where ibjui.RECORD = jci.RECORD ORDER BY  jci."USC_DATE" DESC limit 1),'YYYY-MM-DD') as uscDate,
         ibjdi."DESIGN_UNIT_NAME" AS designUnitName,
-        ibjui."USE_DATE" AS useDate,
+        to_char(ibjui."USE_DATE",'YYYY-MM-DD') AS useDate,
         ibjui."RECORD" AS record
         FROM idx_biz_jg_use_info ibjui
         LEFT JOIN idx_biz_jg_tech_params_pipeline ibjtpp ON ibjui.RECORD = ibjtpp.RECORD
@@ -219,7 +219,7 @@
     <select id="selectEquipListByExport" resultType="java.util.Map">
         SELECT ibjtpp."PIPE_NAME" AS productName,
         ibjtpp."PIPELINE_NUMBER" AS pipelineNumber,
-        ibjtpp."DEVICE_LEVEL" AS deviceLevel,
+        (select name from cb_data_dictionary where code = ibjtpp."DEVICE_LEVEL" and type = 'GBI') deviceLevel,
         ibjtpp."NOMINAL_DIAMETER" AS nominalDiameter,
         ibjtpp."WALL_THICKNESS" AS wallThickness,
         ibjtpp."PIPE_LENGTH" AS pipeLength,
@@ -231,12 +231,12 @@
         ibjtpp."WORK_MEDIUM" AS workMedium,
         ibjtpp."REMARKS" AS remarks,
         (select INSPECT_ORG_NAME from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) inspectOrgName,
-        (select INSPECT_CONCLUSION from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) inspectConclusion,
-        (select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) nextInspectDate,
+        (select name from cb_data_dictionary where type = 'JYJL' and code = (select INSPECT_CONCLUSION from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1)) inspectConclusion,
+        to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1),'YYYY-MM-DD') nextInspectDate,
         (select USC_UNIT_NAME from idx_biz_jg_construction_info jci where ibjui.RECORD = jci.RECORD ORDER BY  jci."USC_DATE" DESC limit 1) as uscUnitName,
-        (select USC_DATE from idx_biz_jg_construction_info jci where ibjui.RECORD = jci.RECORD ORDER BY  jci."USC_DATE" DESC limit 1) as uscDate,
+        to_char((select USC_DATE from idx_biz_jg_construction_info jci where ibjui.RECORD = jci.RECORD ORDER BY  jci."USC_DATE" DESC limit 1),'YYYY-MM-DD') as uscDate,
         ibjdi."DESIGN_UNIT_NAME" AS designUnitName,
-        ibjui."USE_DATE" AS useDate,
+        to_char(ibjui."USE_DATE",'YYYY-MM-DD') AS useDate,
         ibjui."RECORD" AS record
         FROM idx_biz_jg_use_info ibjui
         LEFT JOIN idx_biz_jg_tech_params_pipeline ibjtpp ON ibjui.RECORD = ibjtpp.RECORD