销售合同添加合同名称明细生产进度

hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/vo/SalesContractDetailsVo.java

@@ -41,4 +41,9 @@ public class SalesContractDetailsVo extends SalesContractDetails {
      */
     private BigDecimal completedQuantity;
 
+    /**
+     * 完工率
+     */
+    private BigDecimal completionRate;
+
 }

hx-jxst/src/main/java/com/fjhx/jxst/service/sales/impl/SalesContractServiceImpl.java

@@ -110,6 +110,16 @@ public class SalesContractServiceImpl extends ServiceImpl<SalesContractMapper, S
                 IWrapper.<SalesContractDetails>getWrapper()
                 .in("scd", SalesContractDetails::getSalesContractId, salesContractIds)
         );
+        //计算完工率
+        salesContractDetailsVos.forEach(item->{
+            BigDecimal multiply = BigDecimal.valueOf(100);
+            if(item.getProductionQuantity().compareTo(BigDecimal.ZERO)!=0) {
+                 multiply = item.getCompletedQuantity()
+                        .divide(item.getProductionQuantity(), 2, RoundingMode.HALF_UP)
+                        .multiply(BigDecimal.valueOf(100));
+            }
+            item.setCompletionRate(multiply);
+        });
         //赋值销售合同明细产品信息
         productInfoService.attributeAssign(salesContractDetailsVos, SalesContractDetailsVo::getProductId, (item, productInfo) -> {
             item.setProductName(productInfo.getName());