From 79841a6a5ecd713a9f02d23552619cbba1c991ad Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 06 三月 2026 17:42:40 +0800
Subject: [PATCH] fix:班次页面问题修复
---
performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
index 64b3dfc..1388484 100644
--- a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
+++ b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
@@ -2,16 +2,25 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.performance.mapper.PerformanceShiftMapper">
- <resultMap id="performanceShiftPageMap" type="com.ruoyi.performance.dto.PerformanceShiftMapDto">
- <result column="name" property="name"/>
+ <resultMap id="performanceShiftMap" type="com.ruoyi.performance.dto.PerformanceShiftMapDto">
+ <id column="id" property="id"/>
+ <result column="shift" property="shift"/>
+ <result column="work_time" property="workTime"/>
+ <result column="annotation_text" property="annotationText"/>
+ <result column="user_name" property="userName"/>
<result column="shift_time" property="shiftTime"/>
<result column="user_id" property="userId" />
<result column="department" property="department" />
</resultMap>
- <select id="performanceShiftPage" resultMap="performanceShiftPageMap">
+ <select id="performanceShift" resultMap="performanceShiftMap">
SELECT
- GROUP_CONCAT(s.work_time, '锛�', s.shift, '锛�', s.id order by s.work_time SEPARATOR ';') AS shift_time, u2.id user_id
+ s.id,
+ s.shift,
+ s.work_time,
+ s.annotation_text,
+ u2.name AS user_name,
+ u2.id user_id
FROM performance_shift s
LEFT JOIN (SELECT distinct u.* from
user u
@@ -23,15 +32,14 @@
</if>
) u2 on u2.id = s.user_id
<where>
- name is not null
- <if test="time != null and time != ''">
- and DATE_FORMAT(s.work_time, '%Y-%m') = DATE_FORMAT(#{time}, '%Y-%m' )
+ u2.name is not null
+ <if test="firstDayOfMonth != null and lastDayOfMonth != null">
+ AND s.work_time BETWEEN #{firstDayOfMonth} AND #{lastDayOfMonth}
</if>
<if test="userName != null and userName != ''">
and u2.name like concat('%', #{userName}, '%')
</if>
</where>
- GROUP BY u2.id
order by s.create_time
</select>
@@ -60,11 +68,14 @@
order by s.create_time
</select>
- <select id="performanceShiftYear" resultType="java.util.Map">
- SELECT
- 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
+ <select id="performanceShiftYear" resultMap="performanceShiftMap">
+ SELECT distinct
+ u2.name AS user_name,
+ s.user_id,
+ u2.account,
+ DATE_FORMAT(s.work_time, '%c') month_num,
+ s.shift,
+ s.id
FROM performance_shift s
LEFT JOIN (SELECT u.* from
user u
@@ -82,14 +93,14 @@
and DATE_FORMAT(s.work_time, '%Y') = DATE_FORMAT(#{time}, '%Y' )
</if>
<if test="userName != null and userName != ''">
- and u.name like concat('%', #{userName}, '%')
+ and u2.name like concat('%', #{userName}, '%')
</if>
- GROUP BY u2.id
order by s.create_time
</select>
<select id="performanceShiftYearList" resultType="map">
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,9 +120,10 @@
order by s.create_time
</select>
- <select id="performanceShiftList" resultMap="performanceShiftPageMap">
+ <select id="performanceShiftList" resultMap="performanceShiftMap">
SELECT
- 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>
--
Gitblit v1.9.3