提交

src/main/java/cn/ezhizao/project/business/workOrder/controller/BizWorkOrderController.java

@@ -153,9 +153,9 @@ public class BizWorkOrderController extends BaseController {
                     detail.setContractId(v.getContractId());
                     detail.setTaskTypeId(v.getTaskTypeId());
                     detail = bizArchiveInputDetailService.getDetail(detail);
+                    Integer monthNum = 0;
                     if (v.getStartMonth() != null) {
-                        //月数
-                        Integer monthNum = 0;
+
                         //如果只有一个合同
                         if (detailList.size() == 1) {
 
@@ -202,7 +202,7 @@ public class BizWorkOrderController extends BaseController {
                                     detail.setContractId(d.getContractId());
                                     detail.setTaskTypeId(d.getTaskTypeId());
                                     detail = bizArchiveInputDetailService.getDetail(detail);
-                                    BigDecimal price = detail.getPrice();
+                                    BigDecimal price =money.divide(new BigDecimal(d.getServiceNum()), 2, RoundingMode.HALF_UP);//除法，保留两位小数，四舍五入
                                     monthNum += d.getTotalityMoney().divide(price, MathContext.DECIMAL64).setScale(0, RoundingMode.DOWN).intValue();
                                 }
                             }
@@ -222,17 +222,12 @@ public class BizWorkOrderController extends BaseController {
                             String dateString = sdf.format(closingMonth);
                             v.setClosingMonth("收款截止" + dateString);
                         }
-
                     } else {
                         v.setClosingMonth("-");
                     }
-
                 }
             }
-
         }
-
-
         return getDataTable(list);
     }