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

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

@@ -34,6 +34,7 @@
              cu.data_sources = '陕西省内企业'
           AND cu.unit_type LIKE '%充装单位%'
           and cu.org_code like concat('%', #{regionCode}, '%')
+          AND cu.is_delete = 0
         GROUP BY strKey
     </select>
 
@@ -46,6 +47,7 @@
         <where>
             cu.data_sources = '陕西省内企业'
             AND cu.unit_type LIKE '%充装单位%'
+            and cu.is_delete = false
             <if test="regionCode != null and regionCode != ''">
                 and cu.org_code like concat(#{regionCode}, '%')
             </if>
@@ -63,6 +65,7 @@
         LEFT JOIN tz_base_enterprise_info cu on ci.app_id = cu.app_id
         <where>
             cu.data_sources = '陕西省内企业'
+            and cu.is_delete = false
             AND cu.unit_type LIKE '%充装单位%'
             <if test="regionCode != null and regionCode != ''">
                 and cu.org_code like concat( #{regionCode}, '%')
@@ -85,6 +88,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 +107,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
@@ -129,6 +134,7 @@
         WHERE
             i.data_sources = '陕西省内企业'
           AND i.unit_type LIKE'%充装单位%'
+          and i.is_delete = false
         <if test="orgCodes != null and orgCodes.size > 0">
             AND
             <foreach collection="orgCodes" open="(" item="orgCode" close=")" separator=" or ">
@@ -150,6 +156,7 @@
                 RIGHT JOIN tzs_user_info ui ON ui.unit_code = u.use_code
         WHERE
         u.data_sources = '陕西省内企业'
+        and u.is_delete = false
         AND u.unit_type LIKE'%充装单位%'
         AND ui.post like '%"6552"%'
         <if test="orgCodes != null and orgCodes.size > 0">

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylinderInfoMapper.xml

@@ -625,6 +625,7 @@
           AND f.filling_endtime >= concat(#{startTime}, ' 00:00:00')
           AND i.org_code like concat(#{orgCode}, '%')
           AND i.unit_type like '%充装单位%'
+          and i.is_delete = false
         GROUP BY
             filling_time
         ORDER BY
@@ -642,6 +643,7 @@
             i.app_id = f.app_id
           AND f.statistics_sync_date >= #{startTime}
           AND i.org_code like concat(#{orgCode}, '%')
+          and i.is_delete = false
         GROUP BY
             filling_time
         ORDER BY

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylinderTagsDataUnitMapper.xml

@@ -19,6 +19,7 @@
                     tz_cylinder_tags t,
                     tz_base_enterprise_info e
                     where t.app_id = e.app_id
+                    and e.is_delete = false
                     <if test="orgCode != null and orgCode != ''">
                         and e.org_code like concat(#{orgCode}, '%')
                     </if>

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylinderUnitMapper.xml

@@ -67,6 +67,7 @@
         FROM tz_base_enterprise_info tcu
          WHERE tcu.org_code like concat( #{orgCode}, '%')
           AND tcu.data_sources = '陕西省内企业'
+          and tcu.is_delete = false
           AND tcu.unit_type LIKE'%充装单位%'
     </select>
     <select id="queryCylinderUnitOfPermissionExpire" resultType="com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderUnitDto">

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

@@ -274,6 +274,8 @@
 			concat(info.use_unit_code,'_',info.use_unit) as useCodeAndName
 		FROM
 			tz_base_enterprise_info info
+		where
+			is_delete = '0'
 	</sql>
 	<select id="getInspectionUnitListByCode" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto">
         <include refid="unit-list-info" />
@@ -363,7 +365,8 @@
 			a.supervise_org_code as label
 		FROM
 			"tz_base_enterprise_info" a
-			group by a.unit_type,a.supervise_org_code
+		 where	a.is_delete = '0'
+		group by a.unit_type,a.supervise_org_code
 	</select>
     <select id="countByOperatingStatusAndOrgCode" resultType="java.lang.Long">
 		SELECT
@@ -372,6 +375,7 @@
 		 	"tz_base_enterprise_info"
 		 where
 		 	 1=1
+		    and is_delete = '0'
 		 	and ((supervise_org_code != '50' and supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (supervise_org_code = '50' and office_region LIKE CONCAT ('%', #{cityCode}, '%')))
 		 	and
 		 	<foreach collection="operatingStatus" item="status" separator="or" open="(" close=")">
@@ -393,6 +397,7 @@
 		FROM tz_base_unit_licence tbul
 	    JOIN tz_base_enterprise_info tbei ON tbul.unit_Code = tbei.use_unit_code
 		WHERE 1 = 1
+		and tbei.is_delete = '0'
 		<if test="operator != null and operator !='' ">
 			AND tbul.expiry_date ${operator} CURRENT_DATE
 		</if>

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

@@ -72,6 +72,7 @@
                 </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">