测试用例、测试执行增加按故事列表查询、按产品查询、按项目查询条件

xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java

@@ -71,12 +71,23 @@ public class XmTestCaseController {
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmTestCase( @RequestParam Map<String,Object> xmTestCase){
 		Map<String,Object> m = new HashMap<>();
+		Tips tips=new Tips("查询成功");
 		RequestUtils.transformArray(xmTestCase, "ids");
 		PageUtils.startPage(xmTestCase);
+		String id= (String) xmTestCase.get("id");
+		String menuId= (String) xmTestCase.get("menuId");
+		Object ids=  xmTestCase.get("ids");
+		Object menuIds=  xmTestCase.get("menuIds");
+		String productId= (String) xmTestCase.get("productId");
+		if(   !( StringUtils.hasText(id) || StringUtils.hasText(menuId) || StringUtils.hasText(productId)||menuIds!=null||ids!=null  ) ){
+			tips.setFailureMsg("产品编号productId或者故事编号列表menuIds或者故事编号menuId必传");
+			m.put("tips", tips);
+			return m;
+		}
 		List<Map<String,Object>>	xmTestCaseList = xmTestCaseService.selectListMapByWhere(xmTestCase);	//列出XmTestCase列表
 		PageUtils.responePage(m, xmTestCaseList);
 		m.put("data",xmTestCaseList);
-		Tips tips=new Tips("查询成功");
+
 		m.put("tips", tips);
 		return m;
 	}

xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseExecController.java

@@ -78,10 +78,23 @@ public class XmTestCaseExecController {
 		Map<String,Object> m = new HashMap<>(); 
 		RequestUtils.transformArray(xmTestCaseExec, "ids");
 		PageUtils.startPage(xmTestCaseExec);
+		Tips tips=new Tips("查询成功");
+		String id= (String) xmTestCaseExec.get("id");
+		String menuId= (String) xmTestCaseExec.get("menuId");
+		Object ids=  xmTestCaseExec.get("ids");
+		Object menuIds=  xmTestCaseExec.get("menuIds");
+		String projectId= (String) xmTestCaseExec.get("projectId");
+		String productId= (String) xmTestCaseExec.get("productId");
+		String caseId= (String) xmTestCaseExec.get("caseId");
+		if(   !( StringUtils.hasText(caseId)||StringUtils.hasText(id) || StringUtils.hasText(menuId) || StringUtils.hasText(projectId)|| StringUtils.hasText(productId)||menuIds!=null||ids!=null  ) ){
+			tips.setFailureMsg("产品编号productId、故事编号列表menuIds、故事编号menuId、项目编号projectId、测试用例编号caseId必传任意一个");
+			m.put("tips", tips);
+			return m;
+		}
 		List<Map<String,Object>>	xmTestCaseExecList = xmTestCaseExecService.selectListMapByWhere(xmTestCaseExec);	//列出XmTestCaseExec列表
 		PageUtils.responePage(m, xmTestCaseExecList);
 		m.put("data",xmTestCaseExecList);
-		Tips tips=new Tips("查询成功");
+
 		m.put("tips", tips);
 		return m;
 	}

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

@@ -34,7 +34,15 @@
 				    </foreach>  
 			 </if>
 			<include refid="where"/>
+			<if test="menuIds != null">  and
+				res.menu_id in
+				<foreach collection="menuIds" item="item" index="index" open="(" separator="," close=")" >
+					#{item}
+				</foreach>
+			</if>
+			<if test="productId != null and productId !='' ">    and exists( select 1 from xm.xm_menu m where m.menu_id =res.menu_id and m.product_id=#{productId})  </if>
 			<if test="key != null and key !='' ">    and res.case_name like #{key}   </if>
+
 		</where>
 	</select>
 	

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

@@ -23,6 +23,14 @@
 				    </foreach>  
 			 </if>
 			<include refid="where"/>
+
+			<if test="menuIds != null">  and
+				res.menu_id in
+				<foreach collection="menuIds" item="item" index="index" open="(" separator="," close=")" >
+					#{item}
+				</foreach>
+			</if>
+			<if test="productId != null and productId !='' ">    and exists( select 1 from xm.xm_menu m where m.menu_id =res.menu_id and m.product_id=#{productId})  </if>
 			<if test="key != null and key !='' ">   and res.case_name like #{key}    </if>
 		</where>
 	</select>