添加节点类型、标签等

xm-core/src/main/java/com/xm/core/ctrl/XmIterationLinkController.java

@@ -199,7 +199,7 @@ public class XmIterationLinkController {
 					return ResponseHelper.failed("no-product-qx","您不是产品管理人员，无权将该产品移出迭代");
 				};
 				//检查是否有需求关联这个迭代，如果有，不允许删除
-				List<XmMenu> menus= xmMenuService.listTenMenuByIteration(xmIterationLink.getIterationId());
+				List<XmMenu> menus= xmMenuService.listTenMenuByIterationId(xmIterationLink.getIterationId());
 				if(menus!=null && menus.size()>0){
 					return ResponseHelper.failed("menus-not-0","存在至少"+menus.size()+"个需求与迭代关联，不能移出.关联需求【"+menus.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】");
 				}
@@ -208,7 +208,7 @@ public class XmIterationLinkController {
 					return ResponseHelper.failed("no-project-qx","您不是项目管理人员，无权将该项目移出迭代");
 				};
 				//检查是否有任务关联这个迭代，如果有，不允许删除
-				List<XmTask> tasks= xmTaskService.listTenTaskByIteration(xmIterationLink.getIterationId());
+				List<XmTask> tasks= xmTaskService.listTenTaskByIterationId(xmIterationLink.getIterationId());
 				if(tasks!=null && tasks.size()>0){
 					return ResponseHelper.failed("tasks-not-0","存在至少"+tasks.size()+"个任务与迭代关联，不能移出.关联任务【"+tasks.stream().map(i->i.getName()).collect(Collectors.joining(","))+"】");
 				}

xm-core/src/main/java/com/xm/core/ctrl/XmProductProjectLinkController.java

@@ -1,11 +1,14 @@
 package com.xm.core.ctrl;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import com.mdp.core.utils.ResponseHelper;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
+import com.xm.core.entity.XmTask;
 import com.xm.core.service.XmGroupService;
+import com.xm.core.service.XmTaskService;
 import org.aspectj.weaver.ResolvedPointcutDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -57,7 +60,8 @@ public class XmProductProjectLinkController {
 	@Autowired
 	XmGroupService xmGroupService;
 
- 
+	@Autowired
+	XmTaskService xmTaskService;
 	
 	@ApiOperation( value = "查询产品与项目的关联关系表，一般由产品经理挂接项目到产品上信息列表",notes=" ") 
 	@ApiResponses({
@@ -142,6 +146,10 @@ public class XmProductProjectLinkController {
 					return ResponseHelper.failed("not-pm","您不是项目管理人员、也不是产品管理人员，无权取消关联");
 				}
 			};
+			List<XmTask> tasks=xmTaskService.listTenTaskByProductId(xmProductProjectLink.getProductId());
+			if(tasks!=null && tasks.size()>0){
+				return ResponseHelper.failed("tasks-not-0","存在至少"+tasks.size()+"个任务与产品关联，不能移出.关联任务【"+tasks.stream().map(i->i.getName()).collect(Collectors.joining(","))+"】");
+			}
 			xmProductProjectLinkService.deleteByPk(xmProductProjectLink);
 		}catch (BizException e) { 
 			tips=e.getTips();

xm-core/src/main/java/com/xm/core/service/XmMenuService.java

@@ -281,9 +281,9 @@ public class XmMenuService extends BaseService {
 		super.update("batchProductPhase",xmPhaseMenusVo);
 	}
 
-    public List<XmMenu> listTenMenuByIteration(String iterationId) {
+    public List<XmMenu> listTenMenuByIterationId(String iterationId) {
 
-		return super.selectList("listTenMenuByIteration",iterationId);
+		return super.selectList("listTenMenuByIterationId",iterationId);
     }
 }
 

xm-core/src/main/java/com/xm/core/service/XmTaskService.java

@@ -697,8 +697,12 @@ public class XmTaskService extends BaseService {
 		return tips;
 	}
 
-	public List<XmTask> listTenTaskByIteration(String iterationId) {
-		return super.selectList("listTenTaskByIteration",iterationId);
+	public List<XmTask> listTenTaskByIterationId(String iterationId) {
+		return super.selectList("listTenTaskByIterationId",iterationId);
+	}
+
+	public List<XmTask> listTenTaskByProductId(String productId) {
+		return super.selectList("listTenTaskByProductId",productId);
 	}
 }
 

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml

@@ -151,7 +151,7 @@
 			#{item}
 		</foreach>
 	</update>
-	<select id="listTenMenuByIteration" parameterType="String" resultType="com.xm.core.entity.XmMenu">
+	<select id="listTenMenuByIterationId" parameterType="String" resultType="com.xm.core.entity.XmMenu">
 		select menu_name from xm_menu res where  res.iteration_id=#{iterationId}
 		limit 10
 	</select>

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml

@@ -316,11 +316,17 @@
 		group by p.id
 	</select>
 
-	<select id="listTenTaskByIteration" parameterType="String" resultType="com.xm.core.entity.XmTask">
+	<select id="listTenTaskByIterationId" parameterType="String" resultType="com.xm.core.entity.XmTask">
 		select name from xm_task res where exists(select 1 from xm_menu m where m.menu_id=res.menu_id and m.iteration_id=#{iterationId} and m.ntype='0')
 		and res.ntype='0'
 		limit 10
 	</select>
+
+	<select id="listTenTaskByProductId" parameterType="String" resultType="com.xm.core.entity.XmTask">
+		select name from xm_task res where exists(select 1 from xm_menu m where m.menu_id=res.menu_id and m.product_id=#{productId} and m.ntype='0')
+		and res.ntype='0'
+		limit 10
+	</select>
 	<!--结束 自定义sql函数区域-->