From 3f2957583d7fa78080291d946db8ce258d6a8440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 23 Feb 2022 17:40:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/entity/XmProjectGroupUser.java    | 34 +++++++++++++++++--
 .../xm/core/dao/XmProjectGroupUserMapper.xml  | 16 ++++++---
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupUser.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupUser.java
index 121cfe3d..51f2ac54 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupUser.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupUser.java
@@ -7,9 +7,9 @@ import java.util.Date;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmProjectGroupUser所有属性名: <br>
- *	joinTime,groupId,userid,username,outTime,status,obranchId,isPri,seqNo;<br>
+ *	joinTime,groupId,userid,username,outTime,status,obranchId,isPri,seqNo,projectId,productId;<br>
  * 表 xm_project_group_user xm_project_group_user的所有字段名: <br>
- *	join_time,group_id,userid,username,out_time,status,obranch_id,is_pri,seq_no;<br>
+ *	join_time,group_id,userid,username,out_time,status,obranch_id,is_pri,seq_no,project_id,product_id;<br>
  * 当前主键(包括多主键):<br>
  *	group_id,userid;<br>
  */
@@ -45,6 +45,12 @@ public class XmProjectGroupUser  implements java.io.Serializable {
 	
 	@ApiModelProperty(notes="排序号--从1开始",allowEmptyValue=true,example="",allowableValues="")
 	Integer seqNo;
+	
+	@ApiModelProperty(notes="项目编号",allowEmptyValue=true,example="",allowableValues="")
+	String projectId;
+	
+	@ApiModelProperty(notes="产品编号",allowEmptyValue=true,example="",allowableValues="")
+	String productId;
 
 	/**团队编号,团队成员编号**/
 	public XmProjectGroupUser(String groupId,String userid) {
@@ -110,6 +116,18 @@ public class XmProjectGroupUser  implements java.io.Serializable {
 	public void setSeqNo(Integer seqNo) {
 		this.seqNo = seqNo;
 	}
+	/**
+	 * 项目编号
+	 **/
+	public void setProjectId(String projectId) {
+		this.projectId = projectId;
+	}
+	/**
+	 * 产品编号
+	 **/
+	public void setProductId(String productId) {
+		this.productId = productId;
+	}
 	
 	/**
 	 * 加入时间
@@ -165,5 +183,17 @@ public class XmProjectGroupUser  implements java.io.Serializable {
 	public Integer getSeqNo() {
 		return this.seqNo;
 	}
+	/**
+	 * 项目编号
+	 **/
+	public String getProjectId() {
+		return this.projectId;
+	}
+	/**
+	 * 产品编号
+	 **/
+	public String getProductId() {
+		return this.productId;
+	}
 
 }
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupUserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupUserMapper.xml
index 98caba15..b5271143 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupUserMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupUserMapper.xml
@@ -88,7 +88,7 @@
 		insert into xm_project_group_user(
 			<include refid="columns"/>
 		) values (
-		#{joinTime},#{groupId},#{userid},#{username},#{outTime},#{status},#{obranchId},#{isPri},#{seqNo}
+		#{joinTime},#{groupId},#{userid},#{username},#{outTime},#{status},#{obranchId},#{isPri},#{seqNo},#{projectId},#{productId}
 		)
 	</insert>
 	
@@ -151,7 +151,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		join_time,group_id,userid,username,out_time,status,obranch_id,is_pri,seq_no
+		join_time,group_id,userid,username,out_time,status,obranch_id,is_pri,seq_no,project_id,product_id
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -165,6 +165,8 @@
 		<if test="obranchId != null and obranchId != ''">      and res.obranch_id = #{obranchId}     </if>
 		<if test="isPri != null and isPri != ''">      and res.is_pri = #{isPri}     </if>
 		<if test="seqNo != null and seqNo != ''">      and res.seq_no = #{seqNo}     </if>
+		<if test="projectId != null and projectId != ''">      and res.project_id = #{projectId}     </if>
+		<if test="productId != null and productId != ''">      and res.product_id = #{productId}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -174,7 +176,9 @@
 		status = #{status},
 		obranch_id = #{obranchId},
 		is_pri = #{isPri},
-		seq_no = #{seqNo}
+		seq_no = #{seqNo},
+		project_id = #{projectId},
+		product_id = #{productId}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="joinTime != null"> join_time = #{joinTime},     </if>
@@ -184,6 +188,8 @@
 		<if test="obranchId != null and obranchId != ''"> obranch_id = #{obranchId},     </if>
 		<if test="isPri != null and isPri != ''"> is_pri = #{isPri},     </if>
 		<if test="seqNo != null and seqNo != ''"> seq_no = #{seqNo},     </if>
+		<if test="projectId != null and projectId != ''"> project_id = #{projectId},     </if>
+		<if test="productId != null and productId != ''"> product_id = #{productId},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -193,6 +199,8 @@
 			status = #{item.status},
 			obranch_id = #{item.obranchId},
 			is_pri = #{item.isPri},
-			seq_no = #{item.seqNo}
+			seq_no = #{item.seqNo},
+			project_id = #{item.projectId},
+			product_id = #{item.productId}
 	</sql>
 </mapper>
\ No newline at end of file