承包商所属企业多选bug修改

危险作业人员统计bug修改

zlmy-modules/zlmy-boot/src/main/resources/mapper/contractor/manage/TContractorAcceptance.xml

@@ -31,7 +31,7 @@
                 LEFT JOIN t_contractor_info AS tci ON tci.id = tcl.info_id
                 LEFT JOIN t_contractor_project AS tcp ON tcp.id = tca.proj_id
                 left join t_sys_user tsu on tsu.user_id = tca.create_by
-        <where>
+        <!--<where>
             tca.status != '1'
             and tca.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})
             and tca.status = '0'
@@ -39,6 +39,20 @@
                 and tci.name like concat('%',#{param.contractorName},'%')
             </if>
             order by tca.update_date desc
-        </where>
+        </where>-->
+        WHERE EXISTS (
+        SELECT 1
+        FROM unnest(string_to_array(tca.org_id, ',')) AS org(id)
+        JOIN t_sys_org o ON org.id = o.org_id
+        WHERE
+        o.parent_ids LIKE concat('%',#{param.orgId},'%')
+        OR o.org_id = #{param.orgId}
+        )
+        and tca.status != '1'
+        and tca.status = '0'
+        <if test="param.contractorName != null and param.contractorName != ''">
+            and tci.name like concat('%',#{param.contractorName},'%')
+        </if>
+        order by tca.update_date desc
     </select>
 </mapper>
\ No newline at end of file

zlmy-modules/zlmy-boot/src/main/resources/mapper/contractor/manage/TContractorAllow.xml

@@ -39,7 +39,15 @@
         LEFT JOIN ( SELECT allow_id, COUNT( id ) AS materialCount FROM t_contractor_allow_material GROUP BY allow_id ) AS material ON tca.id = material.allow_id
         LEFT JOIN ( SELECT allow_id, COUNT( id ) AS protectiveCount FROM t_contractor_allow_protective GROUP BY allow_id ) AS protective ON tca.id = protective.allow_id
         LEFT JOIN ( SELECT allow_id, COUNT( id ) AS trainingRecordCount FROM t_contractor_allow_person WHERE training_record IS NOT NULL GROUP BY allow_id ) AS trainingRecord ON tca.id = trainingRecord.allow_id
-        where tca.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})
+        <!--where tca.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})-->
+        WHERE EXISTS (
+        SELECT 1
+        FROM unnest(string_to_array(tca.org_id, ',')) AS org(id)
+        JOIN t_sys_org o ON org.id = o.org_id
+        WHERE
+        o.parent_ids LIKE concat('%',#{param.orgId},'%')
+        OR o.org_id = #{param.orgId}
+        )
         and tca.status = '0'
         <if test="param.contractorName != null and param.contractorName != ''">
             AND tci.name like concat('%',#{param.contractorName},'%')

zlmy-modules/zlmy-boot/src/main/resources/mapper/contractor/manage/TContractorBasicInfo.xml

@@ -64,8 +64,16 @@
         LEFT JOIN t_contractor_ledger AS tcl ON tcl.id = tclp.contractor_id
         LEFT JOIN t_contractor_info AS tci ON tci.id = tcl.info_id
         LEFT JOIN t_contractor_project AS tcp ON tcp.id = tclp.project_id
+        <!--WHERE
+        tcbi.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})-->
+        WHERE EXISTS (
+        SELECT 1
+        FROM unnest(string_to_array(tcbi.org_id, ',')) AS org(id)
+        JOIN t_sys_org o ON org.id = o.org_id
         WHERE
-        tcbi.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})
+        o.parent_ids LIKE concat('%',#{param.orgId},'%')
+        OR o.org_id = #{param.orgId}
+        )
         and tcbi.status = '0'
         <if test="param.contractorName != null and param.contractorName != ''">
             AND tci.name like concat('%',#{param.contractorName},'%')

zlmy-modules/zlmy-boot/src/main/resources/mapper/contractor/manage/TContractorBlacklist.xml

@@ -49,8 +49,16 @@
         LEFT JOIN t_contractor_info tci ON tcl.info_id = tci.id
         LEFT JOIN t_contractor_project tcp ON t.proj_id = tcp.id
         left join t_sys_user su on t.create_by = su.user_id
+        <!--WHERE
+        t.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})-->
+        WHERE EXISTS (
+        SELECT 1
+        FROM unnest(string_to_array(t.org_id, ',')) AS org(id)
+        JOIN t_sys_org o ON org.id = o.org_id
         WHERE
-        t.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})
+        o.parent_ids LIKE concat('%',#{param.orgId},'%')
+        OR o.org_id = #{param.orgId}
+        )
         and t.status = '0'
         <if test="param.contractorName != null and param.contractorName != ''">
             AND tci.name like concat('%',#{param.contractorName},'%')

zlmy-modules/zlmy-boot/src/main/resources/mapper/contractor/manage/TContractorConditionReview.xml

@@ -41,8 +41,16 @@
         LEFT JOIN t_contractor_ledger tcl ON t.contractor_id = tcl.id
         LEFT JOIN t_contractor_info tci ON tcl.info_id = tci.id
         LEFT JOIN t_contractor_project tcp ON t.proj_id = tcp.id
+        <!--WHERE
+        t.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})-->
+        WHERE EXISTS (
+        SELECT 1
+        FROM unnest(string_to_array(t.org_id, ',')) AS org(id)
+        JOIN t_sys_org o ON org.id = o.org_id
         WHERE
-        t.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})
+        o.parent_ids LIKE concat('%',#{param.orgId},'%')
+        OR o.org_id = #{param.orgId}
+        )
         and t.status = '0'
         <if test="param.contractorName != null and param.contractorName != ''">
             AND tci.name like concat('%',#{param.contractorName},'%')

zlmy-modules/zlmy-boot/src/main/resources/mapper/contractor/manage/TContractorDailyPlan.xml

@@ -41,7 +41,7 @@
                 LEFT JOIN t_contractor_project AS tcp ON tcp.id = tcdp.proj_id
                 left JOIN (SELECT plan_id,count(id) as hazardCount FROM t_contractor_daily_plan_inspect_result_hazard GROUP BY plan_id) as hazard on hazard.plan_id = tcdp.id
                 left join (SELECT plan_id,count(id) as inspectCount FROM t_contractor_daily_plan_inspect GROUP BY plan_id) as inspect on inspect.plan_id = tcdp.id
-        <where>
+        <!--<where>
             tcdp.status != '1'
             and tcdp.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})
             <if test="param.contractorName != null and param.contractorName != ''">
@@ -54,6 +54,25 @@
                 AND tcdp.process_status like concat('%',#{param.processStatus},'%')
             </if>
             order by tcdp.update_date desc
-        </where>
+        </where>-->
+        WHERE EXISTS (
+        SELECT 1
+        FROM unnest(string_to_array(tcdp.org_id, ',')) AS org(id)
+        JOIN t_sys_org o ON org.id = o.org_id
+        WHERE
+        o.parent_ids LIKE concat('%',#{param.orgId},'%')
+        OR o.org_id = #{param.orgId}
+        )
+        and tcdp.status != '1'
+        <if test="param.contractorName != null and param.contractorName != ''">
+            AND tci.name like concat('%',#{param.contractorName},'%')
+        </if>
+        <if test="param.projectName != null and param.projectName != ''">
+            AND tcp.name like concat('%',#{param.projectName},'%')
+        </if>
+        <if test="param.processStatus != null and param.processStatus != ''">
+            AND tcdp.process_status like concat('%',#{param.processStatus},'%')
+        </if>
+        order by tcdp.update_date desc
     </select>
 </mapper>
\ No newline at end of file

zlmy-modules/zlmy-boot/src/main/resources/mapper/contractor/manage/TContractorEvaluate.xml

@@ -58,8 +58,16 @@
         LEFT JOIN t_contractor_ledger tcl ON t.contractor_id = tcl.id
         LEFT JOIN t_contractor_info tci ON tcl.info_id = tci.id
         LEFT JOIN t_contractor_project tcp ON t.proj_id = tcp.id
+        <!--WHERE
+        t.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})-->
+        WHERE EXISTS (
+        SELECT 1
+        FROM unnest(string_to_array(t.org_id, ',')) AS org(id)
+        JOIN t_sys_org o ON org.id = o.org_id
         WHERE
-        t.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})
+        o.parent_ids LIKE concat('%',#{param.orgId},'%')
+        OR o.org_id = #{param.orgId}
+        )
         and t.status = '0'
         <if test="param.contractorName != null and param.contractorName != ''">
             AND tci.name like concat('%',#{param.contractorName},'%')

zlmy-modules/zlmy-boot/src/main/resources/mapper/contractor/manage/TContractorPreparation.xml

@@ -58,8 +58,16 @@
                 LEFT JOIN t_contractor_ledger tcl ON t.contractor_id = tcl.id
                 LEFT JOIN t_contractor_info tci ON tcl.info_id = tci.id
                 LEFT JOIN t_contractor_project tcp ON t.proj_id = tcp.id
+        <!--WHERE
+            t.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})-->
+        WHERE EXISTS (
+        SELECT 1
+        FROM unnest(string_to_array(t.org_id, ',')) AS org(id)
+        JOIN t_sys_org o ON org.id = o.org_id
         WHERE
-            t.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})
+        o.parent_ids LIKE concat('%',#{param.orgId},'%')
+        OR o.org_id = #{param.orgId}
+        )
             and t.status != '1'
         <if test="param.contractorName != null and param.contractorName != ''">
             AND tci.name like concat('%',#{param.contractorName},'%')

zlmy-modules/zlmy-boot/src/main/resources/mapper/contractor/manage/TContractorSafetyBrief.xml

@@ -49,8 +49,16 @@
         LEFT JOIN t_contractor_ledger tcl ON t.contractor_id = tcl.id
         LEFT JOIN t_contractor_info tci ON tcl.info_id = tci.id
         LEFT JOIN t_contractor_project tcp ON t.proj_id = tcp.id
+        <!--WHERE
+        t.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})-->
+        WHERE EXISTS (
+        SELECT 1
+        FROM unnest(string_to_array(t.org_id, ',')) AS org(id)
+        JOIN t_sys_org o ON org.id = o.org_id
         WHERE
-        t.org_id IN (select org.org_id from t_sys_org org where org.parent_ids like concat('%',#{param.orgId},'%') or org.org_id = #{param.orgId})
+        o.parent_ids LIKE concat('%',#{param.orgId},'%')
+        OR o.org_id = #{param.orgId}
+        )
         and t.status = '0'
         <if test="param.processStatus != null and param.processStatus != ''">
             AND t.process_status = #{param.processStatus}

zlmy-modules/zlmy-boot/src/main/resources/mapper/hazard/HazardWorkPlanStatistics.xml

@@ -381,7 +381,7 @@
         FROM (
             SELECT  hp.id, SUBSTRING(SPLIT_PART(hp.operator, ',', n) FROM 1 FOR 2) AS operator
             FROM t_hazard_work_plan hp, GENERATE_SERIES(1, LENGTH(hp.operator) - LENGTH(REPLACE(hp.operator, ',', '')) + 1) AS n
-            WHERE   hp.operator != '' AND hp.operator IS NOT NULL  AND hp.status != 1  AND hp.work_status != 6
+            WHERE  hp.operator IS NOT NULL  AND hp.status != 1  AND hp.work_status != 6
             AND hp.org_id IN (  SELECT org_id  FROM t_sys_org so  WHERE ((so.tree_level = 4 OR so.nature = 4) AND so.org_id = #{query.orgId})
                 OR so.parent_ids LIKE CONCAT('%,', #{query.orgId}, '%') )