From 1b529c09d7e196e2499bf0e1462a1882e548f5ce Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 30 Apr 2024 12:18:11 +0800
Subject: [PATCH] md

---
 .../java/com/xdadan/erp/emis/service/EmisBaseService.java   | 6 +++++-
 .../erp/emis/service/impl/EmisWaybillServiceImpl.java       | 5 ++++-
 .../src/main/resources/mapper/EmisNotCalcAgingMapper.xml    | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

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 5cecd78ca..f7bb450ac 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
@@ -186,7 +186,11 @@ public class EmisBaseService {
          int weekDays = computeWeekDays(startDate,endDate,true);
 
          // 计算不计较时效的时间
-         int notCaclDays=emisNotCalcAgingMapper.getNotCalcAgingDays(receiveCountry,sendCountry,startDate,endDate);
+         int notCaclDays=emisNotCalcAgingMapper.getNotCalcAgingDays(
+                 receiveCountry,
+                 sendCountry,
+                 startDate,
+                 endDate);
 
          int totalDays=emisTransProduct.getMaxAging()+weekDays+notCaclDays;
          log.info("计算预估到达时间:[maxAging="+emisTransProduct.getMaxAging()+",weekDays="+weekDays+",notCaclDays="+notCaclDays);
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 2c75c9f3d..64046a60c 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -265,7 +265,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             if(emisWaybillSave.getSendDate()==null){
                 emisWaybillSave.setSendDate(new Date());
             }
-            Date estDate = getEstimateDate(emisWaybillSave.getSendDate(),emisWaybillSave.getProductType(),emisWaybillSave.getSendCountry(),emisWaybillSave.getReceiveCountry());
+            Date estDate = getEstimateDate(
+                    emisWaybillSave.getSendDate(),emisWaybillSave.getProductType(),
+                    emisWaybillSave.getSendCountry(),
+                    emisWaybillSave.getReceiveCountry());
 
             // 预计到达时间
             log.info("预估到达时间==>"+ DateUtils.dateTime(estDate));
diff --git a/emis-biz/src/main/resources/mapper/EmisNotCalcAgingMapper.xml b/emis-biz/src/main/resources/mapper/EmisNotCalcAgingMapper.xml
index c7f076877..7031f0fdd 100644
--- a/emis-biz/src/main/resources/mapper/EmisNotCalcAgingMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisNotCalcAgingMapper.xml
@@ -31,7 +31,7 @@
         select GROUP_CONCAT(name) from emis_country where FIND_IN_SET(`code`,#{code})
     </select>
 
-    <select id="getNotCalcAgingDays" parameterType="String" resultType="int">
+    <select id="getNotCalcAgingDays" resultType="integer">
         select count(1) from emis_not_calc_aging where ( FIND_IN_SET('-1',country) or FIND_IN_SET(#{recieveCountry},country) or FIND_IN_SET(#{sendCountry},country) ) and no_calc_day <![CDATA[ >= ]]> #{startDate} and no_calc_day <![CDATA[ <= ]]> #{endDate}
     </select>