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 7e811dc9..9c1b40b1 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 @@ -512,6 +512,12 @@ public class XmMenuController { } if(canOper.size()>0){ + String status= (String) xmMenuMap.get("status"); + if(status!=null){ + if("3".equals(status)||"2".equals(status)){//关闭缺陷就把结束时间定死 + xmMenuMap.put("endTime",new Date()); + } + } xmMenuMap.put("ltime",new Date()); xmMenuMap.put("ids",canOper.stream().map(k->k.getMenuId()).collect(Collectors.toList())); xmMenuService.editSomeFields(xmMenuMap); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java index 4dcde773..1ba8064e 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java @@ -392,11 +392,17 @@ public class XmQuestionController { } } } + + String bugStatus= (String) xmQuestionMap.get("bugStatus"); + if(bugStatus!=null){ + if("8".equals(bugStatus)){//关闭缺陷就把结束时间定死 + xmQuestionMap.put("endTime",new Date()); + } + } xmQuestionService.editSomeFields(xmQuestionMap); String remarks= (String) xmQuestionMap.get("remarks"); String description= (String) xmQuestionMap.get("description"); String handlerUsername= (String) xmQuestionMap.get("handlerUsername"); - String bugStatus= (String) xmQuestionMap.get("bugStatus"); List handles=new ArrayList<>(); Map map=new HashMap<>();