From 1fa7bb0da734defad1490bd94ff9bc4528fb9ac7 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 15 五月 2026 10:16:08 +0800
Subject: [PATCH] fix(measuringinstrumentledger): 修正计量器具台账状态判断逻辑

---
 src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml b/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml
index fc680d0..65741f5 100644
--- a/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml
+++ b/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml
@@ -15,14 +15,20 @@
         next_date,
         record_date,
         CASE
-        WHEN next_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,
         create_time,
         update_user,
         update_time,
-        tenant_id
+        tenant_id,
+        unit,
+        dept_id,
+        instation_location,
+        cycle
         FROM
         measuring_instrument_ledger
         <where>
@@ -36,10 +42,16 @@
             <if test="req.status != null">
                 <choose>
                     <when test="req.status == 1">
-                        AND next_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 next_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>
@@ -52,4 +64,4 @@
         </where>
         ORDER BY update_time DESC
     </select>
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3