From 900c703cc1c3d9e65ec40cdcd73c8c11926796cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 28 Jan 2023 12:26:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/xm/core/ctrl/XmMenuController.java  | 6 ++++++
 .../main/java/com/xm/core/ctrl/XmQuestionController.java  | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

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<XmQuestionHandle> handles=new ArrayList<>();
 					Map<String,Object> map=new HashMap<>();