demand: TMS系统 - 基础管理 - 特殊权重 - 新增加查询条件 是否过期 两个状态 已过期 未过期，默认展示查看全部数据；

committer: heyu

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;
+
 }

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>