From 5e55cbc7cf95b0f892ae4066a7699a5f76a0f2f3 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 23 十二月 2025 18:25:31 +0800
Subject: [PATCH] 修改字段，接口

---
 src/main/resources/mapper/lavorissue/LavorIssueMapper.xml |   32 +++++++++++++++++++++++++++-----
 1 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml b/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
index fabf558..3f466d9 100644
--- a/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
+++ b/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
@@ -8,11 +8,13 @@
                t2.staff_name as staffName,
                t2.staff_no as staffNo,
                t3.dict_label as dictName,
-               t4.dict_label as dictTypeName
+               t4.dict_label as dictTypeName,
+               t5.name as deptName
         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
+        left join dept_position t5 on t1.dept_position_id = t5.id
         <where>
             <if test="req.season != null and req.season != ''">
                 and (t1.issue_date &gt;= #{req.startDate} and t1.issue_date &lt;= #{req.endDate})
@@ -43,17 +45,37 @@
             t2.staff_name as staffName,
             t2.staff_no as staffNo,
             t3.dict_label as dictName,
-            t4.dict_label as dictTypeName
+            t4.dict_label as dictTypeName,
+               t5.name as deptName
         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
+                                                   left join dept_position t5 on t1.dept_position_id = t5.id
         <where>
             <if test="req.adoptedDate != null">
                 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