From 5b81b500f1c1f397bb207fb625ece50ca623b210 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 28 Jul 2025 16:17:22 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?=
 =?UTF-8?q?=E5=91=98=E5=B7=A5=E6=8F=90=E6=88=90=E6=96=B9=E6=A1=88=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20-=20=E5=90=AF=E7=94=A8=E7=8A=B6=E6=80=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/emis/EmisCommissionQuoteController.java   | 14 ++++++++++++--
 .../mapper/EmisCommissionQuoteMapper.xml          | 15 ++++++++-------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionQuoteController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionQuoteController.java
index fdceb4a1a..90c74f605 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionQuoteController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionQuoteController.java
@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.github.pagehelper.PageHelper;
 import com.xdadan.erp.common.annotation.Log;
 import com.xdadan.erp.common.core.controller.BaseController;
 import com.xdadan.erp.common.core.domain.AjaxResult;
@@ -54,8 +55,17 @@ public class EmisCommissionQuoteController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('emis:emisCommissionQuote:list')")
     @GetMapping("/list")
-    public TableDataInfo list(EmisCommissionQuote emisCommissionQuote)
-    {
+    public TableDataInfo list(EmisCommissionQuote emisCommissionQuote) {
+        if ("2".equals(emisCommissionQuote.getBlOpen())) {
+            // blOpen=2: 启用且已过期，修改为查询启用状态且结束日期早于当前日期
+            emisCommissionQuote.setBlOpen("1");
+            emisCommissionQuote.getParams().put("endDateBeforeNow", true);
+        } else if ("3".equals(emisCommissionQuote.getBlOpen())) {
+            // blOpen=3: 启用且未过期，修改为查询启用状态且结束日期晚于等于当前日期
+            emisCommissionQuote.setBlOpen("1");
+            emisCommissionQuote.getParams().put("endDateAfterNow", true);
+        }
+
         startPage();
         List<EmisCommissionQuote> list = emisCommissionQuoteService.selectEmisCommissionQuoteList(emisCommissionQuote);
         return getDataTable(list);
diff --git a/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml b/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml
index 5df59664f..fe0a97ce8 100644
--- a/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml
@@ -60,17 +60,16 @@
             <if test="calcWeightType != null  and calcWeightType != ''"> and calc_weight_type=#{calcWeightType}</if>
             <if test="postType != null  and postType != ''"> and post_type=#{postType}</if>
             <if test="transType != null  and transType != ''"> and ( FIND_IN_SET(#{transType},trans_type) )</if>
-            <!-- blOpen=2: 启用且已过期，blOpen=3: 启用且未过期，其他按原逻辑 -->
-            <if test="blOpen == '2'">
-                and bl_open = '1'
+            <if test="blOpen != null and blOpen != ''">
+                and bl_open = #{blOpen}
+            </if>
+            <!-- 处理blOpen=2/3的特殊逻辑 -->
+            <if test="params.endDateBeforeNow != null and params.endDateBeforeNow == true">
                 and end_date &lt; NOW()
             </if>
-            <if test="blOpen == '3'">
-                and bl_open = '1'
+            <if test="params.endDateAfterNow != null and params.endDateAfterNow == true">
                 and end_date &gt;= NOW()
             </if>
-            <if test="blOpen != null and blOpen != '' and blOpen != '2' and blOpen != '3'">
-                and bl_open=#{blOpen}</if>
             <if test="empCode != null  and empCode != ''"> and ( FIND_IN_SET(#{empCode},emp_code) or emp_code='-1')</if>
             <if test="empName != null  and empName != ''"> and ( FIND_IN_SET(#{empName},emp_name) or emp_name='全部') </if>
 
@@ -88,6 +87,8 @@
         order by create_time desc
     </select>
 
+
+
     <select id="selectValidQuoteList" parameterType="EmisCommissionQuote" resultMap="EmisCommissionQuoteResult">
         <include refid="selectEmisCommissionQuoteVo"/>
         <where>