From 291dc16c7ce48bf472e3aa80c0be1dc90914dcbb Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Fri, 25 Apr 2025 10:23:24 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=E8=B6=85=E6=9C=9F=E9=A2=9D=E5=BA=A6?=
 =?UTF-8?q?=E3=80=81=E8=B4=A6=E6=9C=9F=E5=86=85=E9=A2=9D=E5=BA=A6=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xdadan/erp/web/emis/EmisWaybillController.java   | 9 ---------
 .../java/com/xdadan/erp/emis/domain/EmisWaybill.java     | 3 ---
 .../com/xdadan/erp/emis/service/EmisBaseService.java     | 4 ++--
 emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml | 9 +++++++++
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
index 47be17417..7e4f31b12 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
@@ -536,15 +536,6 @@ public class EmisWaybillController extends EmisBaseController
             // 设置通用权限查询参数
             list = emisWaybillService.selectEmisWaybillList(emisWaybill);
         }
-
-        if("1".equals(emisWaybill.getQueryQuotaType())){
-            // 查询超期的运单列表
-            list = emisBaseService.filterOverTermEmisWaybillList(list);
-        }
-        if("2".equals(emisWaybill.getQueryQuotaType())){
-            // 查询未超期的账单列表
-            list = emisBaseService.filterInTermEmisWaybillList(list);
-        }
         return getDataTable(list);
     }
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
index 1f26d2625..9197fad63 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
@@ -675,9 +675,6 @@ public class EmisWaybill extends BaseEntity
     private String customerNickName;
     @TableField(exist = false)
     private String customerAvatar;
-    // 查询现金客户额度属性; 1：查询超期额度，2：查询账期内额度
-    @TableField(exist = false)
-    private String queryQuotaType;
 
     // transType - 运输类型
     @TableField(exist = false)
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 445c5684e..e9f991c3e 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -1649,8 +1649,8 @@ public class EmisBaseService {
              return Collections.emptyList();
          }
          List<EmisWaybill> overTermList = list.stream()
-                 .filter(item -> item.getOrderDate() != null)
-                 .filter(item -> (System.currentTimeMillis() - item.getOrderDate().getTime()) > (10 * 1000 * 60 * 60 * 24))
+                 .filter(item -> item.getSendDate() != null)
+                 .filter(item -> (System.currentTimeMillis() - item.getSendDate().getTime()) > (10 * 1000 * 60 * 60 * 24))
                  .collect(Collectors.toList());
          log.info("success.filterOverTermEmisWaybillList , overTermList,{}", overTermList);
          return overTermList;
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 9f0cba0ea..9e3198a41 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -1362,6 +1362,15 @@
                 -->
             </if>
 
+            <!-- 查询现金客户额度属性; 1：查询超期额度，2：查询账期内额度 -->
+            <if test="params.queryQuotaType != null and params.queryQuotaType == 1">
+                and a.send_date is not null
+                and (UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(a.send_date)) > (10 * 24 * 60 * 60)
+            </if>
+            <if test="params.queryQuotaType != null and params.queryQuotaType == 2">
+                and a.send_date is not null
+                and (UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(a.send_date)) <![CDATA[ <= ]]> (10 * 24 * 60 * 60)
+            </if>
 
             <if test="(params.isNeedBatch == null  or (params.isNeedBatch != null and params.isNeedBatch != 1) ) " >
                 <if test="(salesmen == null or salesmen=='') and params.privSiteCode != null and params.privSiteCode != '88888'">