From 7aad06fedc12f0183734088fa44c929ac6ff42b3 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 10 十月 2026 11:54:01 +0800
Subject: [PATCH] feat: 增加多个查询的排序功能以优化数据检索

---
 src/main/resources/mapper/lavorissue/LavorIssueMapper.xml |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml b/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
index fabf558..4c861fb 100644
--- a/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
+++ b/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
@@ -10,7 +10,7 @@
                t3.dict_label as dictName,
                t4.dict_label as dictTypeName
         from labor_issue t1
-        left join staff_join_leave_record t2 on t1.staff_id = t2.id
+        left join staff_on_job t2 on t1.staff_id = t2.id
         left join sys_dict_data t3 on t1.dict_id = t3.dict_value
         left join sys_dict_data t4 on t1.dict_type = t4.dict_value
         <where>
@@ -36,6 +36,7 @@
                 and t1.adopted_date is null and t1.issue_date &lt; current_date()
             </if>
         </where>
+        ORDER BY t1.Issue_date DESC, t1.id DESC
     </select>
     <select id="list" resultType="com.ruoyi.lavorissue.pojo.LaborIssue">
         select
@@ -45,7 +46,7 @@
             t3.dict_label as dictName,
             t4.dict_label as dictTypeName
         from labor_issue t1
-                 left join staff_join_leave_record t2 on t1.staff_id = t2.id
+                 left join staff_on_job t2 on t1.staff_id = t2.id
                  left join sys_dict_data t3 on t1.dict_id = t3.dict_value
                  left join sys_dict_data t4 on t1.dict_type = t4.dict_value
         <where>
@@ -53,7 +54,25 @@
                 and t1.adopted_date is null
             </if>
             <if test="req.issueDate != null">
-                and t1.issue_date &lt; #{req.issueDate}
+                and (t1.issue_date &gt;= #{req.startDate} and t1.issue_date &lt;= #{req.endDate})
+            </if>
+            <if test="req.staffId != null">
+                and t1.staff_id = #{req.staffId}
+            </if>
+            <if test="req.season != null and req.season != ''">
+                and (t1.issue_date &gt;= #{req.startDate} and t1.issue_date &lt;= #{req.endDate})
+            </if>
+            <if test="req.status != null and req.status == 1">
+                and t1.adopted_date is not null
+            </if>
+            <if test="req.status != null and req.status == 2">
+                and t1.adopted_date is null
+            </if>
+            <if test="req.status != null and req.status == 3">
+                and t1.adopted_date is not null and t1.issue_date &lt; t1.adopted_date
+            </if>
+            <if test="req.status != null and req.status == 4">
+                and t1.adopted_date is null and t1.issue_date &lt; current_date()
             </if>
         </where>
     </select>

--
Gitblit v1.9.3