From 38a12f2899e0f48383058250ee378fd3b5855658 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 08 五月 2024 13:50:47 +0800
Subject: [PATCH] 2024-5-8 绩效管理-班次后端开发完成
---
performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
index ceff2b1..a1c5d61 100644
--- a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
+++ b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
@@ -4,11 +4,10 @@
<select id="performanceShiftPage" resultType="map">
SELECT
- s.id,
- if(u.department is not null and u.department != '', CONCAT(u.name, '锛�', u.department, '锛�'), u.name) name,
- GROUP_CONCAT(s.work_time, '锛�', s.shift SEPARATOR ';') AS shiftTime
+ if(u.department is not null and u.department != '', CONCAT(u.name, '锛�', u.department, '锛�'), u.name) name,
+ GROUP_CONCAT(s.work_time, '锛�', s.shift, '锛�', s.id SEPARATOR ';') AS shiftTime
FROM performance_shift s
- LEFT JOIN user u on u.id = s.user_id
+ LEFT JOIN user u on u.id = s.user_id
GROUP BY u.id
<where>
<if test="time != null and time != ''">
--
Gitblit v1.9.3