From 32b0f029b9810f4fc70507d1f06133cb7bae79cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Wed, 23 Feb 2022 22:09:27 +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/XmProjectGroupController.java | 19 ++- .../core/ctrl/XmProjectPhaseController.java | 10 +- .../com/xm/core/service/XmRecordService.java | 108 +++++++++++++++--- 3 files changed, 112 insertions(+), 25 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java index 7d09b4f3..e1e0bfb0 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java @@ -119,8 +119,11 @@ public class XmProjectGroupController { tips= xmProjectGroupService.updateGroup(group,groupDb); //列出XmProjectGroup列表 if("1".equals(groupDb.getPgClass())){ xmProjectGroupCacheService.clearProductGroup(groupDb.getProductId(),groupDb.getId()); + xmRecordService.addXmProductGroupRecord(groupDb.getProductId(),groupDb.getId(),"团队-小组-修改小组","修改小组信息【"+groupDb.getGroupName()+"】"); }else { xmProjectGroupCacheService.clearProjectGroup(groupDb.getProjectId(),groupDb.getId()); + xmRecordService.addXmGroupRecord(groupDb.getProjectId(),groupDb.getId(),"团队-小组-修改小组","修改小组信息【"+groupDb.getGroupName()+"】"); + } @@ -257,12 +260,13 @@ public class XmProjectGroupController { xmProjectGroupService.insert(xmProjectGroup); if("1".equals(xmProjectGroup.getPgClass())){ xmProjectGroupCacheService.clearProductGroup(xmProjectGroup.getProductId(),xmProjectGroup.getId()); + xmRecordService.addXmProductGroupRecord(xmProjectGroup.getProductId(),xmProjectGroup.getId(),"团队-小组-新增小组","新增小组【"+xmProjectGroup.getGroupName()+"】"); + }else { xmProjectGroupCacheService.clearProjectGroup(xmProjectGroup.getProjectId(),xmProjectGroup.getId()); + xmRecordService.addXmProductGroupRecord(xmProjectGroup.getProductId(),xmProjectGroup.getId(),"团队-小组-新增小组","新增小组【"+xmProjectGroup.getGroupName()+"】"); } - pushMsgService.pushChannelGroupCreateMsg(u.getBranchId(), xmProjectGroup.getProjectId(),xmProjectGroup.getId(), xmProjectGroup.getId(),xmProjectGroup.getGroupName(), u.getUserid(), u.getUsername(), null, "新增小组"+xmProjectGroup.getGroupName()); - xmRecordService.addXmGroupRecord(xmProjectGroup.getProjectId(), xmProjectGroup.getId(), "项目-团队-新增小组", "新增小组"+xmProjectGroup.getGroupName(),JSON.toJSONString(xmProjectGroup),null); - m.put("data",xmProjectGroup); + m.put("data",xmProjectGroup); }catch (BizException e) { tips=e.getTips(); logger.error("",e); @@ -323,9 +327,11 @@ public class XmProjectGroupController { xmProjectGroupService.doDeleteByPk(xmProjectGroup,groupDb); if("1".equals(groupDb.getPgClass())){ xmProjectGroupCacheService.clearProductGroup(groupDb.getProductId(),groupDb.getId()); - xmRecordService.addXmGroupRecord(); + xmRecordService.addXmProductGroupRecord(groupDb.getProductId(),groupDb.getId(),"团队-小组-删除小组","删除小组【"+groupDb.getGroupName()+"】"); }else { xmProjectGroupCacheService.clearProjectGroup(groupDb.getProjectId(),groupDb.getId()); + xmRecordService.addXmGroupRecord(groupDb.getProjectId(),groupDb.getId(),"团队-小组-删除小组","删除小组【"+groupDb.getGroupName()+"】"); + } }catch (BizException e) { @@ -388,12 +394,17 @@ public class XmProjectGroupController { } } if(canDelNodes.size()>0){ + String groupNames=canDelNodes.stream().map(i->i.getGroupName()).collect(Collectors.joining(",")); if("1".equals(pgClass)){ xmProjectGroupService.doBatchDeleteProductGroups(canDelNodes); xmProjectGroupCacheService.clearProductGroups(groupDb.getProductId()); + xmRecordService.addXmProductGroupRecord(groupDb.getProductId(),groupDb.getId(),"团队-小组-批量删除小组","删除"+canDelNodes.size()+"个小组【"+groupNames+"】"); + }else { xmProjectGroupService.doBatchDeleteProjectGroups(canDelNodes); xmProjectGroupCacheService.clearProjectGroups(groupDb.getProjectId()); + xmRecordService.addXmGroupRecord(groupDb.getProjectId(),groupDb.getId(),"团队-小组-批量删除小组","删除"+canDelNodes.size()+"个小组【"+groupNames+"】"); + } } }catch (BizException e) { diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java index d85f8e6b..ddfabcd5 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java @@ -265,7 +265,7 @@ public class XmProjectPhaseController { } xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhase); xmProjectPhaseService.insert(xmProjectPhase); - xmRecordService.addXmPhaseRecord(projectId, xmProjectPhase.getId(), "项目-计划-新增计划", "新增计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null); + xmRecordService.addProjectPhaseRecord(projectId, xmProjectPhase.getId(), "项目-计划-新增计划", "新增计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null); m.put("data",xmProjectPhase); }else { tips=judgetTips; @@ -316,7 +316,7 @@ public class XmProjectPhaseController { tips.setFailureMsg("存在"+xmProjectPhaseDb.getChildrenCnt()+"条子计划,不允许删除"); } else { xmProjectPhaseService.deleteByPk(xmProjectPhaseDb); - xmRecordService.addXmPhaseRecord(xmProjectPhaseDb.getProjectId(), xmProjectPhaseDb.getId(), "项目-计划-删除计划", "删除计划"+xmProjectPhaseDb.getPhaseName(),JSON.toJSONString(xmProjectPhaseDb),null); + xmRecordService.addProjectPhaseRecord(xmProjectPhaseDb.getProjectId(), xmProjectPhaseDb.getId(), "项目-计划-删除计划", "删除计划"+xmProjectPhaseDb.getPhaseName(),JSON.toJSONString(xmProjectPhaseDb),null); } } @@ -377,7 +377,7 @@ public class XmProjectPhaseController { if(judgetTips.isOk()) { xmProjectPhase=xmProjectPhaseService.autoCalcWorkload(xmProjectPhase); xmProjectPhaseService.editByPk(xmProjectPhase); - xmRecordService.addXmPhaseRecord(xmProjectPhase.getProjectId(), xmProjectPhase.getId(), "项目-计划-修改计划", "修改计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null); + xmRecordService.addProjectPhaseRecord(xmProjectPhase.getProjectId(), xmProjectPhase.getId(), "项目-计划-修改计划", "修改计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null); }else { tips=judgetTips; @@ -545,7 +545,7 @@ public class XmProjectPhaseController { xmProjectPhaseService.doBatchInsert(xmProjectPhases); for (XmProjectPhase phase : xmProjectPhases) { - xmRecordService.addXmPhaseRecord(phase.getProjectId(), phase.getId(), "项目-计划-新增计划", "新增计划"+phase.getPhaseName(),JSON.toJSONString(phase),null); + xmRecordService.addProjectPhaseRecord(phase.getProjectId(), phase.getId(), "项目-计划-新增计划", "新增计划"+phase.getPhaseName(),JSON.toJSONString(phase),null); } }else { @@ -626,7 +626,7 @@ public class XmProjectPhaseController { xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhases.stream().map(i->(XmProjectPhase)i).collect(Collectors.toList())); xmProjectPhaseService.batchInsertOrUpdate(xmProjectPhases); for (XmProjectPhase phase : xmProjectPhases) { - xmRecordService.addXmPhaseRecord(phase.getProjectId(), phase.getId(), "项目-计划-修改计划预算", "修改计划"+phase.getPhaseName(),JSON.toJSONString(phase),null); + xmRecordService.addProjectPhaseRecord(phase.getProjectId(), phase.getId(), "项目-计划-修改计划预算", "修改计划"+phase.getPhaseName(),JSON.toJSONString(phase),null); } }else { diff --git a/xm-core/src/main/java/com/xm/core/service/XmRecordService.java b/xm-core/src/main/java/com/xm/core/service/XmRecordService.java index 1f1d35aa..b9840cb2 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmRecordService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmRecordService.java @@ -78,8 +78,8 @@ public class XmRecordService extends BaseService { @Async public void addXmTaskRecord(String projectId,String taskId,String action,String remarks) { XmRecord record=this.initXmRecord(); - record.setProjectId(projectId); - record.setTaskId(taskId); + record.setProjectId(projectId); + record.setBizId(taskId); record.setAction(action); record.setRemarks(remarks); record.setObjType("task"); @@ -99,7 +99,7 @@ public class XmRecordService extends BaseService { public void addXmTaskRecord(String projectId,String taskId,String action,String remarks,String newValue,String oldValue) { XmRecord record=this.initXmRecord(); record.setProjectId(projectId); - record.setTaskId(taskId); + record.setBizId(taskId); record.setAction(action); record.setRemarks(remarks); record.setObjType("task"); @@ -117,10 +117,10 @@ public class XmRecordService extends BaseService { * @param remarks 人性化语言描述 */ @Async - public void addXmPhaseRecord(String projectId,String phaseId,String action,String remarks) { + public void addProjectPhaseRecord(String projectId, String phaseId, String action, String remarks) { XmRecord record=this.initXmRecord(); record.setProjectId(projectId); - record.setTaskId(phaseId); + record.setBizId(phaseId); record.setAction(action); record.setRemarks(remarks); record.setObjType("phase"); @@ -137,10 +137,10 @@ public class XmRecordService extends BaseService { * @param oldValue 需要记录下来的旧数据 可空 */ @Async - public void addXmPhaseRecord(String projectId,String phaseId,String action,String remarks,String newValue,String oldValue) { + public void addProjectPhaseRecord(String projectId, String phaseId, String action, String remarks, String newValue, String oldValue) { XmRecord record=this.initXmRecord(); record.setProjectId(projectId); - record.setTaskId(phaseId); + record.setBizId(phaseId); record.setAction(action); record.setRemarks(remarks); record.setObjType("phase"); @@ -148,7 +148,46 @@ public class XmRecordService extends BaseService { record.setOldValue(oldValue); this.insert(record); } - + + /** + * 针对项目下的任务的所有操作用此方法 + * @param productId 项目编号 + * @param phaseId 计划编号 + * @param action 操作如 新增任务，修改任务信息，修改任务进度 等 + * @param remarks 人性化语言描述 + */ + @Async + public void addProductPhaseRecord(String productId, String phaseId, String action, String remarks) { + XmRecord record=this.initXmRecord(); + record.setProjectId(productId); + record.setBizId(phaseId); + record.setAction(action); + record.setRemarks(remarks); + record.setObjType("phase"); + this.insert(record); + } + + /** + * 针对项目下的任务的所有操作用此方法 + * @param productId 项目编号 + * @param phaseId 计划编号 + * @param action 操作如 新增任务，修改任务信息，修改任务进度 等 + * @param remarks 人性化语言描述 + * @param newValue 需要记录下来的新数据 可空 + * @param oldValue 需要记录下来的旧数据 可空 + */ + @Async + public void addProductPhaseRecord(String productId, String phaseId, String action, String remarks, String newValue, String oldValue) { + XmRecord record=this.initXmRecord(); + record.setProjectId(productId); + record.setBizId(phaseId); + record.setAction(action); + record.setRemarks(remarks); + record.setObjType("phase"); + record.setNewValue(newValue); + record.setOldValue(oldValue); + this.insert(record); + } /** * 针对项目下的任务的所有操作用此方法 @@ -161,7 +200,7 @@ public class XmRecordService extends BaseService { public void addXmGroupRecord(String projectId,String groupId,String action,String remarks) { XmRecord record=this.initXmRecord(); record.setProjectId(projectId); - record.setTaskId(groupId); + record.setBizId(groupId); record.setAction(action); record.setRemarks(remarks); record.setObjType("group"); @@ -171,7 +210,6 @@ public class XmRecordService extends BaseService { /** * 针对项目下的任务的所有操作用此方法 * @param projectId 项目编号 - * @param phaseId 小组编号 * @param action 操作如 新增任务，修改任务信息，修改任务进度 等 * @param remarks 人性化语言描述 * @param newValue 需要记录下来的新数据 可空 @@ -181,7 +219,7 @@ public class XmRecordService extends BaseService { public void addXmGroupRecord(String projectId,String groupId,String action,String remarks,String newValue,String oldValue) { XmRecord record=this.initXmRecord(); record.setProjectId(projectId); - record.setTaskId(groupId); + record.setBizId(groupId); record.setAction(action); record.setRemarks(remarks); record.setObjType("group"); @@ -189,7 +227,45 @@ public class XmRecordService extends BaseService { record.setOldValue(oldValue); this.insert(record); } - + + /** + * 针对项目下的任务的所有操作用此方法 + * @param productId 项目编号 + * @param groupId 小组编号 + * @param action 操作如 新增任务，修改任务信息，修改任务进度 等 + * @param remarks 人性化语言描述 + */ + @Async + public void addXmProductGroupRecord(String productId,String groupId,String action,String remarks) { + XmRecord record=this.initXmRecord(); + record.setProjectId(productId); + record.setBizId(groupId); + record.setAction(action); + record.setRemarks(remarks); + record.setObjType("group"); + this.insert(record); + } + + /** + * 针对项目下的任务的所有操作用此方法 + * @param productId 项目编号 + * @param action 操作如 新增任务，修改任务信息，修改任务进度 等 + * @param remarks 人性化语言描述 + * @param newValue 需要记录下来的新数据 可空 + * @param oldValue 需要记录下来的旧数据 可空 + */ + @Async + public void addXmProductGroupRecord(String productId,String groupId,String action,String remarks,String newValue,String oldValue) { + XmRecord record=this.initXmRecord(); + record.setProjectId(productId); + record.setBizId(groupId); + record.setAction(action); + record.setRemarks(remarks); + record.setObjType("group"); + record.setNewValue(newValue); + record.setOldValue(oldValue); + this.insert(record); + } /** * 针对项目下的任务的所有操作用此方法 @@ -202,7 +278,7 @@ public class XmRecordService extends BaseService { public void addXmBudgetRecord(String projectId,String budgetId,String action,String remarks) { XmRecord record=this.initXmRecord(); record.setProjectId(projectId); - record.setTaskId(budgetId); + record.setBizId(budgetId); record.setAction(action); record.setRemarks(remarks); record.setObjType("budget"); @@ -222,7 +298,7 @@ public class XmRecordService extends BaseService { public void addXmBudgetRecord(String projectId,String budgetId,String action,String remarks,String newValue,String oldValue) { XmRecord record=this.initXmRecord(); record.setProjectId(projectId); - record.setTaskId(budgetId); + record.setBizId(budgetId); record.setAction(action); record.setRemarks(remarks); record.setObjType("budget"); @@ -243,7 +319,7 @@ public class XmRecordService extends BaseService { public void addXmCostRecord(String projectId,String costId,String action,String remarks) { XmRecord record=this.initXmRecord(); record.setProjectId(projectId); - record.setTaskId(costId); + record.setBizId(costId); record.setAction(action); record.setRemarks(remarks); record.setObjType("group"); @@ -263,7 +339,7 @@ public class XmRecordService extends BaseService { public void addXmCostRecord(String projectId,String costId,String action,String remarks,String newValue,String oldValue) { XmRecord record=this.initXmRecord(); record.setProjectId(projectId); - record.setTaskId(costId); + record.setBizId(costId); record.setAction(action); record.setRemarks(remarks); record.setObjType("group");