diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectGroup.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroup.java
index 5ea52fb4..52713c60 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProjectGroup.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroup.java
@@ -2,16 +2,14 @@ package com.xm.core.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
-
import java.util.Date;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmProjectGroup所有属性名:
- * id,groupName,projectId,pgTypeId,pgTypeName,leaderUserid,leaderUsername,ctime,ltime,productId,branchId,pgClass,pgroupId,lvl,pidPaths,isTpl,assUserid,assUsername,childrenCnt,userCnt,qxCode,calcWorkload;
+ * id,groupName,projectId,pgTypeId,pgTypeName,leaderUserid,leaderUsername,ctime,ltime,productId,branchId,pgClass,pgroupId,lvl,pidPaths,isTpl,assUserid,assUsername,childrenCnt,userCnt,qxCode,calcWorkload,ntype;
* 表 xm_project_group xm_project_group的所有字段名:
- * 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;
+ * 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;
*/
@@ -86,6 +84,9 @@ public class XmProjectGroup implements java.io.Serializable {
@ApiModelProperty(notes="是否计算工作量0否1是",allowEmptyValue=true,example="",allowableValues="")
String calcWorkload;
+
+ @ApiModelProperty(notes="节点类型0管理团队、1执行团队",allowEmptyValue=true,example="",allowableValues="")
+ String ntype;
/**主键**/
public XmProjectGroup(String id) {
@@ -228,6 +229,12 @@ public class XmProjectGroup implements java.io.Serializable {
public void setCalcWorkload(String calcWorkload) {
this.calcWorkload = calcWorkload;
}
+ /**
+ * 节点类型0管理团队、1执行团队
+ **/
+ public void setNtype(String ntype) {
+ this.ntype = ntype;
+ }
/**
* 主键
@@ -361,5 +368,11 @@ public class XmProjectGroup implements java.io.Serializable {
public String getCalcWorkload() {
return this.calcWorkload;
}
+ /**
+ * 节点类型0管理团队、1执行团队
+ **/
+ public String getNtype() {
+ return this.ntype;
+ }
}
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupMapper.xml
index b75e2838..6fccbe73 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupMapper.xml
@@ -64,7 +64,7 @@
insert into xm_project_group(
) values (
- #{id},#{groupName},#{projectId},#{pgTypeId},#{pgTypeName},#{leaderUserid},#{leaderUsername},#{ctime},#{ltime},#{productId},#{branchId},#{pgClass},#{pgroupId},#{lvl},#{pidPaths},#{isTpl},#{assUserid},#{assUsername},#{childrenCnt},#{userCnt},#{qxCode},#{calcWorkload}
+ #{id},#{groupName},#{projectId},#{pgTypeId},#{pgTypeName},#{leaderUserid},#{leaderUsername},#{ctime},#{ltime},#{productId},#{branchId},#{pgClass},#{pgroupId},#{lvl},#{pidPaths},#{isTpl},#{assUserid},#{assUsername},#{childrenCnt},#{userCnt},#{qxCode},#{calcWorkload},#{ntype}
)
@@ -127,7 +127,7 @@
- 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
+ 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
@@ -154,6 +154,7 @@
and res.user_cnt = #{userCnt}
and res.qx_code = #{qxCode}
and res.calc_workload = #{calcWorkload}
+ and res.ntype = #{ntype}
@@ -177,7 +178,8 @@
children_cnt = #{childrenCnt},
user_cnt = #{userCnt},
qx_code = #{qxCode},
- calc_workload = #{calcWorkload}
+ calc_workload = #{calcWorkload},
+ ntype = #{ntype}
group_name = #{groupName},
@@ -201,6 +203,7 @@
user_cnt = #{userCnt},
qx_code = #{qxCode},
calc_workload = #{calcWorkload},
+ ntype = #{ntype},
@@ -224,6 +227,7 @@
children_cnt = #{item.childrenCnt},
user_cnt = #{item.userCnt},
qx_code = #{item.qxCode},
- calc_workload = #{item.calcWorkload}
+ calc_workload = #{item.calcWorkload},
+ ntype = #{item.ntype}
\ No newline at end of file