end7less
/
program_xm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
fcdcfc5d16
commit
32b0f029b9
3 changed files with 112 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java
  2. 10
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java
  3. 102
      xm-core/src/main/java/com/xm/core/service/XmRecordService.java

19
xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java
View File

@ -119,8 +119,11 @@ public class XmProjectGroupController {
tips= xmProjectGroupService.updateGroup(group,groupDb); //列出XmProjectGroup列表 tips= xmProjectGroupService.updateGroup(group,groupDb); //列出XmProjectGroup列表
if("1".equals(groupDb.getPgClass())){ if("1".equals(groupDb.getPgClass())){
xmProjectGroupCacheService.clearProductGroup(groupDb.getProductId(),groupDb.getId()); xmProjectGroupCacheService.clearProductGroup(groupDb.getProductId(),groupDb.getId());
xmRecordService.addXmProductGroupRecord(groupDb.getProductId(),groupDb.getId(),"团队-小组-修改小组","修改小组信息【"+groupDb.getGroupName()+"】");
}else { }else {
xmProjectGroupCacheService.clearProjectGroup(groupDb.getProjectId(),groupDb.getId()); xmProjectGroupCacheService.clearProjectGroup(groupDb.getProjectId(),groupDb.getId());
xmRecordService.addXmGroupRecord(groupDb.getProjectId(),groupDb.getId(),"团队-小组-修改小组","修改小组信息【"+groupDb.getGroupName()+"】");
} }
@ -257,12 +260,13 @@ public class XmProjectGroupController {
xmProjectGroupService.insert(xmProjectGroup); xmProjectGroupService.insert(xmProjectGroup);
if("1".equals(xmProjectGroup.getPgClass())){ if("1".equals(xmProjectGroup.getPgClass())){
xmProjectGroupCacheService.clearProductGroup(xmProjectGroup.getProductId(),xmProjectGroup.getId()); xmProjectGroupCacheService.clearProductGroup(xmProjectGroup.getProductId(),xmProjectGroup.getId());
xmRecordService.addXmProductGroupRecord(xmProjectGroup.getProductId(),xmProjectGroup.getId(),"团队-小组-新增小组","新增小组【"+xmProjectGroup.getGroupName()+"】");
}else { }else {
xmProjectGroupCacheService.clearProjectGroup(xmProjectGroup.getProjectId(),xmProjectGroup.getId()); 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) { }catch (BizException e) {
tips=e.getTips(); tips=e.getTips();
logger.error("",e); logger.error("",e);
@ -323,9 +327,11 @@ public class XmProjectGroupController {
xmProjectGroupService.doDeleteByPk(xmProjectGroup,groupDb); xmProjectGroupService.doDeleteByPk(xmProjectGroup,groupDb);
if("1".equals(groupDb.getPgClass())){ if("1".equals(groupDb.getPgClass())){
xmProjectGroupCacheService.clearProductGroup(groupDb.getProductId(),groupDb.getId()); xmProjectGroupCacheService.clearProductGroup(groupDb.getProductId(),groupDb.getId());
xmRecordService.addXmGroupRecord();
xmRecordService.addXmProductGroupRecord(groupDb.getProductId(),groupDb.getId(),"团队-小组-删除小组","删除小组【"+groupDb.getGroupName()+"】");
}else { }else {
xmProjectGroupCacheService.clearProjectGroup(groupDb.getProjectId(),groupDb.getId()); xmProjectGroupCacheService.clearProjectGroup(groupDb.getProjectId(),groupDb.getId());
xmRecordService.addXmGroupRecord(groupDb.getProjectId(),groupDb.getId(),"团队-小组-删除小组","删除小组【"+groupDb.getGroupName()+"】");
} }
}catch (BizException e) { }catch (BizException e) {
@ -388,12 +394,17 @@ public class XmProjectGroupController {
} }
} }
if(canDelNodes.size()>0){ if(canDelNodes.size()>0){
String groupNames=canDelNodes.stream().map(i->i.getGroupName()).collect(Collectors.joining(","));
if("1".equals(pgClass)){ if("1".equals(pgClass)){
xmProjectGroupService.doBatchDeleteProductGroups(canDelNodes); xmProjectGroupService.doBatchDeleteProductGroups(canDelNodes);
xmProjectGroupCacheService.clearProductGroups(groupDb.getProductId()); xmProjectGroupCacheService.clearProductGroups(groupDb.getProductId());
xmRecordService.addXmProductGroupRecord(groupDb.getProductId(),groupDb.getId(),"团队-小组-批量删除小组","删除"+canDelNodes.size()+"个小组【"+groupNames+"】");
}else { }else {
xmProjectGroupService.doBatchDeleteProjectGroups(canDelNodes); xmProjectGroupService.doBatchDeleteProjectGroups(canDelNodes);
xmProjectGroupCacheService.clearProjectGroups(groupDb.getProjectId()); xmProjectGroupCacheService.clearProjectGroups(groupDb.getProjectId());
xmRecordService.addXmGroupRecord(groupDb.getProjectId(),groupDb.getId(),"团队-小组-批量删除小组","删除"+canDelNodes.size()+"个小组【"+groupNames+"】");
} }
} }
}catch (BizException e) { }catch (BizException e) {

10
xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java
View File

@ -265,7 +265,7 @@ public class XmProjectPhaseController {
} }
xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhase); xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhase);
xmProjectPhaseService.insert(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); m.put("data",xmProjectPhase);
}else { }else {
tips=judgetTips; tips=judgetTips;
@ -316,7 +316,7 @@ public class XmProjectPhaseController {
tips.setFailureMsg("存在"+xmProjectPhaseDb.getChildrenCnt()+"条子计划,不允许删除"); tips.setFailureMsg("存在"+xmProjectPhaseDb.getChildrenCnt()+"条子计划,不允许删除");
} else { } else {
xmProjectPhaseService.deleteByPk(xmProjectPhaseDb); 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()) { if(judgetTips.isOk()) {
xmProjectPhase=xmProjectPhaseService.autoCalcWorkload(xmProjectPhase); xmProjectPhase=xmProjectPhaseService.autoCalcWorkload(xmProjectPhase);
xmProjectPhaseService.editByPk(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 { }else {
tips=judgetTips; tips=judgetTips;
@ -545,7 +545,7 @@ public class XmProjectPhaseController {
xmProjectPhaseService.doBatchInsert(xmProjectPhases); xmProjectPhaseService.doBatchInsert(xmProjectPhases);
for (XmProjectPhase phase : 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 { }else {
@ -626,7 +626,7 @@ public class XmProjectPhaseController {
xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhases.stream().map(i->(XmProjectPhase)i).collect(Collectors.toList())); xmProjectPhaseService.parentIdPathsCalcBeforeSave(xmProjectPhases.stream().map(i->(XmProjectPhase)i).collect(Collectors.toList()));
xmProjectPhaseService.batchInsertOrUpdate(xmProjectPhases); xmProjectPhaseService.batchInsertOrUpdate(xmProjectPhases);
for (XmProjectPhase phase : 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 { }else {

102
xm-core/src/main/java/com/xm/core/service/XmRecordService.java
View File

@ -79,7 +79,7 @@ public class XmRecordService extends BaseService {
public void addXmTaskRecord(String projectId,String taskId,String action,String remarks) { public void addXmTaskRecord(String projectId,String taskId,String action,String remarks) {
XmRecord record=this.initXmRecord(); XmRecord record=this.initXmRecord();
record.setProjectId(projectId); record.setProjectId(projectId);
record.setTaskId(taskId);
record.setBizId(taskId);
record.setAction(action); record.setAction(action);
record.setRemarks(remarks); record.setRemarks(remarks);
record.setObjType("task"); 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) { public void addXmTaskRecord(String projectId,String taskId,String action,String remarks,String newValue,String oldValue) {
XmRecord record=this.initXmRecord(); XmRecord record=this.initXmRecord();
record.setProjectId(projectId); record.setProjectId(projectId);
record.setTaskId(taskId);
record.setBizId(taskId);
record.setAction(action); record.setAction(action);
record.setRemarks(remarks); record.setRemarks(remarks);
record.setObjType("task"); record.setObjType("task");
@ -117,10 +117,10 @@ public class XmRecordService extends BaseService {
* @param remarks 人性化语言描述 * @param remarks 人性化语言描述
*/ */
@Async @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(); XmRecord record=this.initXmRecord();
record.setProjectId(projectId); record.setProjectId(projectId);
record.setTaskId(phaseId);
record.setBizId(phaseId);
record.setAction(action); record.setAction(action);
record.setRemarks(remarks); record.setRemarks(remarks);
record.setObjType("phase"); record.setObjType("phase");
@ -137,10 +137,10 @@ public class XmRecordService extends BaseService {
* @param oldValue 需要记录下来的旧数据 可空 * @param oldValue 需要记录下来的旧数据 可空
*/ */
@Async @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(); XmRecord record=this.initXmRecord();
record.setProjectId(projectId); record.setProjectId(projectId);
record.setTaskId(phaseId);
record.setBizId(phaseId);
record.setAction(action); record.setAction(action);
record.setRemarks(remarks); record.setRemarks(remarks);
record.setObjType("phase"); record.setObjType("phase");
@ -149,6 +149,45 @@ public class XmRecordService extends BaseService {
this.insert(record); 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) { public void addXmGroupRecord(String projectId,String groupId,String action,String remarks) {
XmRecord record=this.initXmRecord(); XmRecord record=this.initXmRecord();
record.setProjectId(projectId); record.setProjectId(projectId);
record.setTaskId(groupId);
record.setBizId(groupId);
record.setAction(action); record.setAction(action);
record.setRemarks(remarks); record.setRemarks(remarks);
record.setObjType("group"); record.setObjType("group");
@ -171,7 +210,6 @@ public class XmRecordService extends BaseService {
/** /**
* 针对项目下的任务的所有操作用此方法 * 针对项目下的任务的所有操作用此方法
* @param projectId 项目编号 * @param projectId 项目编号
* @param phaseId 小组编号
* @param action 操作如 新增任务，修改任务信息，修改任务进度 等 * @param action 操作如 新增任务，修改任务信息，修改任务进度 等
* @param remarks 人性化语言描述 * @param remarks 人性化语言描述
* @param newValue 需要记录下来的新数据 可空 * @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) { public void addXmGroupRecord(String projectId,String groupId,String action,String remarks,String newValue,String oldValue) {
XmRecord record=this.initXmRecord(); XmRecord record=this.initXmRecord();
record.setProjectId(projectId); record.setProjectId(projectId);
record.setTaskId(groupId);
record.setBizId(groupId);
record.setAction(action); record.setAction(action);
record.setRemarks(remarks); record.setRemarks(remarks);
record.setObjType("group"); record.setObjType("group");
@ -190,6 +228,44 @@ public class XmRecordService extends BaseService {
this.insert(record); 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) { public void addXmBudgetRecord(String projectId,String budgetId,String action,String remarks) {
XmRecord record=this.initXmRecord(); XmRecord record=this.initXmRecord();
record.setProjectId(projectId); record.setProjectId(projectId);
record.setTaskId(budgetId);
record.setBizId(budgetId);
record.setAction(action); record.setAction(action);
record.setRemarks(remarks); record.setRemarks(remarks);
record.setObjType("budget"); 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) { public void addXmBudgetRecord(String projectId,String budgetId,String action,String remarks,String newValue,String oldValue) {
XmRecord record=this.initXmRecord(); XmRecord record=this.initXmRecord();
record.setProjectId(projectId); record.setProjectId(projectId);
record.setTaskId(budgetId);
record.setBizId(budgetId);
record.setAction(action); record.setAction(action);
record.setRemarks(remarks); record.setRemarks(remarks);
record.setObjType("budget"); record.setObjType("budget");
@ -243,7 +319,7 @@ public class XmRecordService extends BaseService {
public void addXmCostRecord(String projectId,String costId,String action,String remarks) { public void addXmCostRecord(String projectId,String costId,String action,String remarks) {
XmRecord record=this.initXmRecord(); XmRecord record=this.initXmRecord();
record.setProjectId(projectId); record.setProjectId(projectId);
record.setTaskId(costId);
record.setBizId(costId);
record.setAction(action); record.setAction(action);
record.setRemarks(remarks); record.setRemarks(remarks);
record.setObjType("group"); 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) { public void addXmCostRecord(String projectId,String costId,String action,String remarks,String newValue,String oldValue) {
XmRecord record=this.initXmRecord(); XmRecord record=this.initXmRecord();
record.setProjectId(projectId); record.setProjectId(projectId);
record.setTaskId(costId);
record.setBizId(costId);
record.setAction(action); record.setAction(action);
record.setRemarks(remarks); record.setRemarks(remarks);
record.setObjType("group"); record.setObjType("group");

Write Preview
Loading…
Cancel
Save