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

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

@@ -200,7 +200,7 @@
 	</select>
 
 	<select id="selectByUseUnit" resultType="com.yeejoin.amos.boot.module.jczs.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 = false
 	</select>
 
 	<select id="getOrgCodeByCompanyCode" resultType="java.lang.String">

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

@@ -212,6 +212,7 @@
         WHERE tui.is_delete = 'f'
           AND tui.amos_user_id is NOT null
           AND tzei.unit_type IS NOT NULL
+          and tzei.is_delete = false
         GROUP BY tui.amos_user_id
     </select>
 

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

@@ -32,6 +32,7 @@
             tz_base_enterprise_info cu
         where
              cu.data_sources = '陕西省内企业'
+          and cu.is_delete = false
           AND cu.unit_type LIKE '%充装单位%'
           and cu.org_code like concat('%', #{regionCode}, '%')
         GROUP BY strKey
@@ -85,6 +86,7 @@
                 RIGHT JOIN tz_cylinder_info t1 ON t1.app_id = i.app_id
         WHERE
             i.data_sources = '陕西省内企业'
+          and i.is_delete = false
           AND i.unit_type LIKE'%充装单位%'
           AND i.industry_supervisor like concat(#{orgCode}, '%')
         GROUP BY
@@ -103,6 +105,7 @@
                 RIGHT JOIN tz_cylinder_info t1 ON t1.app_id = i.app_id
         WHERE
             i.data_sources = '陕西省内企业'
+          and i.is_delete = false
           AND i.unit_type LIKE'%充装单位%'
           AND i.industry_supervisor like concat(#{orgCode}, '%')
         GROUP BY
@@ -128,6 +131,7 @@
             tz_base_enterprise_info i
         WHERE
             i.data_sources = '陕西省内企业'
+          and i.is_delete = false
           AND i.unit_type LIKE'%充装单位%'
         <if test="orgCodes != null and orgCodes.size > 0">
             AND
@@ -153,6 +157,7 @@
             AND u.unit_type LIKE'%充装单位%'
             AND ui.post like '%6552%'
             and ui.is_delete = false
+            and u.is_delete = false
         <if test="orgCodes != null and orgCodes.size > 0">
             AND
             <foreach collection="orgCodes" open="(" item="orgCode" close=")" separator=" or ">

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

@@ -247,7 +247,7 @@
 	</select>
 
 	<select id="selectByUseUnit" resultType="com.yeejoin.amos.boot.module.ymt.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="getInspectionUnitList" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto">
 		SELECT
@@ -261,6 +261,7 @@
 			tz_base_enterprise_info info
 				inner JOIN tz_jyjc_opening_application tjoa ON info.use_code = tjoa.unit_code
 				AND tjoa.status = '已完成'
+		        AND info.is_delete = '0'
 				<if test="openBizType != null and openBizType !=''">
 					and tjoa.open_biz_type = #{openBizType}
 				</if>