From d6b2dc99505f04d305f08e2fd9db795300c9b812 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Tue, 22 Jul 2025 16:19:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E7=8F=AD=E4=BF=A1=E6=81=AF=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modules/pms/data/EamAdminData.java    | 10 +++++++
 .../entity/SchedulingRecordData.java          |  7 ++++-
 .../service/impl/SchedulingServiceImpl.java   | 12 ++++++---
 .../mapper/scheduling/SchedulingMapper.xml    | 27 ++++++++++++-------
 4 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamAdminData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamAdminData.java
index 0c183fd1..c4f36524 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/EamAdminData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/EamAdminData.java
@@ -25,6 +25,16 @@ public class EamAdminData extends QueryPage {
     @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
     private Date createdDate;
     private String createdBy;
+    private String isHoliday;
+
+    public String getIsHoliday() {
+        return isHoliday;
+    }
+
+    public void setIsHoliday(String isHoliday) {
+        this.isHoliday = isHoliday;
+    }
+
     // 更新时间
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
diff --git a/src/main/java/com/xujie/sys/modules/scheduling/entity/SchedulingRecordData.java b/src/main/java/com/xujie/sys/modules/scheduling/entity/SchedulingRecordData.java
index b6ca4afd..4a6a33da 100644
--- a/src/main/java/com/xujie/sys/modules/scheduling/entity/SchedulingRecordData.java
+++ b/src/main/java/com/xujie/sys/modules/scheduling/entity/SchedulingRecordData.java
@@ -1,7 +1,11 @@
 package com.xujie.sys.modules.scheduling.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.xujie.sys.modules.pms.data.EamAdminData;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class SchedulingRecordData {
     private Integer id;
@@ -10,5 +14,6 @@ public class SchedulingRecordData {
     private Integer headId;
     private String isHoliday;
     private Integer editId;
-
+    @TableField(exist = false)
+    private List<EamAdminData> peopleList;
 }
diff --git a/src/main/java/com/xujie/sys/modules/scheduling/service/impl/SchedulingServiceImpl.java b/src/main/java/com/xujie/sys/modules/scheduling/service/impl/SchedulingServiceImpl.java
index 233e403f..9aba95a6 100644
--- a/src/main/java/com/xujie/sys/modules/scheduling/service/impl/SchedulingServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/scheduling/service/impl/SchedulingServiceImpl.java
@@ -142,10 +142,14 @@ public class SchedulingServiceImpl implements SchedulingService {
         }else {
             SchedulingRecordData schedulingRecordData = new SchedulingRecordData();
             schedulingRecordData.setHeadId(data.getHeadId());
-            schedulingRecordData.setAdminId(data.getAdminId());
-            schedulingRecordData.setAdminName(data.getAdminName());
-            schedulingRecordData.setIsHoliday(data.getIsHoliday());
-            schedulingMapper.saveSchedulingRecord(schedulingRecordData);
+            List<EamAdminData> peopleList = data.getPeopleList();
+            peopleList.forEach(people->{
+                System.out.println(people.getIsHoliday());
+                schedulingRecordData.setAdminId(people.getAdminID());
+                schedulingRecordData.setAdminName(people.getAdminName());
+                schedulingRecordData.setIsHoliday(people.getIsHoliday());
+                schedulingMapper.saveSchedulingRecord(schedulingRecordData);
+            });
         }
         return R.ok();
     }
diff --git a/src/main/resources/mapper/scheduling/SchedulingMapper.xml b/src/main/resources/mapper/scheduling/SchedulingMapper.xml
index 3b45f110..3b044264 100644
--- a/src/main/resources/mapper/scheduling/SchedulingMapper.xml
+++ b/src/main/resources/mapper/scheduling/SchedulingMapper.xml
@@ -64,30 +64,37 @@
         </where>
     </select>
     <select id="querySchedulingList" resultType="com.xujie.sys.modules.scheduling.entity.SchedulingData">
-        select tpm_scheduling.*,
+        select ts.*,
                tc.description as classesDescription
-        from tpm_scheduling
-        left join tpm_classes tc on tpm_scheduling.classes_code = tc.code
+        from tpm_scheduling ts
+        left join tpm_classes tc on ts.classes_code = tc.code
         <where>
             <if test="site != null and site != ''">
-                and site = #{site}
+                and ts.site = #{site}
             </if>
             <if test="buNo != null and buNo != ''">
-                and bu_no = #{buNo}
+                and ts.bu_no = #{buNo}
             </if>
             <if test="classesCode != null and classesCode != ''">
-                and classes_code = #{classesCode}
+                and ts.classes_code = #{classesCode}
             </if>
             <if test="startDate != null">
-                and date >= #{startDate}
+                and ts.date >= #{startDate}
             </if>
             <if test="endDate != null">
-                and date <![CDATA[<=]]> #{endDate}
+                and ts.date <![CDATA[<=]]> #{endDate}
             </if>
         </where>
+        order by ts.date
     </select>
     <select id="querySaveSchedulingRecord" resultType="com.xujie.sys.modules.scheduling.entity.SchedulingRecordData">
-        select * from tpm_scheduling_record
-        where head_id = #{id}
+        select
+            tsr.id,
+            tsr.head_id,
+            tsr.admin_id,
+            tsr.admin_name,
+            case when tsr.isHoliday = 'Y' then '请假' else '工作' end as isHoliday
+        from tpm_scheduling_record tsr
+        where tsr.head_id = #{id}
     </select>
 </mapper>
\ No newline at end of file