feat(tcm): 监管删除启停用企业

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

@@ -1073,6 +1073,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_register_info ri on ri."RECORD" = ui."RECORD"
+        LEFT JOIN tz_base_enterprise_info e on e.use_unit_code = ui."USE_UNIT_CREDIT_CODE"
         LEFT JOIN (
                 SELECT
                 "RECORD","INFORM_END","ROWNUM1"
@@ -1087,6 +1088,7 @@
         WHERE si."ORG_BRANCH_CODE" like '50%'
           and oi."CLAIM_STATUS" not in ('草稿','已拒领','待认领')
           and tt."INFORM_END" is not null
+          and e.is_delete = '0'
     </select>
 
     <select id="queryOutOfInspectionRecord" resultType="java.util.Map">
@@ -1111,6 +1113,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_register_info ri on ri."RECORD" = ui."RECORD"
+        LEFT JOIN tz_base_enterprise_info e on e.use_unit_code = ui."USE_UNIT_CREDIT_CODE"
         LEFT JOIN (
             SELECT "RECORD","NEXT_INSPECT_DATE",rowNum1
             FROM
@@ -1124,6 +1127,7 @@
         WHERE si."ORG_BRANCH_CODE" like '50%'
           AND oi."CLAIM_STATUS" not in ('草稿','已拒领','待认领')
           AND tt."NEXT_INSPECT_DATE" is not null
+          and e.is_delete = '0'
     </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'
@@ -2660,6 +2664,7 @@
         WHERE
         ei.use_unit_code IS NOT NULL
         AND ul.is_delete = 0
+        and ei.s_delete = '0'
         AND ul.expiry_date <![CDATA[<]]> to_char( now( ), 'YYYY-MM-DD' )
     </select>
 
@@ -2723,8 +2728,9 @@
         LEFT JOIN tzs_user_info tui ON tup.user_seq = tui.sequence_nbr
         LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = tui.unit_code
         WHERE
-        tup.expiry_date <![CDATA[<]]>  CURRENT_DATE AND tup.permission_post IN ('permissionData66151', 'permissionData66152', 'permissionData6552');
-
+          tup.expiry_date <![CDATA[<]]>  CURRENT_DATE
+          AND tup.permission_post IN ('permissionData66151', 'permissionData66152', 'permissionData6552')
+          and ei.s_delete = '0'
     </select>
     <select id="queryAllCompanyDict" resultType="com.yeejoin.amos.boot.biz.common.dto.KeyValueDto">
         select

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/ThreeSystemsMapper.xml

@@ -28,6 +28,8 @@
         FROM
             tz_base_enterprise_info ei
                 LEFT JOIN ${staticTableName} psd ON ei.use_code = psd.unit_code
+        where
+            ei.is_delete = '0'
         GROUP BY
             ei.use_code
     </select>

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -104,6 +104,7 @@
 		CONCAT(street,'/',address) AS full_address
 		FROM tz_base_enterprise_info
 		<where>
+		   is_delete = '0'
 			<if test="tzBaseEnterpriseInfoDto.unitType!=null and tzBaseEnterpriseInfoDto.unitType!='' ">
 				AND unit_type LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.unitType},'%')
 			</if>
@@ -204,7 +205,7 @@
 	</select>
 
 	<select id="selectByUseUnit" resultType="com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo">
-		select * from tz_base_enterprise_info where use_unit = #{useUnit}
+		select * from tz_base_enterprise_info where use_unit = #{useUnit} and is_delete = '0'
 	</select>
     <select id="listNoQrCode" resultType="com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo">
 		select
@@ -214,6 +215,7 @@
 		where
 		(qr_code is null or LENGTH(qr_code) = 0)
 		and use_code <![CDATA[<>]]> ''
+		and	is_delete = '0'
 		limit 1000
 	</select>
     <select id="getEquipType" resultType="java.util.Map">
@@ -305,7 +307,7 @@
 	<select id="selectCompanyBySupervisionOrgCode" resultType="java.lang.String">
 		select sequence_nbr
 		from tz_base_enterprise_info
-		where supervise_org_code LIKE CONCAT(#{oldOrgCode}, '%')
+		where supervise_org_code LIKE CONCAT(#{oldOrgCode}, '%') and is_delete = '0'
 	</select>
 
 	<update id="updateRedundantSupervisionOrgCodeUnit">

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

@@ -72,8 +72,6 @@
                 </choose>
             )
             AND tui.is_delete = false
-            and bi.is_delete = false
-
     </select>
     <select id="queryPermissionByUserSeq" resultType="com.yeejoin.amos.boot.module.common.api.dto.TzsUserPermissionDto">
         SELECT