Merge branch 'master' of http://47.110.251.215:3000/java_org/bladex

blade-service/blade-control/src/main/java/org/springblade/control/controller/ProjectCostBudgetController.java

@@ -189,4 +189,14 @@ public class ProjectCostBudgetController {
         return R.data(budgetService.getUnitType());
     }
 
+    /**
+     * 成本测算-统计一行金额
+     */
+    @PostMapping("/saveCountMoney")
+    @ApiOperationSupport(order = 14)
+    @ApiOperation(value = "成本测算-统计一行金额",notes = "传入需要统计的那一行对象")
+    public R<ProjectCostBudget> saveCountMoney(@RequestBody ProjectCostBudget budget){
+        return R.data(budgetService.saveCountMoney(budget));
+    }
+
 }

blade-service/blade-control/src/main/java/org/springblade/control/service/IProjectCostBudgetService.java

@@ -75,4 +75,6 @@ public interface IProjectCostBudgetService extends BaseService<ProjectCostBudget
     List<DictInfo> getCostType();
 
     List<DictInfo> getUnitType();
+
+    ProjectCostBudget saveCountMoney(ProjectCostBudget budget);
 }

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/AnnualBudgetServiceImpl.java

@@ -106,7 +106,7 @@ public class AnnualBudgetServiceImpl extends BaseServiceImpl<AnnualBudgetMapper,
         //总经营预算
         dto.setTotalBudget(disburseTotal);
         //年度合同指标
-        dto.setAnnualContractTarget(contractTotal);
+        dto.setAnnualContractTarget(planReturnedTotal);
         //年度利润指标
         dto.setAnnualProfitTarget(planReturnedTotal.subtract(disburseTotal));
         //人工成本

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/ProjectCostBudgetServiceImpl.java

@@ -70,6 +70,9 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
                 if (l.getProjectProcess() == null){
                     throw new ServiceException("请选择项目环节");
                 }
+                if (l.getApprove() != null && (l.getApprove() == 1 || l.getApprove() == 2)){
+                    return;
+                }
               l.setProjectId(dto.getProjectId());
               l.setUnitType(1);
               countMoney(l);
@@ -88,6 +91,9 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
                 if (l.getProjectProcess() == null){
                     throw new ServiceException("请选择项目环节");
                 }
+                if (l.getApprove() != null && (l.getApprove() == 1 || l.getApprove() == 2)){
+                    return;
+                }
                 l.setProjectId(dto.getProjectId());
                 l.setUnitType(2);
                 countMoney(l);
@@ -106,6 +112,9 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
                 if (l.getProjectProcess() == null){
                     throw new ServiceException("请选择项目环节");
                 }
+                if (l.getApprove() != null && (l.getApprove() == 1 || l.getApprove() == 2)){
+                    return;
+                }
                 l.setProjectId(dto.getProjectId());
                 l.setUnitType(3);
                 countMoney(l);
@@ -763,6 +772,12 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
         return unitType;
     }
 
+    @Override
+    public ProjectCostBudget saveCountMoney(ProjectCostBudget budget) {
+        countMoney(budget);
+        return budget;
+    }
+
     /**
      * 统计一行的几个总金额
      */
@@ -770,7 +785,7 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
         BigDecimal postMoney;
         if (budget.getPostType() != null && budget.getPostType() > 0){
             Double money = baseMapper.getPostMoney(budget.getPostType());
-            postMoney = new BigDecimal(money);
+            postMoney = new BigDecimal(money+"");
         }else {
             postMoney = new BigDecimal("0");
         }