From 1fc47d5d52731a0fbcadb2b718b07cd524d367b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 24 Mar 2022 18:09:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xm/core/ctrl/XmIterationMenuController.java | 13 +++++++++++++
 .../main/java/com/xm/core/vo/XmIterationMenuVo.java | 10 ++++++++++
 .../mybatis/mapper/xm/core/dao/XmMenuMapper.xml     |  4 ++--
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java
index c96a04bd..afc2a5e3 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java
@@ -3,7 +3,9 @@ package com.xm.core.ctrl;
 import com.mdp.core.entity.Tips;
 import com.mdp.core.err.BizException;
 import com.mdp.core.utils.ResponseHelper;
+import com.xm.core.entity.XmIteration;
 import com.xm.core.entity.XmMenu;
+import com.xm.core.service.XmIterationService;
 import com.xm.core.service.XmMenuService;
 import com.xm.core.service.XmGroupService;
 import com.xm.core.service.XmRecordService;
@@ -45,6 +47,9 @@ public class XmIterationMenuController {
 	@Autowired
 	XmMenuService xmMenuService;
 
+	@Autowired
+	XmIterationService xmIterationService;
+
 
 	@Autowired
     XmGroupService groupService;
@@ -205,7 +210,15 @@ public class XmIterationMenuController {
 			}
 			List<String> msgs=new ArrayList<>();
 			if(canAdds.size()>0){
+				XmIteration xmIteration=xmIterationService.selectOneObject(new XmIteration(xmIterationMenus.getIterationId()));
+				if(xmIteration==null){
+					return ResponseHelper.failed("iteration-0","迭代不存在");
+				}
 				msgs.add("成功将"+canAdds.size()+"个需求加入迭代");
+				if("1".equals(xmIteration.getIstatus())||"7".equals(xmIteration.getIphase())){
+					return ResponseHelper.failed("istatus-1","迭代已关闭");
+				}
+				xmIterationMenus.setIterationName(xmIteration.getIterationName());
 				xmIterationMenus.setMenuIds(canAdds.stream().map(i->i.getMenuId()).collect(Collectors.toList()));
 				xmMenuService.batchIteration(xmIterationMenus);
 				xmRecordService.addXmMenuRecord(canAdds,"产品-迭代-需求加入迭代","将需求加入迭代.");
diff --git a/xm-core/src/main/java/com/xm/core/vo/XmIterationMenuVo.java b/xm-core/src/main/java/com/xm/core/vo/XmIterationMenuVo.java
index e55326c0..d1f6a583 100644
--- a/xm-core/src/main/java/com/xm/core/vo/XmIterationMenuVo.java
+++ b/xm-core/src/main/java/com/xm/core/vo/XmIterationMenuVo.java
@@ -6,6 +6,8 @@ public class XmIterationMenuVo {
 
     String iterationId;
 
+    String iterationName;
+
 
     List<String> menuIds;
 
@@ -24,4 +26,12 @@ public class XmIterationMenuVo {
     public void setMenuIds(List<String> menuIds) {
         this.menuIds = menuIds;
     }
+
+    public String getIterationName() {
+        return iterationName;
+    }
+
+    public void setIterationName(String iterationName) {
+        this.iterationName = iterationName;
+    }
 }
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
index c63a460c..2b479cfc 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
@@ -121,7 +121,7 @@
 	</delete>
 
 	<update id="batchUnIteration" parameterType="com.xm.core.vo.XmIterationMenuVo">
-		update xm_menu res set res.iteration_id = null where res.menu_id in
+		update xm_menu res set res.iteration_id = null,res.iteration_name = null where res.menu_id in
 		<foreach collection="menuIds" item="item" index="index" open="(" separator="," close=")" >
 			#{item}
 		</foreach>
@@ -130,7 +130,7 @@
 		</if>
 	</update>
 	<update id="batchIteration" parameterType="com.xm.core.vo.XmIterationMenuVo">
-		update xm_menu res set res.iteration_id = #{iterationId} where res.menu_id in
+		update xm_menu res set res.iteration_id = #{iterationId},res.iteration_name=#{iterationName} where res.menu_id in
 		<foreach collection="menuIds" item="item" index="index" open="(" separator="," close=")" >
 			#{item}
 		</foreach>