From 3807a2754a9ea195be9fb43b6cac06b8293c2fc6 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 11 十二月 2025 18:06:03 +0800
Subject: [PATCH] 工作台

---
 business/src/main/resources/mapper/WorkStationScheduleMapper.xml |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/business/src/main/resources/mapper/WorkStationScheduleMapper.xml b/business/src/main/resources/mapper/WorkStationScheduleMapper.xml
index 07be4e1..eb1d570 100644
--- a/business/src/main/resources/mapper/WorkStationScheduleMapper.xml
+++ b/business/src/main/resources/mapper/WorkStationScheduleMapper.xml
@@ -7,8 +7,8 @@
         <result column="user_id" property="userId" />
         <result column="content" property="content" />
         <result column="status" property="status" />
-        <result column="gmtCreate" property="gmtcreate" />
-        <result column="gmtUpdate" property="gmtupdate" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_update" property="gmtUpdate" />
     </resultMap>
 
 
@@ -41,4 +41,24 @@
             TWSS.deleted = 0
     </select>
 
+    <select id="groupByProjectAndDate" resultType="com.ycl.domain.vo.WorkStationScheduleVO">
+        SELECT
+        TWSS.id,
+        TWSS.user_id,
+        TWSS.content,
+        TWSS.status,
+        TWSS.project_id,
+        TWSS.completed_time,
+        TPI.project_name
+        FROM t_work_station_schedule TWSS
+        LEFT JOIN t_project_info TPI on TWSS.project_id = TPI.id
+        WHERE TWSS.deleted = 0
+        AND TWSS.user_id = #{userId}
+        AND TWSS.completed_time BETWEEN #{startTime} AND #{endTime}
+        <if test="projectId != null">
+            AND TWSS.project_id = #{projectId}
+        </if>;
+    </select>
+
+
 </mapper>

--
Gitblit v1.8.0