From bad724e64829c44081a91c5eb2ca672eda304661 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 15 五月 2026 14:12:59 +0800
Subject: [PATCH] 库存导出查询错误

---
 src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml b/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml
index e4200af..65741f5 100644
--- a/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml
+++ b/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml
@@ -15,7 +15,9 @@
         next_date,
         record_date,
         CASE
-        WHEN most_date &gt;=  DATE_FORMAT(now(),'%Y-%m-%d') THEN 1
+        WHEN most_date IS NOT NULL
+        AND valid IS NOT NULL
+        AND DATE_ADD(most_date, INTERVAL valid DAY) &gt;= CURDATE() THEN 1
         ELSE 2
         END AS status,
         create_user,
@@ -40,10 +42,16 @@
             <if test="req.status != null">
                 <choose>
                     <when test="req.status == 1">
-                        AND most_date &gt;=  DATE_FORMAT(now(),'%Y-%m-%d')
+                        AND most_date IS NOT NULL
+                        AND valid IS NOT NULL
+                        AND DATE_ADD(most_date, INTERVAL valid DAY) &gt;= CURDATE()
                     </when>
                     <when test="req.status == 2">
-                        AND most_date &lt;  DATE_FORMAT(now(),'%Y-%m-%d')
+                        AND (
+                        most_date IS NULL
+                        OR valid IS NULL
+                        OR DATE_ADD(most_date, INTERVAL valid DAY) &lt; CURDATE()
+                        )
                     </when>
                 </choose>
             </if>

--
Gitblit v1.9.3