修改履约进度表完成率修改

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

@@ -133,6 +133,12 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
                     if(Objects.nonNull(item.getPendingWeight()) && Objects.nonNull(item.getOrderedWeight())){
                         item.setOrderedRate(calcOrderedRate(item.getOrderedWeight(),item.getPendingWeight()));
                     }
+                    if(Objects.nonNull(item.getTaskWeight()) && Objects.nonNull(item.getSumUnloadWeight())){
+                        //任务完成率 =  到站量 / 任务量
+                        BigDecimal taskCompleteRatio =  item.getSumUnloadWeight()
+                                .divide(item.getTaskWeight(),3, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
+                        item.setTaskCompleteRatio(taskCompleteRatio);
+                    }
                 }
         );
 
@@ -439,7 +445,6 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
         int loadTruckNum = 0;  //装车车数
         int unloadTruckNum = 0;   //卸车车数
         int onTheWayTruckNum ;    // 在途车数
-        BigDecimal orderedRate;       //接单率
         BigDecimal taskCompleteRatio ;    //任务完成率
         BigDecimal sumLoadWeight = BigDecimal.ZERO;    //矿发吨数
         BigDecimal sumUnloadWeight = BigDecimal.ZERO;    //到站吨数
@@ -475,9 +480,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
         onTheWayTruckNum = loadTruckNum - unloadTruckNum;
 
 
-        //任务完成率 =  到站量 / 任务量
-        taskCompleteRatio =  sumUnloadWeight.divide(orderInfo.getTransportWeight(),3, RoundingMode.HALF_UP)
-                .multiply(new BigDecimal(100));
+
 
 
         PerformanceProgress update = new PerformanceProgress();
@@ -488,7 +491,6 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
         update.setUnloadTruckNum(unloadTruckNum);
         update.setOnTheWayTruckNum(onTheWayTruckNum);
         update.setOrderedWeight(orderedWeight);
-        update.setTaskCompleteRatio(taskCompleteRatio);
         update.setSumLoadWeight(sumLoadWeight);
         update.setSumUnloadWeight(sumUnloadWeight);
         update.setSumOnTheWayWeight(sumOnTheWayWeight);