From c7061914b9aaba73b20b28dc37e535910e0bcaf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 14 Jun 2021 02:57:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E3=80=81?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=89=A7=E8=A1=8C=E5=A2=9E=E5=8A=A0=E6=8C=89?= =?UTF-8?q?=E6=95=85=E4=BA=8B=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E3=80=81?= =?UTF-8?q?=E6=8C=89=E4=BA=A7=E5=93=81=E6=9F=A5=E8=AF=A2=E3=80=81=E6=8C=89?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xm/core/ctrl/XmTestCaseController.java | 8 ++++---- .../mybatis/mapper/xm/core/dao/XmTestCaseExecMapper.xml | 3 +++ .../mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml | 6 +++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java index 65d3abe5..1f12ae68 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.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.XmTestCase; import com.xm.core.service.XmTestCaseService; import io.swagger.annotations.*; @@ -80,10 +81,9 @@ public class XmTestCaseController { 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; + String projectId= (String) xmTestCase.get("projectId"); + if( !( StringUtils.hasText(id) || StringUtils.hasText(menuId) || StringUtils.hasText(productId)|| StringUtils.hasText(projectId)||menuIds!=null||ids!=null ) ){ + xmTestCase.put("compete", LoginUtils.getCurrentUserInfo().getUserid()); } List> xmTestCaseList = xmTestCaseService.selectListMapByWhere(xmTestCase); //列出XmTestCase列表 PageUtils.responePage(m, xmTestCaseList); diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseExecMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseExecMapper.xml index 33126119..a822ffa1 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseExecMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseExecMapper.xml @@ -33,6 +33,9 @@ #{item} + and res.project_id = #{projectId} + and res.create_time > #{createTimeStart} + and res.create_time < #{createTimeEnd} and res.menu_id in diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml index 81c36535..07cf1979 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml @@ -22,14 +22,18 @@ #{item} - + and res.ctime > #{ctimeStart} + and res.ctime < #{ctimeTimeEnd} + + and (res.luserid=#{compete} or res.cuserid=#{compete}) and res.menu_id in #{item} + and exists ( select 1 from xm.xm_test_case_exec c where c.case_id=res.id and c.project_id=#{projectId} ) and exists( select 1 from xm.xm_menu m where m.menu_id =res.menu_id and m.product_id=#{productId}) and res.case_name like #{key}