Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
commit
e3727eaec9
  1. 7
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
  2. 4
      xm-core/src/main/java/com/xm/core/service/XmTaskService.java

7
xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

@ -1126,6 +1126,12 @@ public class XmTaskController {
m.put("tips", tips);
return m;
}
if(task.getBudgetCost()==null){
task.setBudgetCost(BigDecimal.ZERO);
}
if(task.getBudgetWorkload()==null){
task.setBudgetWorkload(BigDecimal.ZERO);
}
frontParamsTaskMap.put(task.getId(),task);
if(xmTaskDbMap.containsKey(task.getId())){
updateTasks.add(task);
@ -1163,6 +1169,7 @@ public class XmTaskController {
if(tasksLvl1.size()>0){
BigDecimal totalTaskBudgetCost=BigDecimal.ZERO;
for (XmTask task : tasksLvl1) {
totalTaskBudgetCost=totalTaskBudgetCost.add(task.getBudgetCost());
}
if(totalTaskBudgetCost.compareTo(BigDecimal.ZERO)>0){

4
xm-core/src/main/java/com/xm/core/service/XmTaskService.java

@ -147,8 +147,8 @@ public class XmTaskService extends BaseService {
return tips;
}
BigDecimal budgetCost=NumberUtil.getBigDecimal(g.get("budgetCost"));
BigDecimal childBudgetCost=NumberUtil.getBigDecimal(g.get("childBudgetCost"));
BigDecimal budgetCost=NumberUtil.getBigDecimal(g.get("budgetCost"),BigDecimal.ZERO);
BigDecimal childBudgetCost=NumberUtil.getBigDecimal(g.get("childBudgetCost"),BigDecimal.ZERO);
if(budgetCost.compareTo(childBudgetCost)<0) {
tips.setFailureMsg("任务合计总预算超出上级总预算"+childBudgetCost.subtract(budgetCost)+"元");
return tips;

Loading…
Cancel
Save