From 4ad8cbfd580aea9eb50e761dd33ff6129784afaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 11 Mar 2022 18:34:26 +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/XmIterationLinkController.java | 4 ++-- .../xm/core/ctrl/XmProductProjectLinkController.java | 12 ++++++++++-- .../main/java/com/xm/core/service/XmMenuService.java | 4 ++-- .../main/java/com/xm/core/service/XmTaskService.java | 8 ++++++-- .../mybatis/mapper/xm/core/dao/XmMenuMapper.xml | 2 +- .../mybatis/mapper/xm/core/dao/XmTaskMapper.xml | 8 +++++++- 6 files changed, 28 insertions(+), 10 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationLinkController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationLinkController.java index c3d0a62e..0e711b29 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationLinkController.java +++ b/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 menus= xmMenuService.listTenMenuByIteration(xmIterationLink.getIterationId()); + List 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 tasks= xmTaskService.listTenTaskByIteration(xmIterationLink.getIterationId()); + List 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(","))+"】"); } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductProjectLinkController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductProjectLinkController.java index 1f01bcf7..aaa9750b 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductProjectLinkController.java +++ b/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; @@ -56,8 +59,9 @@ public class XmProductProjectLinkController { private XmProductProjectLinkService xmProductProjectLinkService; @Autowired XmGroupService xmGroupService; - - + + @Autowired + XmTaskService xmTaskService; @ApiOperation( value = "查询产品与项目的关联关系表，一般由产品经理挂接项目到产品上信息列表",notes=" ") @ApiResponses({ @@ -142,6 +146,10 @@ public class XmProductProjectLinkController { return ResponseHelper.failed("not-pm","您不是项目管理人员、也不是产品管理人员，无权取消关联"); } }; + List 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(); diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuService.java index 9a67982a..8194d622 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmMenuService.java +++ b/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 listTenMenuByIteration(String iterationId) { + public List listTenMenuByIterationId(String iterationId) { - return super.selectList("listTenMenuByIteration",iterationId); + return super.selectList("listTenMenuByIterationId",iterationId); } } diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java index 83b8e1a9..5e47796b 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java @@ -697,8 +697,12 @@ public class XmTaskService extends BaseService { return tips; } - public List listTenTaskByIteration(String iterationId) { - return super.selectList("listTenTaskByIteration",iterationId); + public List listTenTaskByIterationId(String iterationId) { + return super.selectList("listTenTaskByIterationId",iterationId); + } + + public List listTenTaskByProductId(String productId) { + return super.selectList("listTenTaskByProductId",productId); } } 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 89603808..dd2810cd 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 @@ -151,7 +151,7 @@ #{item} - select menu_name from xm_menu res where res.iteration_id=#{iterationId} limit 10 diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml index e07ac674..e27fc61f 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml @@ -316,11 +316,17 @@ group by p.id - 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 + +