Merge branch 'refs/heads/fix_bug_26694_20240705' into test

performance-web/src/main/java/com/clx/performance/controller/pc/CarrierOrderChildController.java

@@ -19,6 +19,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -79,8 +80,8 @@ public class CarrierOrderChildController {
 
     @ApiOperation(value = "业务信息", notes = "<br>By:胡宇帆")
     @GetMapping("/orderChildBussInfo")
-    public Result<OrderChildBussInfoVO> getOrderChildBussInfo(@NotBlank(message = "车牌号不能为空") String truckNo) {
-        return Result.ok(orderChildService.getOrderChildBussInfo(truckNo));
+    public Result<OrderChildBussInfoVO> getOrderChildBussInfo(@NotNull(message = "车辆id不能为空") Integer truckId) {
+        return Result.ok(orderChildService.getOrderChildBussInfo(truckId));
     }
 
 

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

@@ -66,7 +66,7 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
 
     Integer getOrderChildTotalByUserNo(Long userNo);
 
-    List<OrderChild> getOrderChildBussInfo(String truckNo);
+    List<OrderChild> getOrderChildBussInfo(int truckId);
 
     List<OrderChild> selectListByOrderGoodsNo(String orderGoodsNo);
 

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

@@ -371,9 +371,9 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
 
 
     @Override
-    public List<OrderChild> getOrderChildBussInfo(String truckNo) {
+    public List<OrderChild> getOrderChildBussInfo(int truckId) {
         LambdaQueryWrapper<OrderChild> query = new LambdaQueryWrapper();
-        query.eq(OrderChild::getTruckNo, truckNo)
+        query.eq(OrderChild::getTruckId, truckId)
                 .in(OrderChild::getStatus, OrderChildEnum.Status.UNSETTLE.getCode(),OrderChildEnum.Status.COMPLETE.getCode());
         return baseMapper.selectList(query);
     }

performance-web/src/main/java/com/clx/performance/service/OrderChildService.java

@@ -70,7 +70,7 @@ public interface OrderChildService {
 
     Integer getOrderChildTotalByUserNo(Long userNo);
 
-    OrderChildBussInfoVO getOrderChildBussInfo(String truckNo);
+    OrderChildBussInfoVO getOrderChildBussInfo(int truckId);
 
     IPage<OutputMonitorOrderChildVO> getMonitorOrerChildListsByParam(PageMonitorOrderChildQCParam param);
 

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -2340,8 +2340,8 @@ public class OrderChildServiceImpl implements OrderChildService {
     }
 
     @Override
-    public OrderChildBussInfoVO getOrderChildBussInfo(String truckNo) {
-        List<OrderChild> childList = orderChildDao.getOrderChildBussInfo(truckNo);
+    public OrderChildBussInfoVO getOrderChildBussInfo(int truckId) {
+        List<OrderChild> childList = orderChildDao.getOrderChildBussInfo(truckId);
         if (CollectionUtils.isEmpty(childList)) {
             OrderChildBussInfoVO vo = OrderChildBussInfoVO.builder().completeNum(0).historyLoadWeight(
                     new BigDecimal("0")).completeCarryWeight(new BigDecimal("0")).loseWeight(