fix(jg): 修复查询记录为空时导致的报错

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml

@@ -1053,7 +1053,7 @@
 
     <select id="queryOutOfMaintenanceRecord" resultType="java.util.Map">
         SELECT
-            tt."RECORD",
+            ui."RECORD",
             tt."INFORM_END",
             ui."USE_UNIT_NAME",
             ui."USE_UNIT_CREDIT_CODE",
@@ -1068,27 +1068,29 @@
             si."ORG_BRANCH_CODE",
             si."COMPANY_ORG_BRANCH_CODE"
         FROM
-            (
+            idx_biz_jg_use_info ui
+        LEFT JOIN idx_biz_jg_other_info oi ON oi."RECORD" = ui."RECORD"
+        LEFT JOIN idx_biz_jg_supervision_info si on si."RECORD" = ui."RECORD"
+        LEFT JOIN idx_biz_jg_register_info ri on ri."RECORD" = ui."RECORD"
+        LEFT JOIN (
                 SELECT
                 "RECORD","INFORM_END","ROWNUM1"
                 FROM
                 (
                     SELECT "RECORD","INFORM_END",ROW_NUMBER() OVER (PARTITION BY "RECORD" ORDER BY "REC_DATE" DESC) AS ROWNUM1
                     FROM
-                    idx_biz_jg_maintenance_record_info
+                    idx_biz_jg_maintenance_record_info where "INFORM_END" is not null
                 ) d
                 WHERE d."ROWNUM1" = 1 and  d."INFORM_END" <![CDATA[<]]> to_char(now(), 'YYYY-MM-DD')
-            ) tt
-                LEFT JOIN idx_biz_jg_use_info ui ON ui."RECORD" = tt."RECORD"
-                LEFT JOIN idx_biz_jg_register_info ri ON ri."RECORD" = tt."RECORD"
-                LEFT JOIN idx_biz_jg_other_info oi ON oi."RECORD" = tt."RECORD"
-                LEFT JOIN idx_biz_jg_supervision_info si on si."RECORD" = tt."RECORD"
-        WHERE ui."DATA_SOURCE" like 'jg%' and ui.IS_INTO_MANAGEMENT = true
+            ) tt on tt."RECORD" = ui."RECORD"
+        WHERE si."ORG_BRANCH_CODE" like '50%'
+          and oi."CLAIM_STATUS" not in ('草稿','已拒领','待认领')
+          and tt."INFORM_END" is not null
     </select>
 
     <select id="queryOutOfInspectionRecord" resultType="java.util.Map">
         SELECT
-        tt."RECORD",
+        ui."RECORD",
         tt."NEXT_INSPECT_DATE",
         ui."USE_UNIT_NAME",
         ui."USE_UNIT_CREDIT_CODE",
@@ -1103,21 +1105,23 @@
         si."ORG_BRANCH_CODE",
         si."COMPANY_ORG_BRANCH_CODE"
         FROM
-        (
-            SELECT "RECORD","NEXT_INSPECT_DATE","rowNum1"
+        idx_biz_jg_use_info ui
+        LEFT JOIN idx_biz_jg_other_info oi ON oi."RECORD" = ui."RECORD"
+        LEFT JOIN idx_biz_jg_supervision_info si on si."RECORD" = ui."RECORD"
+        LEFT JOIN idx_biz_jg_register_info ri on ri."RECORD" = ui."RECORD"
+        LEFT JOIN (
+            SELECT "RECORD","NEXT_INSPECT_DATE",rowNum1
             FROM
             (
-                SELECT ROW_NUMBER () OVER ( PARTITION BY "RECORD" ORDER BY "REC_DATE" DESC) AS rowNum1,"RECORD", "NEXT_INSPECT_DATE"
+                SELECT ROW_NUMBER () OVER ( PARTITION BY "RECORD" ORDER BY "NEXT_INSPECT_DATE" DESC) AS rowNum1,"RECORD", "NEXT_INSPECT_DATE"
                 FROM
-                idx_biz_jg_inspection_detection_info
+                idx_biz_jg_inspection_detection_info where "NEXT_INSPECT_DATE" is not null
             ) d
-            WHERE d.rowNum1 = 1 and  d."NEXT_INSPECT_DATE" <![CDATA[<]]> to_char(now(), 'YYYY-MM-DD')
-        ) tt
-        LEFT JOIN idx_biz_jg_use_info ui ON ui."RECORD" = tt."RECORD"
-        LEFT JOIN idx_biz_jg_register_info ri ON ri."RECORD" = tt."RECORD"
-        LEFT JOIN idx_biz_jg_other_info oi ON oi."RECORD" = tt."RECORD"
-        LEFT JOIN idx_biz_jg_supervision_info si on si."RECORD" = tt."RECORD"
-        WHERE ui."DATA_SOURCE" like 'jg%' and ui.IS_INTO_MANAGEMENT = true
+            WHERE d.rowNum1 =1 and  d."NEXT_INSPECT_DATE" <![CDATA[<]]> to_char(now(), 'YYYY-MM-DD')
+        ) tt on tt."RECORD" = ui."RECORD"
+        WHERE si."ORG_BRANCH_CODE" like '50%'
+        and oi."CLAIM_STATUS" not in ('草稿','已拒领','待认领')
+        and tt."NEXT_INSPECT_DATE" is not null
     </select>
     <select id="countBizFinishedNumForDP" resultType="java.lang.Long">
         SELECT count(1) FROM "tzs_jg_installation_notice" where receive_company_org_code like CONCAT(#{orgCode}, '%') and notice_status = '6616'

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/SafetyProblemTracingMapper.xml

@@ -207,6 +207,7 @@
             tzs_safety_problem_tracing
         WHERE
             is_delete = '0'
+            and problem_status_code = '0'
         <if test="orgCode != null and orgCode != ''">
             and governing_body_org_code like CONCAT(#{orgCode}, '%')
         </if>