From 6509a021f460c2a3c36212dd0f0eebdf37d7f841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 4 Feb 2023 16:50:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/xm/core/entity/XmRptConfig.java    |  5 ++++-
 .../mybatis/mapper/xm/core/dao/XmRptConfigMapper.xml | 12 ++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/entity/XmRptConfig.java b/xm-core/src/main/java/com/xm/core/entity/XmRptConfig.java
index a670c084..90424cf5 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmRptConfig.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmRptConfig.java
@@ -8,7 +8,7 @@ import java.util.Date;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmRptConfig所有属性名: <br>
- *	"bizId","业务编号","id","报告编号","name","报告名称","cuserid","创建人","cusername","创建人姓名","ctime","创建时间","cbranchId","创建机构","cfg","报告配置项";<br>
+ *	"bizId","业务编号","id","报告编号","name","报告名称","cuserid","创建人","cusername","创建人姓名","ctime","创建时间","cbranchId","创建机构","cfg","报告配置项","bizType","业务类型1-产品报告，2-迭代报告，3-测试计划报告，4-项目报告，5-企业报告，6-测试库报告";<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -42,6 +42,9 @@ public class XmRptConfig  implements java.io.Serializable {
 	
 	@ApiModelProperty(notes="报告配置项",allowEmptyValue=true,example="",allowableValues="")
 	String cfg;
+	
+	@ApiModelProperty(notes="业务类型1-产品报告，2-迭代报告，3-测试计划报告，4-项目报告，5-企业报告，6-测试库报告",allowEmptyValue=true,example="",allowableValues="")
+	String bizType;
 
 	/**
 	 *报告编号
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmRptConfigMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmRptConfigMapper.xml
index d0d14c15..8417bbf2 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmRptConfigMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmRptConfigMapper.xml
@@ -67,7 +67,7 @@
 		insert into xm_rpt_config(
 			<include refid="columns"/>
 		) values (
-		#{bizId},#{id},#{name},#{cuserid},#{cusername},#{ctime},#{cbranchId},#{cfg}
+		#{bizId},#{id},#{name},#{cuserid},#{cusername},#{ctime},#{cbranchId},#{cfg},#{bizType}
 		)
 	</insert>
 	
@@ -142,7 +142,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		biz_id,id,name,cuserid,cusername,ctime,cbranch_id,cfg
+		biz_id,id,name,cuserid,cusername,ctime,cbranch_id,cfg,biz_type
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -155,6 +155,7 @@
 		<if test="ctime != null">      and date_format(res.ctime,'%Y-%m-%d') = date_format(#{ctime},'%Y-%m-%d')     </if>
 		<if test="cbranchId != null and cbranchId != ''">      and res.cbranch_id = #{cbranchId}     </if>
 		<if test="cfg != null and cfg != ''">      and res.cfg = #{cfg}     </if>
+		<if test="bizType != null and bizType != ''">      and res.biz_type = #{bizType}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -164,7 +165,8 @@
 		cusername = #{cusername},
 		ctime = #{ctime},
 		cbranch_id = #{cbranchId},
-		cfg = #{cfg}
+		cfg = #{cfg},
+		biz_type = #{bizType}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="bizId != null and bizId != ''"> biz_id = #{bizId},     </if>
@@ -174,6 +176,7 @@
 		<if test="ctime != null"> ctime = #{ctime},     </if>
 		<if test="cbranchId != null and cbranchId != ''"> cbranch_id = #{cbranchId},     </if>
 		<if test="cfg != null and cfg != ''"> cfg = #{cfg},     </if>
+		<if test="bizType != null and bizType != ''"> biz_type = #{bizType},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -183,6 +186,7 @@
 			cusername = #{item.cusername},
 			ctime = #{item.ctime},
 			cbranch_id = #{item.cbranchId},
-			cfg = #{item.cfg}
+			cfg = #{item.cfg},
+			biz_type = #{item.bizType}
 	</sql>
 </mapper>
\ No newline at end of file