From 6bfad8451915a9df2715d4bbb6926bac8daf6287 Mon Sep 17 00:00:00 2001
From: JYW <2013732181@qq.com>
Date: 星期五, 10 五月 2024 13:21:25 +0800
Subject: [PATCH] 辅助工时增删改查
---
performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
index d903fed..29c9d73 100644
--- a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
+++ b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
@@ -2,10 +2,16 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.PerformanceShiftMapper">
- <select id="performanceShiftPage" resultType="map">
+ <resultMap id="performanceShiftPageMap" type="com.yuanchu.mom.dto.PerformanceShiftMapDto">
+ <result column="name" property="name"/>
+ <result column="shift_time" property="shiftTime"/>
+ <result column="user_id" property="userId" />
+ </resultMap>
+
+ <select id="performanceShiftPage" 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 shiftTime
+ 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>
@@ -20,4 +26,21 @@
</where>
GROUP BY u.id
</select>
+
+ <select id="performanceShiftYearPage" resultType="map">
+ SELECT
+ s.user_id, s.shift
+ FROM performance_shift s
+ LEFT JOIN user u on u.id = s.user_id
+ where s.shift is not NULL
+ and s.shift != ''
+ <if test="time != null and time != ''">
+ and DATE_FORMAT(s.work_time, '%Y') = DATE_FORMAT(#{time}, '%Y' )
+ </if>
+ <if test="userName != null and userName != ''">
+ and u.name like concat('%', #{userName}, '%')
+ </if>
+ <if test="laboratory != null and laboratory != ''">
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3