From 81b94fc7e356b84a9954222796bec52fd6f312c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 14 May 2022 15:20:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=80=E5=90=8E=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=97=B6=E9=97=B4=E7=9A=84=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xm/core/ctrl/XmMenuController.java | 11 +++++++++-- .../main/java/com/xm/core/ctrl/XmTaskController.java | 5 +++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java index c5d95e31..ddd8626c 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java @@ -312,6 +312,12 @@ public class XmMenuController { xmMenuService.parentIdPathsCalcBeforeSave(xmMenu); xmMenu.setStatus("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); xmRecordService.addXmMenuRecord(xmMenu.getProductId(),xmMenu.getMenuId(),"新增产品需求","新增需求"+xmMenu.getMenuName()); m.put("data",xmMenu); @@ -404,7 +410,8 @@ public class XmMenuController { xmMenu.setNtype("1"); } } - xmMenuService.updateByPk(xmMenu); + xmMenu.setLtime(new Date()); + xmMenuService.updateSomeFieldByPk(xmMenu); xmRecordService.addXmMenuRecord(xmMenu.getProductId(),xmMenu.getMenuId(),"修改产品需求","修改产品需求"+xmMenu.getMenuName(),"", JSON.toJSONString(xmMenu)); m.put("data",xmMenu); @@ -457,7 +464,7 @@ public class XmMenuController { } Set 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()); - + xmMenuMap.put("ltime",new Date()); xmMenuService.editSomeFields(xmMenuMap); xmRecordService.addXmMenuRecord(xmMenu.getProductId(),xmMenu.getMenuId(),"修改产品需求","修改产品需求"+xmMenu.getMenuName(),"", JSON.toJSONString(xmMenu)); 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 56afc262..7486cb93 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 @@ -1036,6 +1036,7 @@ public class XmTaskController { List noAllowTasks=new ArrayList<>(); List tasksDb=this.xmTaskService.selectTaskListByIds(tasksMenu.getTaskIds()); for (XmTask xmTask : tasksDb) { + xmTask.setLtime(new Date()); if("1".equals(xmTask.getNtype())){ ntype1Tasks.add(xmTask); continue; @@ -1273,6 +1274,7 @@ public class XmTaskController { } frontParamsTaskMap.put(task.getId(),task); if(xmTaskDbMap.containsKey(task.getId())){ + task.setLtime(new Date()); updateTasks.add(task); }else { task.setCreateUsername(user.getUsername()); @@ -1280,6 +1282,7 @@ public class XmTaskController { task.setExecutorUserid(user.getUserid()); task.setExecutorUsername(user.getUsername()); task.setCreateTime(new Date()); + task.setLtime(new Date()); insertTasks.add(task); } } @@ -1446,12 +1449,14 @@ public class XmTaskController { } Map allowTasksDbMap2=new HashMap<>(); for (XmTask t : allowTasksDbMap.values()) { + t.setLtime(new Date()); if(!allowTasksDbMap.containsKey(t.getParentTaskid())){ allowTasksDbMap2.put(t.getId(),t); } } Map allowTasksDbMap3=new HashMap<>(); for (XmTask t : allowTasksDbMap2.values()) { + t.setLtime(new Date()); boolean hasChildren=false; for (XmTask t2 : allowTasksDbMap2.values()) { if(!t2.getId().equals(t.getId()) && t2.getPidPaths().indexOf(t.getPidPaths())>=0 ){