Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
commit
820fd99235
  1. 2
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
  2. 4
      xm-core/src/main/java/com/xm/core/service/XmTaskService.java
  3. 4
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml

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

@ -326,7 +326,7 @@ public class XmTaskController {
if(fieldKey.contains("budgetWorkload")){//如果调整了预估工时需要重新计算进度数据 if(fieldKey.contains("budgetWorkload")){//如果调整了预估工时需要重新计算进度数据
if(xmTasksDb.size()>0){ 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); this.xmTaskService.batchSumParents(xmTasksDb);
} }
}else{ }else{

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

@ -741,8 +741,8 @@ public class XmTaskService extends BaseService {
super.update("calcWorkloadByRecord",ids); super.update("calcWorkloadByRecord",ids);
} }
public void batchUpdateBudgetWorkloadAndRate(List<String> ids) {
super.update("batchUpdateBudgetWorkloadAndRate",ids);
public void batchUpdateBudgetWorkloadAndRate(List<String> ids,BigDecimal budgetWorkload) {
super.update("batchUpdateBudgetWorkloadAndRate",map("ids",ids,"budgetWorkload",budgetWorkload));
} }
} }

4
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml

@ -399,7 +399,7 @@
</update> </update>
<!-- 批量更新 --> <!-- 批量更新 -->
<update id="batchUpdateBudgetWorkloadAndRate" parameterType="List">
<update id="batchUpdateBudgetWorkloadAndRate" parameterType="HashMap">
update xm_task res update xm_task res
set set
res.init_budget_workload=ifnull(res.init_budget_workload,res.budget_workload), res.init_budget_workload=ifnull(res.init_budget_workload,res.budget_workload),
@ -409,7 +409,7 @@
when res.act_workload>0 then 100 when res.act_workload>0 then 100
else res.rate end else res.rate end
where id in where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
#{item} #{item}
</foreach> </foreach>
</update> </update>

Loading…
Cancel
Save