From 3b3972409a7385e0337d2c78ff60c9fb4fb72e3f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 07 十一月 2025 13:39:16 +0800
Subject: [PATCH] yys  劳动合同word模板导出

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

diff --git a/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml b/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
index dcde507..81cf11d 100644
--- a/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
+++ b/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
@@ -53,7 +53,7 @@
                 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}
@@ -61,6 +61,18 @@
             <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>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3