fix(mapper): 生成设备安全追溯问题时排除已经报废的设备

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

@@ -1072,6 +1072,13 @@
                         SELECT "RECORD","INFORM_END",ROW_NUMBER() OVER (PARTITION BY "RECORD" ORDER BY "REC_DATE" DESC) AS ROWNUM1
                         FROM
                             idx_biz_jg_maintenance_record_info where "INFORM_END" is not null
+                            AND NOT EXISTS (
+                                SELECT 1
+                                FROM tzs_safety_problem_tracing s
+                                WHERE s.source_id = "RECORD"
+                                  AND s.problem_status = '未处理'
+                                  AND s.problem_type = '维保超期'
+                            )
                     ) d
                 WHERE d."ROWNUM1" = 1 and  d."INFORM_END" <![CDATA[<]]> to_char(now(), 'YYYY-MM-DD')
             ) tt
@@ -1084,6 +1091,7 @@
           and oi."CLAIM_STATUS" not in ('草稿','已拒领','待认领')
           and tt."INFORM_END" is not null
           and e.is_delete = '0'
+          and ui."EQU_STATE" != '3'
     </select>
 
     <select id="queryOutOfInspectionRecord" resultType="java.util.Map">
@@ -1130,6 +1138,7 @@
           AND oi."CLAIM_STATUS" not in ('草稿','已拒领','待认领')
           AND tt."NEXT_INSPECT_DATE" is not null
           AND e.is_delete = '0'
+          and ui."EQU_STATE" != '3'
     </select>
     <select id="countBizFinishedNumForDP" resultType="java.lang.Long">
         SELECT count(1) FROM "tzs_jg_installation_notice" where notice_status = '6616'
@@ -3870,6 +3879,7 @@
         LEFT JOIN idx_biz_jg_factory_info fi on fi."RECORD" = ui."RECORD"
         WHERE ui."USE_DATE" is not null and ui."IS_INTO_MANAGEMENT" = true and ri."EQU_LIST" = '2000' and di."DESIGN_USE_DATE" is not null
         and ui."USE_DATE" not in ('null','不详','/') and di."DESIGN_USE_DATE" not in ('null','不详','/') and di."OVER_DESIGN_REG_NUM" = 0
+        and ui."EQU_STATE" != '3'
         ) t where t.isExpired = true
         UNION ALL
         select * from (
@@ -3897,7 +3907,7 @@
         LEFT JOIN idx_biz_jg_supervision_info si on si."RECORD" = ui."RECORD"
         LEFT JOIN idx_biz_jg_inspection_detection_info d on d."RECORD" = ui."RECORD"
         LEFT JOIN idx_biz_jg_factory_info fi on fi."RECORD" = ui."RECORD"
-        WHERE ui."IS_INTO_MANAGEMENT" = true and ri."EQU_LIST" = '6000' and di."DESIGN_USE_DATE" is not null and di."DESIGN_USE_DATE" not in ('null','不详','/') and di."OVER_DESIGN_REG_NUM" = 0
+        WHERE ui."IS_INTO_MANAGEMENT" = true and ri."EQU_LIST" = '6000' and di."DESIGN_USE_DATE" is not null and di."DESIGN_USE_DATE" not in ('null','不详','/') and di."OVER_DESIGN_REG_NUM" = 0 and ui."EQU_STATE" != '3'
         ) tt where tt.isExpired = true;
     </select>
 
@@ -3945,7 +3955,7 @@
         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_factory_info fi on fi."RECORD" = ui."RECORD"
-        WHERE ui."IS_INTO_MANAGEMENT" = true and (ri."EQU_LIST" = '6000' OR ri."EQU_LIST" = '2000') and di."DELAY_SERVICE_LIFE_DATE" > 0
+        WHERE ui."IS_INTO_MANAGEMENT" = true and (ri."EQU_LIST" = '6000' OR ri."EQU_LIST" = '2000') and di."DELAY_SERVICE_LIFE_DATE" > 0 and ui."EQU_STATE" != '3'
         ) tt where tt.isExpired = true;
     </select>