diff --git a/.idea/xm-backend.iml b/.idea/xm-backend.iml index 484eebc7..b738ec29 100644 --- a/.idea/xm-backend.iml +++ b/.idea/xm-backend.iml @@ -54,8 +54,15 @@ - + + + + + + + + @@ -94,11 +101,6 @@ - - - - - @@ -121,7 +123,6 @@ - diff --git a/xm-bootstrap/xm-bootstrap.iml b/xm-bootstrap/xm-bootstrap.iml index 85c23846..a484d779 100644 --- a/xm-bootstrap/xm-bootstrap.iml +++ b/xm-bootstrap/xm-bootstrap.iml @@ -98,7 +98,6 @@ - @@ -121,10 +120,6 @@ - - - - @@ -165,8 +160,15 @@ - + + + + + + + + @@ -209,7 +211,6 @@ - diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java index c0e3e617..f3e6142e 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java @@ -74,13 +74,25 @@ public class XmIterationController { }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmIteration( @RequestParam Map xmIteration){ - Map m = new HashMap<>(); + Map m = new HashMap<>(); + Tips tips=new Tips("查询成功"); RequestUtils.transformArray(xmIteration, "ids"); PageUtils.startPage(xmIteration); + String id= (String) xmIteration.get("id"); + Object ids= xmIteration.get("ids"); + String productId= (String) xmIteration.get("productId"); + String adminUserid= (String) xmIteration.get("adminUserid"); + String menuId= (String) xmIteration.get("menuId"); + User user = LoginUtils.getCurrentUserInfo(); + xmIteration.put("userid",user.getUserid()); + if( !(StringUtils.hasText(id) || StringUtils.hasText(productId)|| StringUtils.hasText(menuId)||ids!=null + || StringUtils.hasText(adminUserid) ) ){ + xmIteration.put("compete",user.getUserid()); + } List> xmIterationList = xmIterationService.selectListMapByWhere(xmIteration); //列出XmIteration列表 PageUtils.responePage(m, xmIterationList); m.put("data",xmIterationList); - Tips tips=new Tips("查询成功"); + m.put("tips", tips); return m; } @@ -94,6 +106,18 @@ public class XmIterationController { Map m = new HashMap<>(); RequestUtils.transformArray(xmIteration, "ids"); PageUtils.startPage(xmIteration); + + String id= (String) xmIteration.get("id"); + Object ids= xmIteration.get("ids"); + String productId= (String) xmIteration.get("productId"); + String adminUserid= (String) xmIteration.get("adminUserid"); + String menuId= (String) xmIteration.get("menuId"); + User user = LoginUtils.getCurrentUserInfo(); + xmIteration.put("userid",user.getUserid()); + if( !(StringUtils.hasText(id) || StringUtils.hasText(productId)|| StringUtils.hasText(menuId)||ids!=null + || StringUtils.hasText(adminUserid) ) ){ + xmIteration.put("compete",user.getUserid()); + } List> xmIterationList = xmIterationService.selectListMapByWhereWithState(xmIteration); //列出XmIteration列表 PageUtils.responePage(m, xmIterationList); m.put("data",xmIterationList); 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 73664eaa..875b1145 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 @@ -83,6 +83,21 @@ public class XmMenuController { RequestUtils.transformArray(xmMenu, "menuIds"); PageUtils.startPage(xmMenu); Tips tips=new Tips("查询成功"); + String menuId= (String) xmMenu.get("menuId"); + Object menuIds= xmMenu.get("menuIds"); + String projectId= (String) xmMenu.get("projectId"); + String mmUserid= (String) xmMenu.get("mmUserid"); + String pmenuId= (String) xmMenu.get("pmenuId"); + String productId= (String) xmMenu.get("productId"); + String excludeIterationId= (String) xmMenu.get("excludeIterationId"); + + User user = LoginUtils.getCurrentUserInfo(); + + xmMenu.put("userid",user.getUserid()); + if( !StringUtils.hasText(menuId) && !(StringUtils.hasText(projectId) || StringUtils.hasText(mmUserid)|| StringUtils.hasText(pmenuId)||menuIds!=null + || StringUtils.hasText(productId) || StringUtils.hasText(excludeIterationId) ) ){ + xmMenu.put("compete",user.getUserid()); + } List> xmMenuList = xmMenuService.selectListMapByWhereWithState(xmMenu); //列出XmMenu列表 PageUtils.responePage(m, xmMenuList); m.put("data",xmMenuList); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java index b1d59e92..868bd059 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java @@ -59,13 +59,39 @@ public class XmProductController { }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProduct( @RequestParam Map xmProduct){ - Map m = new HashMap<>(); + Map m = new HashMap<>(); + Tips tips=new Tips("查询成功"); RequestUtils.transformArray(xmProduct, "ids"); PageUtils.startPage(xmProduct); + String id= (String) xmProduct.get("id"); + Object ids= xmProduct.get("ids"); + String projectId= (String) xmProduct.get("projectId"); + String pmUserid= (String) xmProduct.get("pmUserid"); + String queryScope= (String) xmProduct.get("queryScope"); + User user = LoginUtils.getCurrentUserInfo(); + if("branchId".equals(queryScope)){ + xmProduct.put("branchId",user.getBranchId()); + }else if("compete".equals(queryScope)){ + xmProduct.put("branchId",null); + xmProduct.put("compete",user.getUserid()); + }else if("productId".equals(queryScope)){ + if(!StringUtils.hasText(id)){ + tips.setFailureMsg("产品编号id必输"); + m.put("tips", tips); + return m; + } + } + + xmProduct.put("userid",user.getUserid()); + if( !StringUtils.hasText(queryScope) && !(StringUtils.hasText(id) || StringUtils.hasText(projectId)|| StringUtils.hasText(pmUserid)||ids!=null + ||ids!=null ) ){ + xmProduct.put("compete",user.getUserid()); + } + List> xmProductList = xmProductService.selectListMapByWhere(xmProduct); //列出XmProduct列表 PageUtils.responePage(m, xmProductList); m.put("data",xmProductList); - Tips tips=new Tips("查询成功"); + m.put("tips", tips); return m; } @@ -75,13 +101,38 @@ public class XmProductController { }) @RequestMapping(value="/listWithState",method=RequestMethod.GET) public Map listWithState( @RequestParam Map xmProduct){ - Map m = new HashMap<>(); + Map m = new HashMap<>(); + Tips tips=new Tips("查询成功"); RequestUtils.transformArray(xmProduct, "ids"); PageUtils.startPage(xmProduct); + String id= (String) xmProduct.get("id"); + Object ids= xmProduct.get("ids"); + String projectId= (String) xmProduct.get("projectId"); + String pmUserid= (String) xmProduct.get("pmUserid"); + String queryScope= (String) xmProduct.get("queryScope"); + User user = LoginUtils.getCurrentUserInfo(); + if("branchId".equals(queryScope)){ + xmProduct.put("branchId",user.getBranchId()); + }else if("compete".equals(queryScope)){ + xmProduct.put("branchId",null); + xmProduct.put("compete",user.getUserid()); + }else if("productId".equals(queryScope)){ + if(!StringUtils.hasText(id)){ + tips.setFailureMsg("产品编号id必输"); + m.put("tips", tips); + return m; + } + } + + xmProduct.put("userid",user.getUserid()); + if( !StringUtils.hasText(queryScope) && !(StringUtils.hasText(id) || StringUtils.hasText(projectId)|| StringUtils.hasText(pmUserid)||ids!=null + ||ids!=null ) ){ + xmProduct.put("compete",user.getUserid()); + } List> xmProductList = xmProductService.selectListMapByWhereWithState(xmProduct); //列出XmProduct列表 PageUtils.responePage(m, xmProductList); m.put("data",xmProductList); - Tips tips=new Tips("查询成功"); + m.put("tips", tips); return m; } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java index a3891b4f..7f9aec45 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java @@ -82,6 +82,20 @@ public class XmProjectController { RequestUtils.transformArray(xmProject, "ids"); RequestUtils.transformArray(xmProject, "pgTypeIds"); PageUtils.startPage(xmProject); + String id= (String) xmProject.get("id"); + Object ids= xmProject.get("ids"); + String productId= (String) xmProject.get("productId"); + String myFocus= (String) xmProject.get("myFocus"); + String myExecuserStatus= (String) xmProject.get("myExecuserStatus"); + Object pgTypeIds= xmProject.get("pgTypeIds"); + String createUserid= (String) xmProject.get("createUserid"); + User user = LoginUtils.getCurrentUserInfo(); + xmProject.put("userid",user.getUserid()); + if( !(StringUtils.hasText(id) || StringUtils.hasText(myFocus)|| StringUtils.hasText(productId)||ids!=null + || StringUtils.hasText(myExecuserStatus)||pgTypeIds!=null|| StringUtils.hasText(createUserid)) ){ + + xmProject.put("compete",user.getUserid()); + } List> xmProjectList = xmProjectService.getProject(xmProject); //列出XmProject列表 PageUtils.responePage(m, xmProjectList); m.put("data",xmProjectList); 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 5f77457e..5d35aeb2 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 @@ -99,7 +99,11 @@ public class XmQuestionController { public Map listXmQuestion( @RequestParam Map xmQuestion){ Map m = new HashMap<>(); RequestUtils.transformArray(xmQuestion, "ids"); + RequestUtils.transformArray(xmQuestion, "menuIds"); PageUtils.startPage(xmQuestion); + User user = LoginUtils.getCurrentUserInfo(); + xmQuestion.put("compete",user.getUserid()); + List> xmQuestionList = xmQuestionService.getQuestion(xmQuestion); //列出XmQuestion列表 PageUtils.responePage(m, xmQuestionList); m.put("data",xmQuestionList); @@ -120,6 +124,11 @@ public class XmQuestionController { Map m = new HashMap<>(); Tips tips=new Tips("成功新增一条数据"); try{ + if(StringUtils.hasText(xmQuestionVo.getProjectId())){ + tips.setFailureMsg("项目编号projectId必传"); + m.put("tips", tips); + return m; + } User user=LoginUtils.getCurrentUserInfo(); if(!StringUtils.hasText(xmQuestionVo.getQtype())){ xmQuestionVo.setQtype("bug"); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index 8646ceee..97d61907 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -117,10 +117,21 @@ public class XmTaskController { if(!"1".equals(taskOut)){ String projectId= (String) xmTask.get("projectId"); String projectPhaseId= (String) xmTask.get("projectPhaseId"); - String userid= (String) xmTask.get("userid"); - if( !(StringUtils.hasText(projectId) || StringUtils.hasText(projectPhaseId)|| StringUtils.hasText(userid) ) ){ - User user = LoginUtils.getCurrentUserInfo(); - xmTask.put("cbranchId",user.getBranchId()); + String myExecuserStatus= (String) xmTask.get("myExecuserStatus"); + String isMy= (String) xmTask.get("isMy"); + String myFocus= (String) xmTask.get("myFocus"); + String createUserid= (String) xmTask.get("createUserid"); + String executorUserid= (String) xmTask.get("executorUserid"); + String menuId= (String) xmTask.get("menuId"); + String productId= (String) xmTask.get("productId"); + String iterationId= (String) xmTask.get("iterationId"); + User user = LoginUtils.getCurrentUserInfo(); + xmTask.put("userid",user.getUserid()); + if( !(StringUtils.hasText(projectId) || StringUtils.hasText(projectPhaseId) + || StringUtils.hasText(myExecuserStatus)|| StringUtils.hasText(isMy)|| StringUtils.hasText(myFocus)|| StringUtils.hasText(createUserid) + || StringUtils.hasText(executorUserid) || StringUtils.hasText(menuId) || StringUtils.hasText(productId)|| StringUtils.hasText(iterationId)) ){ + + xmTask.put("compete",user.getUserid()); } } List> xmTaskVoList = xmTaskService.getTask(xmTask); //列出XmTask列表 diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java index 82dc28e5..3b4444d0 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java @@ -79,13 +79,7 @@ public class XmProjectService extends BaseService { /** 请在此类添加自定义函数 */ public List> getProject(Map params) { - List> xmProjectList = null; - if(params.containsKey("compete")){ - params.put("userid", LoginUtils.getCurrentUserInfo().getUserid()); - xmProjectList = this.selectListMapByWhere(params); - }else{ - xmProjectList = this.selectListMapByWhere(params); //列出XmProject列表 - } + List> xmProjectList = this.selectListMapByWhere(params); //列出XmProject列表 return xmProjectList; } diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml index 1fba804c..d94b063c 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml @@ -20,14 +20,19 @@ - and exists ( select 1 from XM.xm_iteration_menu im where im.iteration_id=res.id and im.product_id=#{productId} and im.menu_id=#{menuId} ) - - + + + and ( res.admin_userid=#{compete} + or exists (select 1 from XM.xm_iteration_menu im left join xm.xm_menu m on im.product_id=m.product_id where m.mm_userid=#{compete} and im.iteration_id=res.id) + ) + + + and res.iteration_name like #{key} @@ -45,14 +50,19 @@ - + and exists ( select 1 from XM.xm_iteration_menu im where im.iteration_id=res.id and im.product_id=#{productId} and im.menu_id=#{menuId} ) - - + + + and ( res.admin_userid=#{compete} + or exists (select 1 from XM.xm_iteration_menu im left join xm.xm_menu m on im.product_id=m.product_id where m.mm_userid=#{compete} and im.iteration_id=res.id) + ) + + and res.iteration_name like #{key} 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 c5b5b467..2301dd13 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 @@ -28,9 +28,14 @@ - + and not exists ( select 1 from XM.xm_iteration_menu im where im.iteration_id=#{excludeIterationId} and im.menu_id=res.menu_id) - + + and ( exists ( select 1 from XM.xm_menu m1 where m.mm_userid=#{compete} and m.product_id=res.product_id) + or exists ( select 1 from xm_product p where p.pm_userid=#{compete} and res.product_id=p.id) + ) + + and res.menu_name like #{key} order by res.seq_no asc @@ -47,7 +52,12 @@ and plan.project_id=#{projectId} and not exists ( select 1 from XM.xm_iteration_menu im where im.iteration_id=#{excludeIterationId} and im.menu_id=res.menu_id) - + + and ( exists ( select 1 from XM.xm_menu m1 where m.mm_userid=#{compete} and m.product_id=res.product_id) + or exists ( select 1 from xm_product p where p.pm_userid=#{compete} and res.product_id=p.id) + ) + + and res.menu_name like #{key} order by res.seq_no asc diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml index a4491e21..cbaf1880 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml @@ -16,9 +16,14 @@ - - and exists (select 1 from XM.xm_task t left join XM.xm_menu m on t.menu_id=m.menu_id and t.project_id=#{projectId} where t.project_id=#{projectId} and m.product_id=res.id) - + and exists (select 1 from XM.xm_task t left join XM.xm_menu m on t.menu_id=m.menu_id and t.project_id=#{projectId} where t.project_id=#{projectId} and m.product_id=res.id) + + and ( exists ( select 1 from xm_project_group_user gu inner join XM.xm_task t on gu.project_id=t.project_id and t.product_id=res.id where gu.userid=#{compete} and t.product_id=res.id ) + or res.pm_userid=#{compete} + or exists ( select 1 from xm_menu m where m.mm_userid=#{compete} and m.product_id=res.id) + ) + + and res.product_name like #{key} @@ -37,9 +42,14 @@ - - and exists (select 1 from XM.xm_task t left join XM.xm_menu m on t.menu_id=m.menu_id and t.project_id=#{projectId} where t.project_id=#{projectId} and m.product_id=res.id) - + and res.product_name like #{key} + and exists (select 1 from XM.xm_task t left join XM.xm_menu m on t.menu_id=m.menu_id and t.project_id=#{projectId} where t.project_id=#{projectId} and m.product_id=res.id) + + and ( exists ( select 1 from xm_project_group_user gu inner join XM.xm_task t on gu.project_id=t.project_id and t.product_id=res.id where gu.userid=#{compete} and t.product_id=res.id ) + or res.pm_userid=#{compete} + or exists ( select 1 from xm_menu m where m.mm_userid=#{compete} and m.product_id=res.id) + ) + diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml index 1bcec508..22c9fee2 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml @@ -85,8 +85,8 @@ and ( exists ( select 1 from XM.xm_project_group g,XM.xm_project_group_user gu where gu.group_id=g.id and gu.userid=#{userid} and g.project_id=res.id ) - or res.create_userid=#{userid} - or exists ( select 1 from XM.xm_task_execuser exe where exe.project_id=res.id and exe.userid=#{userid} ) + or res.create_userid=#{compete} + or exists ( select 1 from XM.xm_task_execuser exe where exe.project_id=res.id and exe.userid=#{compete} ) ) @@ -110,9 +110,9 @@ and exists ( select 1 from XM.xm_my_focus f where f.userid=#{userid} and f.project_id=res.id ) - and exists ( select 1 from XM.xm_task t left join XM.xm_menu m on t.menu_id=m.menu_id and m.product_id=#{productId} where m.product_id=#{productId} and t.project_id=res.id) - + + and res.name like #{key} diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml index 5cf0d794..33a53210 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml @@ -68,8 +68,18 @@ - - and res.status != '已解决' + and ( res.create_userid=#{myUserid} or res.handler_userid=#{myUserid}) + and + res.menu_id in + + #{item} + + + + and exists ( select 1 from xm_project_group_user gu where gu.userid=#{compete} and gu.project_id=res.project_id ) + + and res.name like #{key} + and res.status != 'resolved' 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 6ddd7e5c..2b45998a 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 @@ -121,8 +121,6 @@ - and res.name like #{key} - and res.rate != '100' and (res.parent_taskid = '' or res.parent_taskid IS NULL) @@ -144,6 +142,14 @@ ) + + and ( exists ( select 1 from xm_project_group_user gu where gu.userid=#{compete} and gu.project_id=res.project_id ) + or exists ( select 1 from XM.xm_task_execuser exe where exe.project_id=res.project_id and exe.userid=#{compete}) + ) + + + and res.name like #{key} + and res.rate != '100' order by res.sort_level asc diff --git a/xm-core/xm-core.iml b/xm-core/xm-core.iml index e2bb0e8a..3a163e06 100644 --- a/xm-core/xm-core.iml +++ b/xm-core/xm-core.iml @@ -13,11 +13,6 @@ - - - - - @@ -33,11 +28,19 @@ - + + + + + + + + + @@ -98,7 +101,6 @@ - @@ -124,7 +126,6 @@ -