bonus
/
yn_digital_gadgets_system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

日计划查询优化

This commit is contained in:
LHD_HY 2025-12-25 10:35:05 +08:00
parent 0d94f533b5
commit 4d4c9bb800
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
bonus-business/src/main/resources/mapper/DayPlanMapper.xml
View File

@ -144,57 +144,46 @@
tdp.update_user AS updateUser, tdp.update_user AS updateUser,
tdp.status AS status, tdp.status AS status,
tdp.day_plan_type AS dayPlanType, tdp.day_plan_type AS dayPlanType,
tdp.start_time AS startTime,
tdp.end_time AS endTime,
tdp.risk_level AS reskLevel,
-- 新增：拟投入高处作业人员（data_source=2）：姓名 + 数量 -- 新增：拟投入高处作业人员（data_source=2）：姓名 + 数量
(SELECT IFNULL(GROUP_CONCAT(tpp.personnel_name SEPARATOR ','), '') (SELECT IFNULL(GROUP_CONCAT(tpp.name SEPARATOR ','), '')
FROM tb_proposed_personnel tpp FROM tb_proposed_personnel tpp
WHERE tpp.day_plan_id = tdp.day_plan_id WHERE tpp.day_plan_id = tdp.day_plan_id
AND tpp.data_source = 2 AND tpp.data_source = 2) AS proposedHighPersonnelNames,
AND tpp.is_active = '1') AS proposedHighPersonnelNames,
(SELECT COUNT(*) (SELECT COUNT(*)
FROM tb_proposed_personnel tpp FROM tb_proposed_personnel tpp
WHERE tpp.day_plan_id = tdp.day_plan_id WHERE tpp.day_plan_id = tdp.day_plan_id
AND tpp.data_source = 2 AND tpp.data_source = 2) AS proposedHighPersonnelNum,
AND tpp.is_active = '1') AS proposedHighPersonnelNum,
-- 新增：拟投入地面作业人员（data_source=3）：姓名 + 数量 -- 新增：拟投入地面作业人员（data_source=3）：姓名 + 数量
(SELECT IFNULL(GROUP_CONCAT(tpp.personnel_name SEPARATOR ','), '') (SELECT IFNULL(GROUP_CONCAT(tpp.name SEPARATOR ','), '')
FROM tb_proposed_personnel tpp FROM tb_proposed_personnel tpp
WHERE tpp.day_plan_id = tdp.day_plan_id WHERE tpp.day_plan_id = tdp.day_plan_id
AND tpp.data_source = 3 AND tpp.data_source = 3) AS proposedGroundPersonnelNames,
AND tpp.is_active = '1') AS proposedGroundPersonnelNames,
(SELECT COUNT(*) (SELECT COUNT(*)
FROM tb_proposed_personnel tpp FROM tb_proposed_personnel tpp
WHERE tpp.day_plan_id = tdp.day_plan_id WHERE tpp.day_plan_id = tdp.day_plan_id
AND tpp.data_source = 3 AND tpp.data_source = 3) AS proposedGroundPersonnelNum,
AND tpp.is_active = '1') AS proposedGroundPersonnelNum,
-- 新增：实际投入高处作业人员（data_source=4）：姓名 + 数量 -- 新增：实际投入高处作业人员（data_source=4）：姓名 + 数量
(SELECT IFNULL(GROUP_CONCAT(tpp.personnel_name SEPARATOR ','), '') (SELECT IFNULL(GROUP_CONCAT(tpp.name SEPARATOR ','), '')
FROM tb_proposed_personnel tpp FROM tb_proposed_personnel tpp
WHERE tpp.day_plan_id = tdp.day_plan_id WHERE tpp.day_plan_id = tdp.day_plan_id
AND tpp.data_source = 4 AND tpp.data_source = 4) AS actualHighPersonnelNames,
AND tpp.is_active = '1') AS actualHighPersonnelNames,
(SELECT COUNT(*) (SELECT COUNT(*)
FROM tb_proposed_personnel tpp FROM tb_proposed_personnel tpp
WHERE tpp.day_plan_id = tdp.day_plan_id WHERE tpp.day_plan_id = tdp.day_plan_id
AND tpp.data_source = 4 AND tpp.data_source = 4) AS actualHighPersonnelNum,
AND tpp.is_active = '1') AS actualHighPersonnelNum,
-- 新增：实际投入地面作业人员（data_source=5）：姓名 + 数量 -- 新增：实际投入地面作业人员（data_source=5）：姓名 + 数量
(SELECT IFNULL(GROUP_CONCAT(tpp.personnel_name SEPARATOR ','), '') (SELECT IFNULL(GROUP_CONCAT(tpp.name SEPARATOR ','), '')
FROM tb_proposed_personnel tpp FROM tb_proposed_personnel tpp
WHERE tpp.day_plan_id = tdp.day_plan_id WHERE tpp.day_plan_id = tdp.day_plan_id
AND tpp.data_source = 5 AND tpp.data_source = 5) AS actualGroundPersonnelNames,
AND tpp.is_active = '1') AS actualGroundPersonnelNames,
(SELECT COUNT(*) (SELECT COUNT(*)
FROM tb_proposed_personnel tpp FROM tb_proposed_personnel tpp
WHERE tpp.day_plan_id = tdp.day_plan_id WHERE tpp.day_plan_id = tdp.day_plan_id
AND tpp.data_source = 5 AND tpp.data_source = 5) AS actualGroundPersonnelNum
AND tpp.is_active = '1') AS actualGroundPersonnelNum
FROM FROM
tb_day_plan tdp tb_day_plan tdp