fix(jg):暂存功能问题处理

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

@@ -397,7 +397,7 @@
             DATE_FORMAT(isn.notice_date, '%Y-%m-%d') AS createDate
         FROM tzs_jg_installation_notice isn
              LEFT JOIN tz_equipment_category ec1 ON ec1.code = isn.equ_list_code
-        WHERE isn.is_delete = false AND isn.notice_status in ('6610','6614','6615')
+        WHERE isn.is_delete = false AND isn.notice_status = '6610'
           AND isn.install_unit_credit_code = #{companyCode}
         UNION ALL
         SELECT
@@ -409,7 +409,7 @@
             isn.receive_org_name AS receiveOrgName,
             DATE_FORMAT(isn.create_date, '%Y-%m-%d') AS createDate
         FROM tzs_jg_reform_notice isn
-        WHERE isn.is_delete = false AND isn.notice_status in ('6610','6614','6615')
+        WHERE isn.is_delete = false AND isn.notice_status = '6610'
           AND isn.install_unit_credit_code = #{companyCode}
         UNION ALL
         SELECT
@@ -422,7 +422,7 @@
             DATE_FORMAT(isn.create_date, '%Y-%m-%d') AS createDate
         FROM tzs_jg_maintain_notice isn
          LEFT JOIN tz_equipment_category ec1 ON ec1.code = isn.equ_list_code
-        WHERE isn.is_delete = false AND isn.notice_status in ('6610','6614','6615')
+        WHERE isn.is_delete = false AND isn.notice_status = '6610'
           AND isn.install_unit_credit_code = #{companyCode}
         UNION ALL
         SELECT
@@ -436,7 +436,7 @@
         FROM tzs_jg_transfer_notice isn
              LEFT JOIN tz_equipment_category ec1 ON ec1.code = isn.equ_list_code
         WHERE isn.is_delete = false
-          AND isn.notice_status in ('6610','6614','6615')
+          AND isn.notice_status = '6610'
           AND isn.install_unit_credit_code = #{companyCode}
         ORDER BY createDate DESC, applyNo DESC
     </select>

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

@@ -1566,8 +1566,8 @@
                                    LEFT JOIN tzs_jg_use_registration_eq ure ON ur.sequence_nbr = ure.equip_transfer_id
                                    LEFT JOIN idx_biz_jg_register_info ri ON ri."RECORD" = ure.equ_id
                                    LEFT JOIN tz_equipment_category ec1 ON ec1.code = ri."EQU_LIST"
-                          WHERE ur.is_delete = FALSE
-                            AND ur.status in ('使用单位待提交', '一级受理已驳回', '使用单位已撤回')
+                          WHERE ur.is_delete = FALSE AND ur.reg_type NOT IN (1, 2)
+                            AND ur.status = '使用单位待提交'
                             AND ur.use_unit_credit_code = #{companyCode}
                           UNION ALL
                           SELECT
@@ -1580,7 +1580,7 @@
                               crr.create_date
                           FROM tzs_jg_change_registration_reform crr
                           WHERE crr.is_delete = FALSE
-                            AND crr.status in ('使用单位待提交', '一级受理已驳回', '使用单位已撤回')
+                            AND crr.status = '使用单位待提交'
                             AND crr.use_unit_credit_code = #{companyCode}
                           UNION ALL
                           SELECT
@@ -1593,7 +1593,7 @@
                               crt.create_date
                           FROM tzs_jg_change_registration_transfer crt
                           WHERE crt.is_delete = FALSE
-                            AND crt.status in ('使用单位待提交', '一级受理已驳回', '使用单位已撤回')
+                            AND crt.status = '使用单位待提交'
                             AND crt.use_unit_credit_code = #{companyCode}
                           UNION ALL
                           SELECT
@@ -1606,7 +1606,7 @@
                               vi.create_date
                           FROM tzs_jg_vehicle_information vi
                           WHERE vi.is_delete = FALSE
-                            AND vi.status in ('使用单位待提交', '一级受理已驳回', '使用单位已撤回')
+                            AND vi.status = '使用单位待提交'
                             AND vi.use_unit_credit_code = #{companyCode}
                       ) all_data
              ) dedup