补充超吨率

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

@@ -23,13 +23,13 @@ import java.math.BigDecimal;
 public class OrderChildBussInfoVO {
 
     @ApiModelProperty(value = "运单完成数量")
-    private Integer complateNum;
+    private Integer completeNum;
 
     @ApiModelProperty(value = "历史装车总量")
     private BigDecimal historyLoadWeight;
 
     @ApiModelProperty(value = "完成拉运总量")
-    private BigDecimal complateCarryWeight;
+    private BigDecimal completeCarryWeight;
 
 
     @ApiModelProperty(value = "亏吨数量总计")
@@ -38,5 +38,8 @@ public class OrderChildBussInfoVO {
     @ApiModelProperty(value = "亏吨率")
     private BigDecimal loseRate;
 
+    @ApiModelProperty(value = "超吨率")
+    private BigDecimal overRate;
+
 
 }

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

@@ -1146,11 +1146,20 @@ public class OrderChildServiceImpl implements OrderChildService {
         //完成拉运总量
         BigDecimal complateCarryWeight = childList.stream().map(OrderChild::getUnloadNet).reduce(BigDecimal::add).get();
         //亏吨数量总计
-        BigDecimal loseWeight = complateCarryWeight.subtract(historyLoadWeight).compareTo(BigDecimal.ZERO) < 0 ?BigDecimal.ZERO : historyLoadWeight.subtract(complateCarryWeight);
+
+
+        BigDecimal loseWeight = BigDecimal.ZERO;
+        BigDecimal overWeight = BigDecimal.ZERO;
+        if(complateCarryWeight.subtract(historyLoadWeight).compareTo(BigDecimal.ZERO) <= 0){
+            overWeight = complateCarryWeight.subtract(historyLoadWeight); //超吨
+        }else{
+            loseWeight = complateCarryWeight.subtract(historyLoadWeight);//亏吨
+        }
         //亏吨率
         BigDecimal loseRate = loseWeight.divide(historyLoadWeight).setScale(2,RoundingMode.HALF_UP);
-        OrderChildBussInfoVO vo = OrderChildBussInfoVO.builder().complateNum(complateNum).historyLoadWeight(historyLoadWeight).complateCarryWeight(complateCarryWeight)
-                .loseWeight(loseWeight).loseRate(loseRate).build();
+        BigDecimal overRate = overWeight.divide(historyLoadWeight).setScale(2,RoundingMode.HALF_UP);
+        OrderChildBussInfoVO vo = OrderChildBussInfoVO.builder().completeNum(complateNum).historyLoadWeight(historyLoadWeight).completeCarryWeight(complateCarryWeight)
+                .loseWeight(loseWeight).loseRate(loseRate).overRate(overRate).build();
         return vo;
     }
 }