From a2db7b6e9d17bed99428583a030b1d9bd2631fd6 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 10 Sep 2025 10:03:49 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20TMS=E7=B3=BB=E7=BB=9F=20-=20=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E7=AE=A1=E7=90=86=20-=20=E7=89=B9=E6=AE=8A=E6=9D=83?=
 =?UTF-8?q?=E9=87=8D=20-=20=E6=96=B0=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=20=E6=98=AF=E5=90=A6=E8=BF=87=E6=9C=9F=20?=
 =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E7=8A=B6=E6=80=81=20=E5=B7=B2=E8=BF=87?=
 =?UTF-8?q?=E6=9C=9F=20=E6=9C=AA=E8=BF=87=E6=9C=9F=EF=BC=8C=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=B1=95=E7=A4=BA=E6=9F=A5=E7=9C=8B=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java | 8 ++++++--
 .../main/resources/mapper/EmisSpecialCalcWeightMapper.xml | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java
index 82f1ce200..ef330b639 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java
@@ -1,10 +1,10 @@
-/** 
+/**
  * @Project: emis
  * @Title: EmisSpecialCalcWeight.java
  * @author linfso
  * @date 2024-01-10 06:50:43
  * @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0  
+ * @version v1.0
  * @Description: <p> 特殊取重 实体类 </p>
  */
 
@@ -69,4 +69,8 @@ public class EmisSpecialCalcWeight extends BaseEntity
 
     private String countryName;
 
+    // ------- 过期状态查询字段
+    /* 过期状态 0-全部 1-已过期 2-未过期 */
+    private Integer expireStatus;
+
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml b/emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml
index e59b6c59e..cbfe67a33 100644
--- a/emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml
@@ -53,6 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
             <if test="createSite != null  and createSite != ''"> and create_site = #{createSite}</if>
             <if test="updateSite != null  and updateSite != ''"> and update_site = #{updateSite}</if>
+            <if test="expireStatus != null and expireStatus == 1"> and end_date <![CDATA[<]]> now()</if>
+            <if test="expireStatus != null and expireStatus == 2"> and end_date <![CDATA[>=]]> now()</if>
         </where>
         order by create_time desc
     </select>