From 7075f098410f77fd2f3bcf0a109fe1016f09b936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sun, 13 Mar 2022 21:58:36 +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 --- .../java/com/xm/core/ctrl/XmTaskController.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 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 ba4f0c3f..9a755693 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 @@ -580,25 +580,15 @@ public class XmTaskController { List excludeIds=new ArrayList<>(); excludeIds.add(xmTaskDb.getId()); if( xmTaskDb.getBudgetCost().compareTo(xmTaskVo.getBudgetCost())!=0){ - if(xmTaskVo.getLvl()<=1){ + if("0".equals(xmTaskDb.getPtype()) && xmTaskVo.getLvl()<=1){ tips=xmTaskService.judgetProjectBudget(xmTaskDb.getProjectId(), xmTaskVo.getBudgetCost(),excludeIds); - }else{ + }else if(StringUtils.hasText(xmTaskDb.getParentTaskid())){ tips=xmTaskService.judgetTaskBudget(xmTaskDb.getParentTaskid(), xmTaskVo.getBudgetCost(),null,null,null,excludeIds); } } if(tips.isOk()) { xmTaskService.updateTask(xmTaskVo,xmTaskDb); - if(!StringUtils.isEmpty(xmTaskVo.getExecutorUserid())) { - List groups=groupService.getUserGroupsByProjectId(xmTaskVo.getProjectId(), xmTaskVo.getExecutorUserid()); - if(groups!=null && groups.size()>0) { - for (XmGroupVo g : groups) { - xmPushMsgService.pushGroupMsg(user.getBranchId(), g.getId(), user.getUserid(), user.getUsername(), user.getUsername()+"修改了任务【"+xmTaskVo.getName()+"】信息"); - } - } - } - //改为服务处记录 - //xmRecordService.addXmTaskRecord(xmTaskVo.getPhaseId(), xmTaskVo.getId(), "项目-任务-修改任务", "修改任务"+xmTaskVo.getName(),JSON.toJSONString(xmTaskVo),null); } m.put("data",xmTaskVo); }catch (BizException e) { @@ -1212,7 +1202,7 @@ public class XmTaskController { totalTaskBudgetCost=totalTaskBudgetCost.add(task.getBudgetCost()); } - if(totalTaskBudgetCost.compareTo(BigDecimal.ZERO)>0){ + if("0".equals(xmTask.getPtype()) && totalTaskBudgetCost.compareTo(BigDecimal.ZERO)>0){ tips=xmTaskService.judgetProjectBudget(projectId,totalTaskBudgetCost,tasksLvl1.stream().map(i->i.getId()).collect(Collectors.toList())); if(!tips.isOk()){ tips.setFailureMsg(tips.getMsg()+" 相关任务【"+tasksLvl1.stream().map(i->i.getName()).collect(Collectors.joining(","))+"】");