diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java index 39f8f423..284a97a6 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java @@ -139,7 +139,22 @@ public class XmTestPlanCaseController { m.put("tips", tips); return m; } + @ApiOperation( value = "查询测试用例规划到测试计划的数目",notes=" ") + @ApiResponses({ + @ApiResponse(code = 200,response=XmTestPlanCase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") + }) + @RequestMapping(value="/getXmTestCaseToPlanCalcList",method=RequestMethod.GET) + public Map getXmTestCaseToPlanCalcList( @ApiIgnore @RequestParam Map xmTestPlanCase){ + Map m = new HashMap<>(); + Tips tips=new Tips("查询成功"); + PageUtils.startPage(xmTestPlanCase); + List> xmTestPlanCaseList = xmTestPlanCaseService.getXmTestCaseToPlanCalcList(xmTestPlanCase); //列出XmTestPlanCase列表 + PageUtils.responePage(m, xmTestPlanCaseList); + m.put("data",xmTestPlanCaseList); + m.put("tips", tips); + return m; + } @ApiOperation( value = "新增一条测试计划与用例关系表信息",notes=" ") @ApiResponses({ diff --git a/xm-core/src/main/java/com/xm/core/service/XmTestPlanCaseService.java b/xm-core/src/main/java/com/xm/core/service/XmTestPlanCaseService.java index 2d82a16f..5911db02 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTestPlanCaseService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTestPlanCaseService.java @@ -34,5 +34,10 @@ public class XmTestPlanCaseService extends BaseService { return super.selectList("getXmTestDayTimesList",xmTestPlanCase); } + public List> getXmTestCaseToPlanCalcList(Map xmTestPlanCase) { + return super.selectList("getXmTestCaseToPlanCalcList",xmTestPlanCase); + + } + } diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanCaseMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanCaseMapper.xml index f0c210da..886ed3c8 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanCaseMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanCaseMapper.xml @@ -5,20 +5,30 @@ - - - and res.plan_id=#{planId} + + and (res.case_id, res.plan_id) in + + ( #{item.caseId}, #{item.planId}) + + + and c.case_name like concat('%',#{key},'%') + + + and exists( select 1 from xm_func f where f.pid_paths like concat(#{funcPidPathsLike},'%') and c.func_id=f.id) + + + and c.product_id=#{productId} - and p.casedb_id=#{casedbId} + and c.casedb_id=#{casedbId} - - and p.project_id=#{projectId} + + and c.iteration_id=#{linkIterationId} - - and p.product_id=#{productId} + + and c.pbranch_id=#{pbranchId} - + and res.plan_id=#{planId} @@ -87,6 +97,22 @@ order by res.exec_date asc + + +