Merge branch 'v16.3_line_warn_20240528' into dev

performance-api/src/main/java/com/clx/performance/enums/ResultEnum.java

@@ -39,6 +39,7 @@ public enum ResultEnum implements com.msl.common.enums.ResultEnum {
     LINE_WARN_CONFIG_EXIST(1302, "配置名称已存在"),
 
 
+
     ;
     private final int code;
     private final String msg;

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -178,6 +178,7 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
 
     MonthInComeAndOrderedVO statisticsTruckMonth(LocalDateTime startTime, LocalDateTime endTime, String truckNo);
 
+
     List<OrderChild> listByChildNoList(List<String> childNoList);
 
     List<OrderChild> listByOrderGoodsNoAndStatus(String orderGoodsNo, List<Integer> statusList);

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -567,6 +567,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     public List<OrderChild> listByChildNoList(List<String> childNoList) {
         return list(lQrWrapper().in(OrderChild :: getChildNo,childNoList));
     }
+
     @Override
     public List<OrderChild> listByOrderGoodsNoAndStatus(String orderGoodsNo, List<Integer> statusList) {
         return list(lQrWrapper()

performance-web/src/main/java/com/clx/performance/dto/linewarn/LineWarnOrderChildStatisticsDTO.java

@@ -13,6 +13,13 @@ public class LineWarnOrderChildStatisticsDTO {
 
     private String orderGoodsNo;                            //货单编号
 
-    private Integer num;                                        //车数
+    private Integer num;//车数
+
+    public Integer getNum(){
+        if(num == null){
+            return 0;
+        }
+        return num;
+    }
 
 }

performance-web/src/main/java/com/clx/performance/model/vehiclewarn/VehicleWarnUser.java

@@ -22,7 +22,7 @@ import java.time.LocalDateTime;
 @Setter
 @NoArgsConstructor
 @TableName(autoResultMap = true)
-public class VehicleWarnUser implements HasKey<Integer> {
+public class VehicleWarnUser  implements HasKey<Integer> {
 
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;                             //id

performance-web/src/main/java/com/clx/performance/service/trace/TruckTraceService.java

@@ -21,6 +21,7 @@ public interface TruckTraceService {
     BigDecimal[] getCurrentPosition(String truckNo, Long userNo);
     BigDecimal[] getCurrentPosition(String truckNo, Long userNo, String beginTime);
 
+
     int getParkTime(String truckNo, Long userNo, LocalDateTime beginDateTime);
     int getParkTime(String truckNo, Long userNo, LocalDateTime beginTime, LocalDateTime endTime);