From 23eb9c9a21afc8ed065706f0e6494ee998a217b5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:27 +0800
Subject: [PATCH] fix:1.班次页面：月度统计时间调整为上月26到本月25；班次支持右键添加批注 2.外购下单：KJNS域订单免检自动更新批次属性；外购下单-全部页新增【更新IFS批次属性】按钮，支持更新已提交订单的批次属性 3.资源要求-设备：设备核查计划：核查负责人回显问题修复；设备使用授权：检验项目导出数据错误问题修复
---
performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
index 64b3dfc..cbdee95 100644
--- a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
+++ b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
@@ -11,7 +11,9 @@
<select id="performanceShiftPage" resultMap="performanceShiftPageMap">
SELECT
- GROUP_CONCAT(s.work_time, '锛�', s.shift, '锛�', s.id order by s.work_time SEPARATOR ';') AS shift_time, u2.id user_id
+ u2.name name,
+ GROUP_CONCAT(s.work_time, '锛�', s.shift, '锛�',IFNULL(s.annotation_text,''), '锛�',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
@@ -24,8 +26,8 @@
) 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' )
+ <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}, '%')
@@ -62,6 +64,7 @@
<select id="performanceShiftYear" resultType="java.util.Map">
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
@@ -90,6 +93,7 @@
<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
@@ -111,7 +115,8 @@
<select id="performanceShiftList" resultMap="performanceShiftPageMap">
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