Merge branch 'pre-production'

blade-service/logpm-report/src/main/java/com/logpm/report/job/LargeScreenQueryXxlJob.java

@@ -38,7 +38,7 @@ public class LargeScreenQueryXxlJob {
 	/**
 	 * 数据查询
 	 */
-//	@XxlJob("largeScreenexExcute")
+	@XxlJob("largeScreenexExcute")
 	public ReturnT<String> largeScreenexExcute(String param) {
 		XxlJobQueryVO xxlJobQueryVO = new XxlJobQueryVO();
 		xxlJobQueryVO.setMapWarehouse(mapWarehouseService.list());

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

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

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;