From 5c0f5e3875f9a575eb37efc7377a985875682b7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 20 Feb 2023 15:14:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8E=AF=E5=A2=83=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/xm/core/entity/XmTestPlanCase.java  | 5 +----
 .../mybatis/mapper/xm/core/dao/XmTestPlanCaseMapper.xml   | 8 ++------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTestPlanCase.java b/xm-core/src/main/java/com/xm/core/entity/XmTestPlanCase.java
index 18940346..6ebb80cf 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmTestPlanCase.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmTestPlanCase.java
@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmTestPlanCase所有属性名: <br>
- *	"bugs","bug数目","execUserid","执行人","caseId","测试用例编号","ltime","更新时间","ctime","创建时间","execStatus","0-未测，1-通过，2-受阻，3-忽略，4-失败","execUsername","执行人姓名","priority","优先级","remark","执行备注","testStep","测试步骤","planId","计划编号","projectId","项目编号","budgetWorkload","预算工时","actWorkload","实际工时","initWorkload","原估工时","execDate","执行日期，以执行状态变更日期为准yyyy-MM-dd型","execType","执行类型0-手工，1-自动化","productId","归属产品";<br>
+ *	"bugs","bug数目","execUserid","执行人","caseId","测试用例编号","ltime","更新时间","ctime","创建时间","execStatus","0-未测，1-通过，2-受阻，3-忽略，4-失败","execUsername","执行人姓名","priority","优先级","remark","执行备注","testStep","测试步骤","planId","计划编号","projectId","项目编号","budgetWorkload","预算工时","actWorkload","实际工时","initWorkload","原估工时","execDate","执行日期，以执行状态变更日期为准yyyy-MM-dd型","productId","归属产品";<br>
  * 当前主键(包括多主键):<br>
  *	case_id,plan_id;<br>
  */
@@ -68,9 +68,6 @@ public class XmTestPlanCase  implements java.io.Serializable {
 	@ApiModelProperty(notes="执行日期，以执行状态变更日期为准yyyy-MM-dd型",allowEmptyValue=true,example="",allowableValues="")
 	String execDate;
 	
-	@ApiModelProperty(notes="执行类型0-手工，1-自动化",allowEmptyValue=true,example="",allowableValues="")
-	String execType;
-	
 	@ApiModelProperty(notes="归属产品",allowEmptyValue=true,example="",allowableValues="")
 	String productId;
 
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 e7608af4..5aaf66f0 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
@@ -199,7 +199,7 @@
 		insert into xm_test_plan_case(
 			<include refid="columns"/>
 		) values (
-		#{bugs},#{execUserid},#{caseId},#{ltime},#{ctime},#{execStatus},#{execUsername},#{priority},#{remark},#{testStep},#{planId},#{projectId},#{budgetWorkload},#{actWorkload},#{initWorkload},#{execDate},#{execType},#{productId}
+		#{bugs},#{execUserid},#{caseId},#{ltime},#{ctime},#{execStatus},#{execUsername},#{priority},#{remark},#{testStep},#{planId},#{projectId},#{budgetWorkload},#{actWorkload},#{initWorkload},#{execDate},#{productId}
 		)
 	</insert>
 	
@@ -274,7 +274,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		bugs,exec_userid,case_id,ltime,ctime,exec_status,exec_username,priority,remark,test_step,plan_id,project_id,budget_workload,act_workload,init_workload,exec_date,exec_type,product_id
+		bugs,exec_userid,case_id,ltime,ctime,exec_status,exec_username,priority,remark,test_step,plan_id,project_id,budget_workload,act_workload,init_workload,exec_date,product_id
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -295,7 +295,6 @@
 		<if test="actWorkload != null and actWorkload != ''">      and res.act_workload = #{actWorkload}     </if>
 		<if test="initWorkload != null and initWorkload != ''">      and res.init_workload = #{initWorkload}     </if>
 		<if test="execDate != null and execDate != ''">      and res.exec_date = #{execDate}     </if>
-		<if test="execType != null and execType != ''">      and res.exec_type = #{execType}     </if>
 		<if test="productId != null and productId != ''">      and res.product_id = #{productId}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
@@ -314,7 +313,6 @@
 		act_workload = #{actWorkload},
 		init_workload = #{initWorkload},
 		exec_date = #{execDate},
-		exec_type = #{execType},
 		product_id = #{productId}
 	</sql>
 	<sql id="someFieldSet">
@@ -332,7 +330,6 @@
 		<if test="actWorkload != null and actWorkload != ''"> act_workload = #{actWorkload},     </if>
 		<if test="initWorkload != null and initWorkload != ''"> init_workload = #{initWorkload},     </if>
 		<if test="execDate != null and execDate != ''"> exec_date = #{execDate},     </if>
-		<if test="execType != null and execType != ''"> exec_type = #{execType},     </if>
 		<if test="productId != null and productId != ''"> product_id = #{productId},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
@@ -351,7 +348,6 @@
 			act_workload = #{item.actWorkload},
 			init_workload = #{item.initWorkload},
 			exec_date = #{item.execDate},
-			exec_type = #{item.execType},
 			product_id = #{item.productId}
 	</sql>
 </mapper>
\ No newline at end of file