添加节点类型、标签等

xm-core/src/main/java/com/xm/core/entity/XmProjectGroup.java

@@ -7,9 +7,9 @@ import java.util.Date;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmProjectGroup所有属性名: <br>
- *	id,groupName,projectId,pgTypeId,pgTypeName,leaderUserid,leaderUsername,ctime,ltime,productId,branchId,pgClass,pgroupId,lvl,pidPaths,isTpl,assUserid,assUsername,childrenCnt,userCnt,qxCode,calcWorkload,ntype;<br>
+ *	id,groupName,projectId,pgTypeId,pgTypeName,leaderUserid,leaderUsername,ctime,ltime,productId,branchId,pgClass,pgroupId,lvl,pidPaths,isTpl,assUserid,assUsername,childrenCnt,userCnt,qxCode,calcWorkload,ntype,crowBranchId,crowBranchName,isCrow;<br>
  * 表 xm_project_group xm_project_group的所有字段名: <br>
- *	id,group_name,project_id,pg_type_id,pg_type_name,leader_userid,leader_username,ctime,ltime,product_id,branch_id,pg_class,pgroup_id,lvl,pid_paths,is_tpl,ass_userid,ass_username,children_cnt,user_cnt,qx_code,calc_workload,ntype;<br>
+ *	id,group_name,project_id,pg_type_id,pg_type_name,leader_userid,leader_username,ctime,ltime,product_id,branch_id,pg_class,pgroup_id,lvl,pid_paths,is_tpl,ass_userid,ass_username,children_cnt,user_cnt,qx_code,calc_workload,ntype,crow_branch_id,crow_branch_name,is_crow;<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -87,6 +87,15 @@ public class XmProjectGroup  implements java.io.Serializable {
 	
 	@ApiModelProperty(notes="节点类型0管理团队、1执行团队",allowEmptyValue=true,example="",allowableValues="")
 	String ntype;
+	
+	@ApiModelProperty(notes="协作公司编号",allowEmptyValue=true,example="",allowableValues="")
+	Integer crowBranchId;
+	
+	@ApiModelProperty(notes="协作公司名称",allowEmptyValue=true,example="",allowableValues="")
+	String crowBranchName;
+	
+	@ApiModelProperty(notes="是否众包团队",allowEmptyValue=true,example="",allowableValues="")
+	String isCrow;
 
 	/**主键**/
 	public XmProjectGroup(String id) {
@@ -235,6 +244,24 @@ public class XmProjectGroup  implements java.io.Serializable {
 	public void setNtype(String ntype) {
 		this.ntype = ntype;
 	}
+	/**
+	 * 协作公司编号
+	 **/
+	public void setCrowBranchId(Integer crowBranchId) {
+		this.crowBranchId = crowBranchId;
+	}
+	/**
+	 * 协作公司名称
+	 **/
+	public void setCrowBranchName(String crowBranchName) {
+		this.crowBranchName = crowBranchName;
+	}
+	/**
+	 * 是否众包团队
+	 **/
+	public void setIsCrow(String isCrow) {
+		this.isCrow = isCrow;
+	}
 	
 	/**
 	 * 主键
@@ -374,5 +401,23 @@ public class XmProjectGroup  implements java.io.Serializable {
 	public String getNtype() {
 		return this.ntype;
 	}
+	/**
+	 * 协作公司编号
+	 **/
+	public Integer getCrowBranchId() {
+		return this.crowBranchId;
+	}
+	/**
+	 * 协作公司名称
+	 **/
+	public String getCrowBranchName() {
+		return this.crowBranchName;
+	}
+	/**
+	 * 是否众包团队
+	 **/
+	public String getIsCrow() {
+		return this.isCrow;
+	}
 
 }

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,projectId,productId,pgClass;<br>
+ *	joinTime,groupId,userid,username,outTime,status,obranchId,isPri,seqNo,projectId,productId,pgClass,obranchName;<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,project_id,product_id,pg_class;<br>
+ *	join_time,group_id,userid,username,out_time,status,obranch_id,is_pri,seq_no,project_id,product_id,pg_class,obranch_name;<br>
  * 当前主键(包括多主键):<br>
  *	group_id,userid;<br>
  */
@@ -54,6 +54,9 @@ public class XmProjectGroupUser  implements java.io.Serializable {
 	
 	@ApiModelProperty(notes="0-项目，1-产品",allowEmptyValue=true,example="",allowableValues="")
 	String pgClass;
+	
+	@ApiModelProperty(notes="原归属机构名称",allowEmptyValue=true,example="",allowableValues="")
+	String obranchName;
 
 	/**团队编号,团队成员编号**/
 	public XmProjectGroupUser(String groupId,String userid) {
@@ -137,6 +140,12 @@ public class XmProjectGroupUser  implements java.io.Serializable {
 	public void setPgClass(String pgClass) {
 		this.pgClass = pgClass;
 	}
+	/**
+	 * 原归属机构名称
+	 **/
+	public void setObranchName(String obranchName) {
+		this.obranchName = obranchName;
+	}
 	
 	/**
 	 * 加入时间
@@ -210,5 +219,11 @@ public class XmProjectGroupUser  implements java.io.Serializable {
 	public String getPgClass() {
 		return this.pgClass;
 	}
+	/**
+	 * 原归属机构名称
+	 **/
+	public String getObranchName() {
+		return this.obranchName;
+	}
 
 }

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupMapper.xml

@@ -64,7 +64,7 @@
 		insert into xm_project_group(
 			<include refid="columns"/>
 		) values (
-		#{id},#{groupName},#{projectId},#{pgTypeId},#{pgTypeName},#{leaderUserid},#{leaderUsername},#{ctime},#{ltime},#{productId},#{branchId},#{pgClass},#{pgroupId},#{lvl},#{pidPaths},#{isTpl},#{assUserid},#{assUsername},#{childrenCnt},#{userCnt},#{qxCode},#{calcWorkload},#{ntype}
+		#{id},#{groupName},#{projectId},#{pgTypeId},#{pgTypeName},#{leaderUserid},#{leaderUsername},#{ctime},#{ltime},#{productId},#{branchId},#{pgClass},#{pgroupId},#{lvl},#{pidPaths},#{isTpl},#{assUserid},#{assUsername},#{childrenCnt},#{userCnt},#{qxCode},#{calcWorkload},#{ntype},#{crowBranchId},#{crowBranchName},#{isCrow}
 		)
 	</insert>
 	
@@ -127,7 +127,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		id,group_name,project_id,pg_type_id,pg_type_name,leader_userid,leader_username,ctime,ltime,product_id,branch_id,pg_class,pgroup_id,lvl,pid_paths,is_tpl,ass_userid,ass_username,children_cnt,user_cnt,qx_code,calc_workload,ntype
+		id,group_name,project_id,pg_type_id,pg_type_name,leader_userid,leader_username,ctime,ltime,product_id,branch_id,pg_class,pgroup_id,lvl,pid_paths,is_tpl,ass_userid,ass_username,children_cnt,user_cnt,qx_code,calc_workload,ntype,crow_branch_id,crow_branch_name,is_crow
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -155,6 +155,9 @@
 		<if test="qxCode != null and qxCode != ''">      and res.qx_code = #{qxCode}     </if>
 		<if test="calcWorkload != null and calcWorkload != ''">      and res.calc_workload = #{calcWorkload}     </if>
 		<if test="ntype != null and ntype != ''">      and res.ntype = #{ntype}     </if>
+		<if test="crowBranchId != null and crowBranchId != ''">      and res.crow_branch_id = #{crowBranchId}     </if>
+		<if test="crowBranchName != null and crowBranchName != ''">      and res.crow_branch_name = #{crowBranchName}     </if>
+		<if test="isCrow != null and isCrow != ''">      and res.is_crow = #{isCrow}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -179,7 +182,10 @@
 		user_cnt = #{userCnt},
 		qx_code = #{qxCode},
 		calc_workload = #{calcWorkload},
-		ntype = #{ntype}
+		ntype = #{ntype},
+		crow_branch_id = #{crowBranchId},
+		crow_branch_name = #{crowBranchName},
+		is_crow = #{isCrow}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="groupName != null and groupName != ''"> group_name = #{groupName},     </if>
@@ -204,6 +210,9 @@
 		<if test="qxCode != null and qxCode != ''"> qx_code = #{qxCode},     </if>
 		<if test="calcWorkload != null and calcWorkload != ''"> calc_workload = #{calcWorkload},     </if>
 		<if test="ntype != null and ntype != ''"> ntype = #{ntype},     </if>
+		<if test="crowBranchId != null and crowBranchId != ''"> crow_branch_id = #{crowBranchId},     </if>
+		<if test="crowBranchName != null and crowBranchName != ''"> crow_branch_name = #{crowBranchName},     </if>
+		<if test="isCrow != null and isCrow != ''"> is_crow = #{isCrow},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -228,6 +237,9 @@
 			user_cnt = #{item.userCnt},
 			qx_code = #{item.qxCode},
 			calc_workload = #{item.calcWorkload},
-			ntype = #{item.ntype}
+			ntype = #{item.ntype},
+			crow_branch_id = #{item.crowBranchId},
+			crow_branch_name = #{item.crowBranchName},
+			is_crow = #{item.isCrow}
 	</sql>
 </mapper>

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupUserMapper.xml

@@ -93,7 +93,7 @@
 		insert into xm_project_group_user(
 			<include refid="columns"/>
 		) values (
-		#{joinTime},#{groupId},#{userid},#{username},#{outTime},#{status},#{obranchId},#{isPri},#{seqNo},#{projectId},#{productId},#{pgClass}
+		#{joinTime},#{groupId},#{userid},#{username},#{outTime},#{status},#{obranchId},#{isPri},#{seqNo},#{projectId},#{productId},#{pgClass},#{obranchName}
 		)
 	</insert>
 	
@@ -156,7 +156,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		join_time,group_id,userid,username,out_time,status,obranch_id,is_pri,seq_no,project_id,product_id,pg_class
+		join_time,group_id,userid,username,out_time,status,obranch_id,is_pri,seq_no,project_id,product_id,pg_class,obranch_name
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -173,6 +173,7 @@
 		<if test="projectId != null and projectId != ''">      and res.project_id = #{projectId}     </if>
 		<if test="productId != null and productId != ''">      and res.product_id = #{productId}     </if>
 		<if test="pgClass != null and pgClass != ''">      and res.pg_class = #{pgClass}     </if>
+		<if test="obranchName != null and obranchName != ''">      and res.obranch_name = #{obranchName}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -185,7 +186,8 @@
 		seq_no = #{seqNo},
 		project_id = #{projectId},
 		product_id = #{productId},
-		pg_class = #{pgClass}
+		pg_class = #{pgClass},
+		obranch_name = #{obranchName}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="joinTime != null"> join_time = #{joinTime},     </if>
@@ -198,6 +200,7 @@
 		<if test="projectId != null and projectId != ''"> project_id = #{projectId},     </if>
 		<if test="productId != null and productId != ''"> product_id = #{productId},     </if>
 		<if test="pgClass != null and pgClass != ''"> pg_class = #{pgClass},     </if>
+		<if test="obranchName != null and obranchName != ''"> obranch_name = #{obranchName},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -210,6 +213,7 @@
 			seq_no = #{item.seqNo},
 			project_id = #{item.projectId},
 			product_id = #{item.productId},
-			pg_class = #{item.pgClass}
+			pg_class = #{item.pgClass},
+			obranch_name = #{item.obranchName}
 	</sql>
 </mapper>