巡检统计-问题项统计数量修改为人次维度

airport-check/src/main/resources/mapper/check/CheckLargeScreenMapper.xml

@@ -70,9 +70,11 @@
     </select>
 
     <select id="problemDistribution" resultType="com.sundot.airport.check.domain.CheckLargeScreenProblemDto">
-        select cpi.category_code_one code, cpi.category_name_one name, count(cpi.id) total
+        select cpi.category_code_one code, cpi.category_name_one name, count(cu.id) total
         from check_correction cc
         inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        inner join check_user cu on
+        (cu.source_id = cpi.id and cu.type = 'PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS')
         where 1 = 1
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
@@ -99,9 +101,11 @@
         cc.checked_brigade_name deptName,
         cpi.category_code_one code,
         cpi.category_name_one name,
-        count(cpi.id) total
+        count(cu.id) total
         from check_correction cc
         inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        inner join check_user cu on
+        (cu.source_id = cpi.id and cu.type = 'PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS')
         where 1 = 1
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
@@ -128,9 +132,11 @@
         cc.checked_department_name deptName,
         cpi.category_code_one code,
         cpi.category_name_one name,
-        count(cpi.id) total
+        count(cu.id) total
         from check_correction cc
         inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        inner join check_user cu on
+        (cu.source_id = cpi.id and cu.type = 'PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS')
         where 1 = 1
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
@@ -157,9 +163,11 @@
         cc.checked_brigade_name deptName,
         cpi.category_code_two code,
         cpi.category_name_two name,
-        count(cpi.id) total
+        count(cu.id) total
         from check_correction cc
         inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        inner join check_user cu on
+        (cu.source_id = cpi.id and cu.type = 'PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS')
         where 1 = 1
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
@@ -189,9 +197,11 @@
         cc.checked_department_name deptName,
         cpi.category_code_two code,
         cpi.category_name_two name,
-        count(cpi.id) total
+        count(cu.id) total
         from check_correction cc
         inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        inner join check_user cu on
+        (cu.source_id = cpi.id and cu.type = 'PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS')
         where 1 = 1
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
@@ -221,9 +231,11 @@
         cc.checked_team_name deptName,
         cpi.category_code_one code,
         cpi.category_name_one name,
-        count(cpi.id) total
+        count(cu.id) total
         from check_correction cc
         inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        inner join check_user cu on
+        (cu.source_id = cpi.id and cu.type = 'PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS')
         where 1 = 1
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
@@ -250,9 +262,11 @@
         cc.checked_team_name deptName,
         cpi.category_code_two code,
         cpi.category_name_two name,
-        count(cpi.id) total
+        count(cu.id) total
         from check_correction cc
         inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        inner join check_user cu on
+        (cu.source_id = cpi.id and cu.type = 'PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS')
         where 1 = 1
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
@@ -281,9 +295,11 @@
         select date_format(cc.check_time, '%Y-%m-%d') date,
         cc.checked_brigade_id id,
         cc.checked_brigade_name name,
-        count(cpi.id) total
+        count(cu.id) total
         from check_correction cc
         inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        inner join check_user cu on
+        (cu.source_id = cpi.id and cu.type = 'PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS')
         where 1 = 1
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
@@ -312,9 +328,11 @@
         select date_format(cc.check_time, '%Y-%m-%d') date,
         cc.checked_department_id id,
         cc.checked_department_name name,
-        count(cpi.id) total
+        count(cu.id) total
         from check_correction cc
         inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        inner join check_user cu on
+        (cu.source_id = cpi.id and cu.type = 'PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS')
         where 1 = 1
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
@@ -343,9 +361,11 @@
         select date_format(cc.check_time, '%Y-%m-%d') date,
         cc.checked_team_id id,
         cc.checked_team_name name,
-        count(cpi.id) total
+        count(cu.id) total
         from check_correction cc
         inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        inner join check_user cu on
+        (cu.source_id = cpi.id and cu.type = 'PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS')
         where 1 = 1
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
@@ -388,6 +408,9 @@
         then 'OVER_TIME_UNFINISHED'
         else 'OTHER' end type
         from check_correction cc
+        inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        inner join check_user cu on
+        (cu.source_id = cpi.id and cu.type = 'PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS')
         where 1 = 1
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
@@ -429,6 +452,9 @@
         then 'OVER_TIME_UNFINISHED'
         else 'OTHER' end type
         from check_correction cc
+        inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        inner join check_user cu on
+        (cu.source_id = cpi.id and cu.type = 'PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS')
         where 1 = 1
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
@@ -470,6 +496,9 @@
         then 'OVER_TIME_UNFINISHED'
         else 'OTHER' end type
         from check_correction cc
+        inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        inner join check_user cu on
+        (cu.source_id = cpi.id and cu.type = 'PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS')
         where 1 = 1
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
@@ -511,6 +540,9 @@
         then 'OVER_TIME_UNFINISHED'
         else 'OTHER' end type
         from check_correction cc
+        inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        inner join check_user cu on
+        (cu.source_id = cpi.id and cu.type = 'PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS')
         where 1 = 1
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
@@ -552,10 +584,12 @@
         cr.checker_name userName,
         count(distinct cr.id) checkOrderCount,
         count(distinct cc.id) rectificationOrderCount,
-        count(distinct cpi.id) unqualifiedProjectCount
+        count(distinct cu.id) unqualifiedProjectCount
         from check_record cr
         left join check_correction cc on cc.check_record_id = cr.id
         left join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        left join check_user cu on
+        (cu.source_id = cpi.id and cu.type = 'PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS')
         where 1 = 1
         and cr.task_code in
         <foreach item="item" collection="list" open="(" separator="," close=")">
@@ -592,6 +626,8 @@
         cc.checked_brigade_name deptName
         from check_correction cc
         inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        inner join check_user cu on
+        (cu.source_id = cpi.id and cu.type = 'PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS')
         where 1 = 1
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
@@ -616,6 +652,8 @@
         cc.checked_department_name deptName
         from check_correction cc
         inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        inner join check_user cu on
+        (cu.source_id = cpi.id and cu.type = 'PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS')
         where 1 = 1
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
@@ -640,6 +678,8 @@
         cc.checked_team_name deptName
         from check_correction cc
         inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        inner join check_user cu on
+        (cu.source_id = cpi.id and cu.type = 'PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS')
         where 1 = 1
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}