From 8cbb4e01b9226b32797a48489c5e1b30da3e2110 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 13 四月 2026 15:01:32 +0800
Subject: [PATCH] 数采调整&人员考勤导出开发
---
performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
index 381ef69..8fa884c 100644
--- a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
+++ b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
@@ -154,10 +154,13 @@
u.name AS user_name,
u.account AS person_code,
st.start_time,
- st.end_time
+ st.end_time,
+ sd.dict_label AS shift_name,
+ ps.annotation_text
FROM performance_shift ps
- LEFT JOIN user u ON ps.user_id = u.id
+ inner JOIN user u ON ps.user_id = u.id
LEFT JOIN shift_time st ON ps.shift = st.shift
+ left join sys_dict_data sd on ps.shift = sd.dict_value AND sd.dict_type='sys_class_type'
<where>
<if test="startTime!=null and endTime!=null">
AND ps.work_time BETWEEN #{startTime} AND #{endTime}
@@ -166,6 +169,6 @@
AND (u.account like concat('%',#{keyword},'%') OR u.name like concat('%',#{keyword},'%'))
</if>
</where>
- ORDER BY ps.work_time
+ ORDER BY ps.work_time,ps.user_id
</select>
</mapper>
--
Gitblit v1.9.3