From 46ee80df91b5994560d2b3df4223e7714ebdec5d Mon Sep 17 00:00:00 2001
From: chenlong <vip_chenlong@163.com>
Date: Wed, 22 Jan 2025 09:39:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E6=8B=BC=E5=B9=B2?=
 =?UTF-8?q?=E7=BA=BF=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/report/mapper/largeScreen/TrunkDataMapper.java   | 2 +-
 .../com/logpm/report/mapper/largeScreen/TrunkDataMapper.xml    | 3 ++-
 .../report/service/largeScreen/impl/TrunkDataServiceImpl.java  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/TrunkDataMapper.java b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/TrunkDataMapper.java
index de5b1220f..f833deb91 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/TrunkDataMapper.java
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/TrunkDataMapper.java
@@ -5,6 +5,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TrunkDataMapper {
 	public Integer getTotal(String startTime, String endTime);
-	public Integer getOnTheWay();
+	public Integer getOnTheWay(String startTime, String endTime);
 	public Integer getArrival(String startTime, String endTime);
 }
diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/TrunkDataMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/TrunkDataMapper.xml
index f10b15961..9f48edf05 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/TrunkDataMapper.xml
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/TrunkDataMapper.xml
@@ -12,7 +12,8 @@
         select
             count(*)
         from logpm_platform.logpm_trunkline_cars_load
-        where load_status in ('10', '20', '30')
+        where   create_time between #{startTime} and #{endTime}
+          and load_status in ('10', '20', '30')
     </select>
     <select id="getArrival" resultType="java.lang.Integer">
         select
diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/TrunkDataServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/TrunkDataServiceImpl.java
index c88b4295b..2dab6966d 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/TrunkDataServiceImpl.java
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/TrunkDataServiceImpl.java
@@ -27,7 +27,7 @@ public class TrunkDataServiceImpl implements ITrunkDataService {
 
 		TrunkDataVO trunkDataVO = new TrunkDataVO();
 		trunkDataVO.setTotal(trunkDataMapper.getTotal(startTime, endTime));
-		trunkDataVO.setOnTheWay(trunkDataMapper.getOnTheWay());
+		trunkDataVO.setOnTheWay(trunkDataMapper.getOnTheWay(startTime, endTime));
 		trunkDataVO.setArrival(trunkDataMapper.getArrival(startTime, endTime));
 
 		return trunkDataVO;