From f1cd2bd101c2b631740acf14b879e32bf804caa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 26 Jan 2023 18:23:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E9=98=9F=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/dao/XmTestPlanCaseMapper.xml      | 33 +++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

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 2a7132bd..a486d334 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
@@ -31,15 +31,42 @@
 
 
 	<select id="getXmTestPlanCaseExecStatusDist" parameterType="HashMap"  resultType="HashMap">
-		select count(*) as total_cnt,res.exec_status from xm_test_plan_case res where  res.plan_id=#{planId}
+		select count(*) as total_cnt,res.exec_status from xm_test_plan_case res left join xm_test_plan p on res.plan_id=p.id
+		<where>
+			<if test="planId!=null and planId!=''">
+				and res.plan_id=#{planId}
+			</if>
+			<if test="casedbId!=null and casedbId!=''">
+				and p.casedb_id=#{casedbId}
+			</if>
+			<if test="projectId!=null and projectId!=''">
+				and p.porject_id=#{projectId}
+			</if>
+			<if test="productId!=null and productId!=''">
+				and p.product_id=#{productId}
+			</if>
+		</where>
 		group by res.exec_status
 	</select>
 
 	<select id="getXmTestPlanCaseUserDist" parameterType="HashMap"  resultType="HashMap">
 		select count(*) as total_cnt,sum(case when res.exec_status>='1' then 1 else 0 end) as had_exec,sum(case when res.exec_status='0' then 1 else 0 end) as not_exec
 		,res.exec_userid,max(res.exec_username) as exec_username
-		from xm_test_plan_case res where  res.plan_id=#{planId}
-
+		from xm_test_plan_case res left join xm_test_plan p on res.plan_id=p.id
+		<where>
+			<if test="planId!=null and planId!=''">
+				and res.plan_id=#{planId}
+			</if>
+			<if test="casedbId!=null and casedbId!=''">
+				and p.casedb_id=#{casedbId}
+			</if>
+			<if test="projectId!=null and projectId!=''">
+				and p.porject_id=#{projectId}
+			</if>
+			<if test="productId!=null and productId!=''">
+				and p.product_id=#{productId}
+			</if>
+		</where>
 		group by res.exec_userid
 
 	</select>