Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into test

performance-api/src/main/java/com/clx/performance/vo/pc/PerformanceProgressVO.java

@@ -99,6 +99,9 @@ public class PerformanceProgressVO{
     @ApiModelProperty("接单车数")
     private Integer orderedTruckNum;
 
+    @ApiModelProperty("接单吨数")
+    private BigDecimal orderedWeight;
+
     
     @ApiModelProperty("到达货源地车数")
     private Integer arriveSendTruckNum;

performance-web/src/main/java/com/clx/performance/model/PerformanceProgress.java

@@ -101,6 +101,11 @@ public class PerformanceProgress implements HasKey<Integer> {
     @ApiModelProperty("接单车数")
     private Integer orderedTruckNum;
 
+
+    @TableField("ordered_weight")
+    @ApiModelProperty("接单吨数")
+    private BigDecimal orderedWeight;
+
     @TableField("arrive_send_truck_num")
     @ApiModelProperty("到达货源地车数")
     private Integer arriveSendTruckNum;
@@ -117,9 +122,6 @@ public class PerformanceProgress implements HasKey<Integer> {
     @ApiModelProperty("在途车数")
     private Integer onTheWayTruckNum;
 
-    @TableField("ordered_rate")
-    @ApiModelProperty("接单率")
-    private BigDecimal orderedRate;
 
     @TableField("task_complete_ratio")
     @ApiModelProperty("任务完成率")

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

@@ -130,6 +130,9 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
                         item.setSeniorLogisticsManagerName(Joiner.on(",")
                                 .join(JSON.parseArray(item.getSeniorLogisticsManagerName())));
                     }
+                    if(Objects.nonNull(item.getPendingWeight()) && Objects.nonNull(item.getOrderedWeight())){
+                        item.setOrderedRate(calcOrderedRate(item.getOrderedWeight(),item.getPendingWeight()));
+                    }
                 }
         );
 
@@ -331,12 +334,6 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
                 item.setSendSystemAddressId(data.getSendSystemAddressId());
                 item.setSendSystemAddressShorter(getSystemAddressShorter(data.getSendSystemAddressId()));
             }
-            //挂单吨数发生变化需要重新计算接单率
-            if(performanceProgressOptional.get().getPendingWeight().compareTo(item.getPendingWeight())!= 0){
-                BigDecimal orderedWeight = calcOrderedWeight(data.getOrderNo());
-                BigDecimal orderedRate = calcOrderedRate(orderedWeight,item.getPendingWeight());
-                item.setOrderedRate(orderedRate);
-            }
             performanceProgressDao.updateEntityByKey(item);
         }else{
             //查询最大的seq
@@ -477,8 +474,6 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
         //在途车辆数 = 装车车数 - 卸车车数
         onTheWayTruckNum = loadTruckNum - unloadTruckNum;
 
-        //接单率 =  接单吨数 / 挂单吨数
-        orderedRate = calcOrderedRate(orderedWeight,optional.get().getPendingWeight());
 
         //任务完成率 =  到站量 / 任务量
         taskCompleteRatio =  sumUnloadWeight.divide(orderInfo.getTransportWeight(),3, RoundingMode.HALF_UP)
@@ -492,7 +487,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
         update.setLoadTruckNum(loadTruckNum);
         update.setUnloadTruckNum(unloadTruckNum);
         update.setOnTheWayTruckNum(onTheWayTruckNum);
-        update.setOrderedRate(orderedRate);
+        update.setOrderedWeight(orderedWeight);
         update.setTaskCompleteRatio(taskCompleteRatio);
         update.setSumLoadWeight(sumLoadWeight);
         update.setSumUnloadWeight(sumUnloadWeight);
@@ -506,20 +501,4 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
         //接单率 =  接单吨数 / 挂单吨数
         return orderedWeight.divide(pendingWeight,3, RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
     }
-
-    public BigDecimal calcOrderedWeight(String orderNo){
-        List<OrderChild> orderChildList = orderChildDao.listBeforeCompleteByOrderNo(orderNo);
-        BigDecimal orderedWeight =  BigDecimal.ZERO;
-        if(CollectionUtils.isEmpty(orderChildList)){
-            return orderedWeight;
-        }
-        for (OrderChild child : orderChildList) {
-            if(child.getStatus() >= OrderChildEnum.Status.LOAD.getCode()){
-                orderedWeight =  orderedWeight.add(child.getLoadNet());
-            }else{
-                orderedWeight =  orderedWeight.add(child.getWeight());
-            }
-        }
-        return orderedWeight;
-    }
 }