Browse Source

增加最后更新时间的保存

master
陈裕财 4 years ago
parent
commit
81b94fc7e3
  1. 11
      xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java
  2. 5
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

11
xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java

@ -312,6 +312,12 @@ public class XmMenuController {
xmMenuService.parentIdPathsCalcBeforeSave(xmMenu); xmMenuService.parentIdPathsCalcBeforeSave(xmMenu);
xmMenu.setStatus("0"); xmMenu.setStatus("0");
xmMenu.setChildrenCnt(0); xmMenu.setChildrenCnt(0);
if(!StringUtils.hasText(xmMenu.getProposerId())){
xmMenu.setProposerId(user.getUserid());
xmMenu.setProposerName(user.getUsername());
}
xmMenu.setCtime(new Date());
xmMenu.setLtime(new Date());
xmMenuService.insert(xmMenu); xmMenuService.insert(xmMenu);
xmRecordService.addXmMenuRecord(xmMenu.getProductId(),xmMenu.getMenuId(),"新增产品需求","新增需求"+xmMenu.getMenuName()); xmRecordService.addXmMenuRecord(xmMenu.getProductId(),xmMenu.getMenuId(),"新增产品需求","新增需求"+xmMenu.getMenuName());
m.put("data",xmMenu); m.put("data",xmMenu);
@ -404,7 +410,8 @@ public class XmMenuController {
xmMenu.setNtype("1"); xmMenu.setNtype("1");
} }
} }
xmMenuService.updateByPk(xmMenu);
xmMenu.setLtime(new Date());
xmMenuService.updateSomeFieldByPk(xmMenu);
xmRecordService.addXmMenuRecord(xmMenu.getProductId(),xmMenu.getMenuId(),"修改产品需求","修改产品需求"+xmMenu.getMenuName(),"", JSON.toJSONString(xmMenu)); xmRecordService.addXmMenuRecord(xmMenu.getProductId(),xmMenu.getMenuId(),"修改产品需求","修改产品需求"+xmMenu.getMenuName(),"", JSON.toJSONString(xmMenu));
m.put("data",xmMenu); m.put("data",xmMenu);
@ -457,7 +464,7 @@ public class XmMenuController {
} }
Set<String> fieldKey=xmMenuMap.keySet().stream().filter(i->fieldsMap.containsKey(i)).collect(Collectors.toSet()); Set<String> fieldKey=xmMenuMap.keySet().stream().filter(i->fieldsMap.containsKey(i)).collect(Collectors.toSet());
fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmMenuMap.get(i) )).collect(Collectors.toSet()); fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmMenuMap.get(i) )).collect(Collectors.toSet());
xmMenuMap.put("ltime",new Date());
xmMenuService.editSomeFields(xmMenuMap); xmMenuService.editSomeFields(xmMenuMap);
xmRecordService.addXmMenuRecord(xmMenu.getProductId(),xmMenu.getMenuId(),"修改产品需求","修改产品需求"+xmMenu.getMenuName(),"", JSON.toJSONString(xmMenu)); xmRecordService.addXmMenuRecord(xmMenu.getProductId(),xmMenu.getMenuId(),"修改产品需求","修改产品需求"+xmMenu.getMenuName(),"", JSON.toJSONString(xmMenu));

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

@ -1036,6 +1036,7 @@ public class XmTaskController {
List<XmTask> noAllowTasks=new ArrayList<>(); List<XmTask> noAllowTasks=new ArrayList<>();
List<XmTask> tasksDb=this.xmTaskService.selectTaskListByIds(tasksMenu.getTaskIds()); List<XmTask> tasksDb=this.xmTaskService.selectTaskListByIds(tasksMenu.getTaskIds());
for (XmTask xmTask : tasksDb) { for (XmTask xmTask : tasksDb) {
xmTask.setLtime(new Date());
if("1".equals(xmTask.getNtype())){ if("1".equals(xmTask.getNtype())){
ntype1Tasks.add(xmTask); ntype1Tasks.add(xmTask);
continue; continue;
@ -1273,6 +1274,7 @@ public class XmTaskController {
} }
frontParamsTaskMap.put(task.getId(),task); frontParamsTaskMap.put(task.getId(),task);
if(xmTaskDbMap.containsKey(task.getId())){ if(xmTaskDbMap.containsKey(task.getId())){
task.setLtime(new Date());
updateTasks.add(task); updateTasks.add(task);
}else { }else {
task.setCreateUsername(user.getUsername()); task.setCreateUsername(user.getUsername());
@ -1280,6 +1282,7 @@ public class XmTaskController {
task.setExecutorUserid(user.getUserid()); task.setExecutorUserid(user.getUserid());
task.setExecutorUsername(user.getUsername()); task.setExecutorUsername(user.getUsername());
task.setCreateTime(new Date()); task.setCreateTime(new Date());
task.setLtime(new Date());
insertTasks.add(task); insertTasks.add(task);
} }
} }
@ -1446,12 +1449,14 @@ public class XmTaskController {
} }
Map<String,XmTask> allowTasksDbMap2=new HashMap<>(); Map<String,XmTask> allowTasksDbMap2=new HashMap<>();
for (XmTask t : allowTasksDbMap.values()) { for (XmTask t : allowTasksDbMap.values()) {
t.setLtime(new Date());
if(!allowTasksDbMap.containsKey(t.getParentTaskid())){ if(!allowTasksDbMap.containsKey(t.getParentTaskid())){
allowTasksDbMap2.put(t.getId(),t); allowTasksDbMap2.put(t.getId(),t);
} }
} }
Map<String,XmTask> allowTasksDbMap3=new HashMap<>(); Map<String,XmTask> allowTasksDbMap3=new HashMap<>();
for (XmTask t : allowTasksDbMap2.values()) { for (XmTask t : allowTasksDbMap2.values()) {
t.setLtime(new Date());
boolean hasChildren=false; boolean hasChildren=false;
for (XmTask t2 : allowTasksDbMap2.values()) { for (XmTask t2 : allowTasksDbMap2.values()) {
if(!t2.getId().equals(t.getId()) && t2.getPidPaths().indexOf(t.getPidPaths())>=0 ){ if(!t2.getId().equals(t.getId()) && t2.getPidPaths().indexOf(t.getPidPaths())>=0 ){

Loading…
Cancel
Save