添加节点类型、标签等

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.listTenMenuByIterationId(xmIterationLink.getIterationId());
+				List<XmMenu> menus= xmMenuService.listTenMenuByProductIdAndIterationId(xmIterationLink.getProId(),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.listTenTaskByIterationId(xmIterationLink.getIterationId());
+				List<XmTask> tasks= xmTaskService.listTenTaskByProjectIdAndIterationId(xmIterationLink.getProId(),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/service/XmMenuService.java

@@ -28,14 +28,17 @@ public class XmMenuService extends BaseService {
 
 	/**
 	 * 连同功能关联的项目需求计划数据一起带出
+	 *
 	 * @param xmMenu
 	 * @return
 	 */
 	public List<Map<String, Object>> selectListMapByWhereWithPlan(Map<String, Object> xmMenu) {
 		return this.selectList("selectListMapByWhereWithPlan", xmMenu);
 	}
+
 	/**
 	 * 连同功能关联的状态数据一起带出
+	 *
 	 * @param xmMenu
 	 * @return
 	 */
@@ -46,6 +49,7 @@ public class XmMenuService extends BaseService {
 
 	/**
 	 * 连同功能关联的产品计划一并带出
+	 *
 	 * @param xmMenu
 	 * @return
 	 */
@@ -55,13 +59,14 @@ public class XmMenuService extends BaseService {
 	}
 
 
-
 	public void updateMenuChildrenCntByMenuId(String menuId) {
 		super.update("updateMenuChildrenCntByMenuId", menuId);
 	}
+
 	public void updateChildrenCntByIds(List<String> ids) {
 		super.update("updateChildrenCntByIds", ids);
 	}
+
 	@Transactional
 	public void batchInsertOrUpdate(List<XmMenuVo> xmMenus) {
 		List<XmMenuVo> addList = new ArrayList<>();
@@ -84,6 +89,7 @@ public class XmMenuService extends BaseService {
 			this.xmMenuStateService.batchSumParents(xmMenuList);
 		}
 	}
+
 	public List<Map<String, Object>> queryTaskUsersByMenuId(String menuId) {
 		return this.selectList("queryTaskUsersByMenuId", menuId);
 	}
@@ -232,6 +238,7 @@ public class XmMenuService extends BaseService {
 		super.batchDelete(canDelList);
 		this.xmMenuStateService.batchSumParents(canDelList);
 	}
+
 	@Transactional
 	public void doBatchDeleteByProductIds(List<String> productIds) {
 		super.delete("doBatchDeleteByProductIds", productIds);
@@ -240,6 +247,7 @@ public class XmMenuService extends BaseService {
 
 	/**
 	 * 检查是否能删除干净所有儿子孙子节点。
+	 *
 	 * @param delNode  当前删除节点
 	 * @param delNodes 本批量需要删除的全部节点
 	 * @return
@@ -281,9 +289,10 @@ public class XmMenuService extends BaseService {
 		super.update("batchProductPhase", xmPhaseMenusVo);
 	}
 
-    public List<XmMenu> listTenMenuByIterationId(String iterationId) {
+	public List<XmMenu> listTenMenuByProductIdAndIterationId(String productId, String iterationId) {
 
-		return super.selectList("listTenMenuByIterationId",iterationId);
+		return super.selectList("listTenMenuByProductIdAndIterationId", map("productId", productId, "iterationId", iterationId));
 	}
+
 }
 

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

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

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

@@ -151,8 +151,8 @@
 			#{item}
 		</foreach>
 	</update>
-	<select id="listTenMenuByIterationId" parameterType="String" resultType="com.xm.core.entity.XmMenu">
-		select menu_name from xm_menu res where  res.iteration_id=#{iterationId}
+	<select id="listTenMenuByProductIdAndIterationId" parameterType="String" resultType="com.xm.core.entity.XmMenu">
+		select menu_name from xm_menu res where res.product_id=#{productId} and res.iteration_id=#{iterationId}
 		limit 10
 	</select>
 	<!--结束 自定义sql函数区域-->

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

@@ -316,14 +316,14 @@
 		group by p.id
 	</select>
 
-	<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')
+	<select id="listTenTaskByProjectIdAndIterationId" parameterType="HashMap" resultType="com.xm.core.entity.XmTask">
+		select name from xm_task res where res.project_id=#{projectId} and 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')
+	<select id="listTenTaskByProjectIdAndProductId" parameterType="HashMap" resultType="com.xm.core.entity.XmTask">
+		select name from xm_task res where res.project_id=#{projectId} and  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>