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