From 00ae048ace3f7877a89bfe024344d686d7503511 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 23 五月 2024 01:22:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
index 697da8a..31d6551 100644
--- a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
+++ b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
@@ -26,6 +26,7 @@
</if>
</where>
GROUP BY u.id
+ order by s.create_time
</select>
<select id="performanceShiftYearPage" resultType="map">
@@ -43,6 +44,7 @@
</if>
<if test="laboratory != null and laboratory != ''">
</if>
+ order by s.create_time
</select>
<select id="performanceShiftYear" resultType="java.util.Map">
@@ -63,7 +65,7 @@
<if test="laboratory != null and laboratory != ''">
</if>
GROUP BY u.id
- order by s.work_time
+ order by s.create_time
</select>
<select id="performanceShiftYearList" resultType="map">
@@ -84,7 +86,7 @@
<if test="laboratory != null and laboratory != ''">
</if>
GROUP BY u.id
- order by s.work_time
+ order by s.create_time
</select>
<select id="performanceShiftList" resultMap="performanceShiftPageMap">
@@ -104,5 +106,6 @@
</if>
</where>
GROUP BY u.id
+ order by s.create_time
</select>
</mapper>
--
Gitblit v1.9.3