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

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

@@ -73,6 +73,7 @@ public class XmTestCaseController {
 		Map<String,Object> m = new HashMap<>();
 		Tips tips=new Tips("查询成功");
 		RequestUtils.transformArray(xmTestCase, "ids");
+		RequestUtils.transformArray(xmTestCase, "menuIds");
 		PageUtils.startPage(xmTestCase);
 		String id= (String) xmTestCase.get("id");
 		String menuId= (String) xmTestCase.get("menuId");

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

@@ -5,6 +5,7 @@ import com.mdp.core.err.BizException;
 import com.mdp.core.utils.RequestUtils;
 import com.mdp.mybatis.PageUtils;
 import com.mdp.qx.HasQx;
+import com.mdp.safe.client.utils.LoginUtils;
 import com.xm.core.entity.XmTestCaseExec;
 import com.xm.core.service.XmTestCaseExecService;
 import io.swagger.annotations.*;
@@ -77,6 +78,7 @@ public class XmTestCaseExecController {
 	public Map<String,Object> listXmTestCaseExec( @RequestParam Map<String,Object> xmTestCaseExec){
 		Map<String,Object> m = new HashMap<>(); 
 		RequestUtils.transformArray(xmTestCaseExec, "ids");
+		RequestUtils.transformArray(xmTestCaseExec, "menuIds");
 		PageUtils.startPage(xmTestCaseExec);
 		Tips tips=new Tips("查询成功");
 		String id= (String) xmTestCaseExec.get("id");
@@ -87,9 +89,7 @@ public class XmTestCaseExecController {
 		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;
+			xmTestCaseExec.put("compete", LoginUtils.getCurrentUserInfo().getUserid());
 		}
 		List<Map<String,Object>>	xmTestCaseExecList = xmTestCaseExecService.selectListMapByWhere(xmTestCaseExec);	//列出XmTestCaseExec列表
 		PageUtils.responePage(m, xmTestCaseExecList);

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

@@ -40,6 +40,9 @@
 					#{item}
 				</foreach>
 			</if>
+			<if test="compete !=null and compete!=''">
+				and exists ( select 1 from xm_project_group_user gu where gu.userid=#{compete} and gu.project_id=res.project_id )
+			</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>