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

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

@@ -81,8 +81,9 @@ public class XmTestCaseController {
 		Object ids=  xmTestCase.get("ids");
 		Object menuIds=  xmTestCase.get("menuIds");
 		String productId= (String) xmTestCase.get("productId");
+		String myUserid= (String) xmTestCase.get("myUserid");
 		String projectId= (String) xmTestCase.get("projectId");
-		if(   !( StringUtils.hasText(id) || StringUtils.hasText(menuId) || StringUtils.hasText(productId)|| StringUtils.hasText(projectId)||menuIds!=null||ids!=null  ) ){
+		if(   !( StringUtils.hasText(myUserid) ||StringUtils.hasText(id) || StringUtils.hasText(menuId) || StringUtils.hasText(productId)|| StringUtils.hasText(projectId)||menuIds!=null||ids!=null  ) ){
 			xmTestCase.put("compete", LoginUtils.getCurrentUserInfo().getUserid());
 		}
 		List<Map<String,Object>>	xmTestCaseList = xmTestCaseService.selectListMapByWhere(xmTestCase);	//列出XmTestCase列表

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

@@ -67,7 +67,10 @@
 				        #{item}  
 				    </foreach>  
 			 </if>
+			<if test=" createTimeStart !=null "> and res.create_time &gt; #{createTimeStart} </if>
+			<if test=" createTimeEnd !=null "> and res.create_time &lt; #{createTimeEnd} </if>
 			<include refid="where"/>
+			<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="myUserid != null and myUserid != ''"> and ( res.create_userid=#{myUserid} or res.handler_userid=#{myUserid}) </if>
 			<if test="menuIds != null">  and
 				res.menu_id in

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

@@ -26,6 +26,7 @@
 			<if test=" ctimeStart !=null "> and res.ctime &gt; #{ctimeStart} </if>
 			<if test=" ctimeTimeEnd !=null "> and res.ctime &lt; #{ctimeTimeEnd} </if>
 			<include refid="where"/>
+			<if test=" myUserid!=null and myUserid!='' "> and (res.luserid=#{myUserid} or res.cuserid=#{myUserid})</if>
 			<if test=" compete!=null and compete!='' "> and (res.luserid=#{compete} or res.cuserid=#{compete})</if>
 			<if test="menuIds != null">  and
 				res.menu_id in