From 820fd992355af0a695effdc04ab827297bcd5053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 1 Apr 2022 03:10:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java | 2 +- xm-core/src/main/java/com/xm/core/service/XmTaskService.java | 4 ++-- .../resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index ec038a5e..2bd8bda4 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -326,7 +326,7 @@ public class XmTaskController { if(fieldKey.contains("budgetWorkload")){//如果调整了预估工时，需要重新计算进度数据 if(xmTasksDb.size()>0){ - this.xmTaskService.batchUpdateBudgetWorkloadAndRate(xmTasksDb.stream().map(i->i.getId()).collect(Collectors.toSet()).stream().collect(Collectors.toList())); + this.xmTaskService.batchUpdateBudgetWorkloadAndRate(xmTasksDb.stream().map(i->i.getId()).collect(Collectors.toSet()).stream().collect(Collectors.toList()),NumberUtil.getBigDecimal(xmTaskMap.get("budgetWorkload"))); this.xmTaskService.batchSumParents(xmTasksDb); } }else{ diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java index ef8c8b9e..46095471 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java @@ -741,8 +741,8 @@ public class XmTaskService extends BaseService { super.update("calcWorkloadByRecord",ids); } - public void batchUpdateBudgetWorkloadAndRate(List ids) { - super.update("batchUpdateBudgetWorkloadAndRate",ids); + public void batchUpdateBudgetWorkloadAndRate(List ids,BigDecimal budgetWorkload) { + super.update("batchUpdateBudgetWorkloadAndRate",map("ids",ids,"budgetWorkload",budgetWorkload)); } } diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml index 875a84a8..fb529387 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml @@ -399,7 +399,7 @@ - + update xm_task res set res.init_budget_workload=ifnull(res.init_budget_workload,res.budget_workload), @@ -409,7 +409,7 @@ when res.act_workload>0 then 100 else res.rate end where id in - + #{item}