From 1735105beb4dec871af5dabe419833e1e423c45f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Thu, 24 Feb 2022 17:57:27 +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 --- .../core/ctrl/XmIterationMenuController.java | 29 +++++++++++++++++++ .../mapper/xm/core/dao/XmMenuMapper.xml | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) 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 a5e52797..223cc6b2 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 @@ -48,6 +48,31 @@ public class XmIterationMenuController { @Autowired XmMenuService xmMenuService; + @Autowired + XmMenuController xmMenuController; + + @ApiOperation( value = "查询迭代定义信息列表",notes="listXmIterationMenu,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}") + @ApiImplicitParams({ + @ApiImplicitParam(name="id",value="主键,主键",required=false), + @ApiImplicitParam(name="iterationId",value="对应的迭代编号",required=false), + @ApiImplicitParam(name="menuId",value="需求编号",required=false), + @ApiImplicitParam(name="productId",value="产品编号",required=false), + @ApiImplicitParam(name="ctime",value="关联时间",required=false), + @ApiImplicitParam(name="relStatus",value="关联状态0不再关联1正常关联",required=false), + @ApiImplicitParam(name="pageSize",value="每页记录数",required=false), + @ApiImplicitParam(name="currentPage",value="当前页码,从1开始",required=false), + @ApiImplicitParam(name="total",value="总记录数,服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算",required=false), + @ApiImplicitParam(name="orderFields",value="排序列 如性别、学生编号排序 ['sex','studentId']",required=false), + @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) + }) + @ApiResponses({ + @ApiResponse(code = 200,response= Map.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + }) + @RequestMapping(value="/list",method=RequestMethod.GET) + public Map listXmIterationMenu( @RequestParam Map xmIterationMenu){ + return xmMenuController.listWithState(xmIterationMenu); + } + @ApiOperation( value = "删除一条迭代定义信息",notes="delXmIterationMenu,仅需要上传主键字段") @ApiResponses({ @@ -88,10 +113,12 @@ public class XmIterationMenuController { if(menus==null || menus.size()==0){ return ResponseHelper.failed("menus-0","需求已不存在"); } + /** String productId=menus.get(0).getProductId(); if(menus.stream().filter(i->!productId.equals(i.getProductId())).findAny().isPresent()){ return ResponseHelper.failed("productId-0","批量操作的需求必须是同一个产品下的需求。"); } + **/ List notJoins=new ArrayList<>(); List status7=new ArrayList<>(); List canDels=new ArrayList<>(); @@ -150,10 +177,12 @@ public class XmIterationMenuController { if(menus==null || menus.size()==0){ return ResponseHelper.failed("menus-0","需求已不存在"); } + /** String productId=menus.get(0).getProductId(); if(menus.stream().filter(i->!productId.equals(i.getProductId())).findAny().isPresent()){ return ResponseHelper.failed("productId-0","批量操作的需求必须是同一个产品下的需求。"); } + **/ List hadJoin=new ArrayList<>(); List ntype1=new ArrayList<>(); List status789=new ArrayList<>(); 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 e63244d9..a52dd4ec 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 @@ -23,7 +23,7 @@ and (res.iteration_id is null or res.iteration_id ='') - and res.iteration_id is not null and res.iteration_id !='' + and res.iteration_id is not null and res.iteration_id !='' and not