From af61da8b525487eb12813762bc7480bcf8c9b65b Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 29 五月 2025 09:48:13 +0800
Subject: [PATCH] 添加oa流程地址
---
performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
index 751ca1a..56bd55b 100644
--- a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
+++ b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
@@ -11,13 +11,14 @@
<select id="performanceShiftPage" resultMap="performanceShiftPageMap">
SELECT
- if(u2.department is not null and u2.department != '', CONCAT(u2.name, '锛�', u2.department, '锛�'), u2.name) name,
+ u2.name name,
GROUP_CONCAT(s.work_time, '锛�', s.shift, '锛�', s.id order by s.work_time SEPARATOR ';') AS shift_time, u2.id user_id
FROM performance_shift s
LEFT JOIN (SELECT distinct u.* from
user u
left join department_lims dl on FIND_IN_SET(dl.id,u.depart_lims_id)
- where state=1
+ where status = '0'
+ and del_flag = '0'
<if test="laboratory != null and laboratory != ''">
and dl.name=#{laboratory}
</if>
@@ -31,8 +32,8 @@
and u2.name like concat('%', #{userName}, '%')
</if>
</where>
- order by s.create_time
GROUP BY u2.id
+ order by s.create_time
</select>
<select id="performanceShiftYearPage" resultType="map">
@@ -42,7 +43,8 @@
LEFT JOIN (SELECT u.* from
user u
left join department_lims dl on FIND_IN_SET(dl.id,u.depart_lims_id)
- where state=1
+ where status = '0'
+ and del_flag = '0'
<if test="laboratory != null and laboratory != ''">
and dl.name=#{laboratory}
</if>
@@ -60,7 +62,8 @@
</select>
<select id="performanceShiftYear" resultType="java.util.Map">
- SELECT if(u2.department is not null and u2.department != '', CONCAT(u2.name, '锛�', u2.department, '锛�'), u2.name) name,
+ SELECT
+ u2.name name,
s.user_id, u2.account,
DATE_FORMAT(s.work_time, '%c') work_time,
GROUP_CONCAT(DATE_FORMAT(s.work_time, '%c'), '锛�', s.shift order by s.work_time SEPARATOR ';') month_str
@@ -68,7 +71,8 @@
LEFT JOIN (SELECT u.* from
user u
left join department_lims dl on FIND_IN_SET(dl.id,u.depart_lims_id)
- where state=1
+ where status = '0'
+ and del_flag = '0'
<if test="laboratory != null and laboratory != ''">
and dl.name=#{laboratory}
</if>
@@ -87,7 +91,8 @@
</select>
<select id="performanceShiftYearList" resultType="map">
- SELECT if(u.department is not null and u.department != '', CONCAT(u.name, '锛�', u.department, '锛�'), u.name) name,
+ SELECT
+ u.name name,
s.user_id, u.account,
DATE_FORMAT(s.work_time, '%c') work_time,
GROUP_CONCAT(DATE_FORMAT(s.work_time, '%c'), '锛�', s.shift order by s.work_time SEPARATOR ';') month_str
@@ -109,8 +114,8 @@
<select id="performanceShiftList" resultMap="performanceShiftPageMap">
SELECT
- 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 order by s.work_time SEPARATOR ';') AS shift_time, u.id user_id, u.department
+ u.name name,
+ GROUP_CONCAT(s.work_time, '锛�', s.shift, '锛�', s.id order by s.work_time SEPARATOR ';') AS shift_time, u.id user_id
FROM performance_shift s
LEFT JOIN user u on u.id = s.user_id
<where>
@@ -123,8 +128,8 @@
<if test="laboratory != null and laboratory != ''">
</if>
</where>
- order by s.create_time
GROUP BY u.id
+ order by s.create_time
</select>
<select id="seldepLimsId" resultType="java.lang.String">
--
Gitblit v1.9.3