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 小模块
* 实体 XmProjectGroupUser所有属性名:
- * joinTime,groupId,userid,username,outTime,status,obranchId,isPri,seqNo;
+ * joinTime,groupId,userid,username,outTime,status,obranchId,isPri,seqNo,projectId,productId;
* 表 xm_project_group_user xm_project_group_user的所有字段名:
- * 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;
* 当前主键(包括多主键):
* group_id,userid;
*/
@@ -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(
) values (
- #{joinTime},#{groupId},#{userid},#{username},#{outTime},#{status},#{obranchId},#{isPri},#{seqNo}
+ #{joinTime},#{groupId},#{userid},#{username},#{outTime},#{status},#{obranchId},#{isPri},#{seqNo},#{projectId},#{productId}
)
@@ -151,7 +151,7 @@
- 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
@@ -165,6 +165,8 @@
and res.obranch_id = #{obranchId}
and res.is_pri = #{isPri}
and res.seq_no = #{seqNo}
+ and res.project_id = #{projectId}
+ and res.product_id = #{productId}
@@ -174,7 +176,9 @@
status = #{status},
obranch_id = #{obranchId},
is_pri = #{isPri},
- seq_no = #{seqNo}
+ seq_no = #{seqNo},
+ project_id = #{projectId},
+ product_id = #{productId}
join_time = #{joinTime},
@@ -184,6 +188,8 @@
obranch_id = #{obranchId},
is_pri = #{isPri},
seq_no = #{seqNo},
+ project_id = #{projectId},
+ product_id = #{productId},
@@ -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}
\ No newline at end of file