From 82996c3b364419d653d1cc26c05fb60cc06c6eda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Wed, 6 Apr 2022 01:26:25 +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 --- .../core/ctrl/XmTaskWorkloadController.java | 7 +--- .../com/xm/core/service/XmMenuService.java | 15 ------- .../mapper/xm/core/dao/XmMenuMapper.xml | 40 ------------------- 3 files changed, 1 insertion(+), 61 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java index 6563ef57..dd03d314 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java @@ -158,8 +158,6 @@ public class XmTaskWorkloadController { ids.add(xmTaskDb.getId()); this.xmTaskService.batchUpdateBudgetWorkloadAndRate(ids,newBudgetWorkload ); } - xmMenuService.calcWorkloadByRecord(xmTaskDb.getMenuId()); - this.xmTaskService.calcWorkloadByRecord(xmTaskDb.getId()); this.xmTaskService.sumParents(xmTaskDb); m.put("data",xmTaskWorkload); @@ -209,7 +207,6 @@ public class XmTaskWorkloadController { } xmTaskWorkloadService.updateSomeFieldByPk(xmTaskWorkload); this.xmTaskService.sumParents(xmTaskDb); - xmMenuService.calcWorkloadByRecord(xmTaskDb.getMenuId()); this.xmTaskService.calcWorkloadByRecord(xmTaskWorkload.getTaskId()); @@ -295,9 +292,7 @@ public class XmTaskWorkloadController { xmTaskWorkloadService.batchDelete(canDel); this.xmTaskService.calcWorkloadByRecord(canDelTaskMap.keySet().stream().collect(Collectors.toList())); this.xmTaskService.batchSumParents(canDelTaskMap.values().stream().collect(Collectors.toList())); - - xmMenuService.calcWorkloadByRecord(canDelTaskMap.values().stream().filter(i->StringUtils.hasText(i.getMenuId())).collect(Collectors.toList()).stream().map(i->i.getMenuId()).collect(Collectors.toSet()).stream().collect(Collectors.toList())); - msgs.add("成功删除"+canDel.size()+"条工时单据。"); + msgs.add("成功删除"+canDel.size()+"条工时单据。"); } if(state1Ndel.size()>0){ msgs.add("以下"+state1Ndel.size()+"条工时单据状态为确认状态，不允许删除。【"+state1Ndel.stream().map(i->i.getUsername()+i.getBizDate()).collect(Collectors.joining(","))+"】"); diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuService.java index 7e8c80b3..cf8f979f 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmMenuService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuService.java @@ -309,21 +309,6 @@ public class XmMenuService extends BaseService { public List selectListByIdsWithsChildrenCnt(List ids) { return super.selectList("selectListByIdsWithsChildrenCnt",ids); } - public void calcWorkloadByRecord(String menuId) { - if(!StringUtils.hasText(menuId)){ - return; - } - List ids=new ArrayList<>(); - ids.add(menuId); - calcWorkloadByRecord(ids); - } - public void calcWorkloadByRecord(List menuIds) { - if(menuIds==null || menuIds.size()<=0){ - return; - } - menuIds=menuIds.stream().collect(Collectors.toSet()).stream().collect(Collectors.toList()); - super.update("calcWorkloadByRecord",menuIds); - } diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml index 4c45df71..b72c3bcb 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml @@ -193,46 +193,6 @@ ( #{item}) - - update xm_menu_state res left join (select t.menu_id, - sum(ifnull(t.budget_workload,0)) as budget_workload, - sum(ifnull(t.budget_at,0)) as budget_at, - sum(ifnull(t.act_workload,0)) as act_workload, - sum(ifnull(t.act_cost,0)) as act_cost - from xm_task t where t.menu_id in - - ( #{item}) - - and t.ntype='0' - group by t.menu_id - ) t on t.menu_id=res.menu_id - left join ( - select q.menu_id, - sum(ifnull(q.budget_workload,0)) as budget_workload, - sum(ifnull(q.budget_at,0)) as budget_at, - sum(ifnull(q.act_workload,0)) as act_workload, - sum(ifnull(q.act_at,0)) as act_at - from xm_question q where q.menu_id in - - ( #{item}) - - group by q.menu_id - ) as q on q.menu_id=res.menu_id - set res.budget_workload=ifnull(t.budget_workload,0)+ifnull(q.budget_workload,0), - res.budget_at=ifnull(t.budget_at,0)+ifnull(q.budget_at,0), - res.mact_workload=ifnull(t.act_workload,0)+ifnull(q.act_workload,0), - res.mact_cost=ifnull(t.act_cost,0)+ifnull(q.act_cost,0), - res.mact_rate=case when (ifnull(t.budget_workload,0)+ifnull(q.budget_workload,0) )!=0 then (ifnull(t.act_workload,0)+ifnull(q.act_workload,0))*100/(ifnull(t.budget_workload,0)+ifnull(q.budget_workload,0) ) - when (ifnull(t.act_workload,0)+ifnull(q.act_workload,0))>0 then 100 - else 0 end - where (res.menu_id) in - - ( #{item}) - - and res.dclass='3' - - -