Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
commit
c5da1428bc
  1. 19
      xm-core/src/main/java/com/xm/core/entity/XmMenu.java
  2. 19
      xm-core/src/main/java/com/xm/core/entity/XmProjectPhase.java
  3. 12
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
  4. 12
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml

19
xm-core/src/main/java/com/xm/core/entity/XmMenu.java

@ -8,9 +8,9 @@ import java.math.BigDecimal;
/** /**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br> * 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmMenu所有属性名: <br> * 实体 XmMenu所有属性名: <br>
* menuId,menuName,pmenuId,productId,remark,status,online,demandUrl,codeUrl,designUrl,docUrl,helpUrl,operDocUrl,seqNo,mmUserid,mmUsername,ctime,ntype,sinceVersion,childrenCnt,ltime,tagIds,tagNames,pidPaths,lvl,isTpl,budgetHours,budgetStaffNu,budgetWorkload,budgetAmount,phaseId,iterationId;<br>
* menuId,menuName,pmenuId,productId,remark,status,online,demandUrl,codeUrl,designUrl,docUrl,helpUrl,operDocUrl,seqNo,mmUserid,mmUsername,ctime,ntype,sinceVersion,childrenCnt,ltime,tagIds,tagNames,pidPaths,lvl,isTpl,budgetHours,budgetStaffNu,budgetWorkload,budgetAmount,phaseId,iterationId,calcType;<br>
* xm_menu 功能表的所有字段名: <br> * xm_menu 功能表的所有字段名: <br>
* menu_id,menu_name,pmenu_id,product_id,remark,status,online,demand_url,code_url,design_url,doc_url,help_url,oper_doc_url,seq_no,mm_userid,mm_username,ctime,ntype,since_version,children_cnt,ltime,tag_ids,tag_names,pid_paths,lvl,is_tpl,budget_hours,budget_staff_nu,budget_workload,budget_amount,phase_id,iteration_id;<br>
* menu_id,menu_name,pmenu_id,product_id,remark,status,online,demand_url,code_url,design_url,doc_url,help_url,oper_doc_url,seq_no,mm_userid,mm_username,ctime,ntype,since_version,children_cnt,ltime,tag_ids,tag_names,pid_paths,lvl,is_tpl,budget_hours,budget_staff_nu,budget_workload,budget_amount,phase_id,iteration_id,calc_type;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* menu_id;<br> * menu_id;<br>
*/ */
@ -116,6 +116,9 @@ public class XmMenu implements java.io.Serializable {
@ApiModelProperty(notes="迭代编号",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="迭代编号",allowEmptyValue=true,example="",allowableValues="")
String iterationId; String iterationId;
@ApiModelProperty(notes="叶子节点数据收集方式0-不计算,1-由任务汇总,2-手工填报",allowEmptyValue=true,example="",allowableValues="")
String calcType;
/**功能编号**/ /**功能编号**/
public XmMenu(String menuId) { public XmMenu(String menuId) {
this.menuId = menuId; this.menuId = menuId;
@ -317,6 +320,12 @@ public class XmMenu implements java.io.Serializable {
public void setIterationId(String iterationId) { public void setIterationId(String iterationId) {
this.iterationId = iterationId; this.iterationId = iterationId;
} }
/**
* 叶子节点数据收集方式0-不计算1-由任务汇总2-手工填报
**/
public void setCalcType(String calcType) {
this.calcType = calcType;
}
/** /**
* 功能编号 * 功能编号
@ -510,5 +519,11 @@ public class XmMenu implements java.io.Serializable {
public String getIterationId() { public String getIterationId() {
return this.iterationId; return this.iterationId;
} }
/**
* 叶子节点数据收集方式0-不计算1-由任务汇总2-手工填报
**/
public String getCalcType() {
return this.calcType;
}
} }

19
xm-core/src/main/java/com/xm/core/entity/XmProjectPhase.java

@ -8,9 +8,9 @@ import java.math.BigDecimal;
/** /**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br> * 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmProjectPhase所有属性名: <br> * 实体 XmProjectPhase所有属性名: <br>
* id,phaseName,remark,parentPhaseId,branchId,projectId,beginDate,endDate,phaseBudgetHours,phaseBudgetStaffNu,ctime,phaseBudgetNouserAt,phaseBudgetInnerUserAt,phaseBudgetOutUserAt,projectBaselineId,bizProcInstId,bizFlowState,phaseBudgetWorkload,phaseActWorkload,phaseActInnerUserWorkload,phaseActOutUserWorkload,taskType,planType,seqNo,phaseBudgetInnerUserWorkload,phaseBudgetOutUserWorkload,actNouserAt,actInnerUserAt,phaseBudgetInnerUserPrice,phaseBudgetOutUserPrice,phaseBudgetOutUserCnt,phaseBudgetInnerUserCnt,actRate,phaseStatus,actOutUserAt,taskCnt,finishTaskCnt,iterationCnt,calcTime,taskBudgetWorkload,taskBudgetAt,mngUserid,mngUsername,milestone,pleaf,tagIds,tagNames,ntype,childrenCnt,ltime,isKeyPath,pidPaths,lvl,isTpl,phaseClass,productId,phaseBudgetAt;<br>
* id,phaseName,remark,parentPhaseId,branchId,projectId,beginDate,endDate,phaseBudgetHours,phaseBudgetStaffNu,ctime,phaseBudgetNouserAt,phaseBudgetInnerUserAt,phaseBudgetOutUserAt,projectBaselineId,bizProcInstId,bizFlowState,phaseBudgetWorkload,phaseActWorkload,phaseActInnerUserWorkload,phaseActOutUserWorkload,taskType,planType,seqNo,phaseBudgetInnerUserWorkload,phaseBudgetOutUserWorkload,actNouserAt,actInnerUserAt,phaseBudgetInnerUserPrice,phaseBudgetOutUserPrice,phaseBudgetOutUserCnt,phaseBudgetInnerUserCnt,actRate,phaseStatus,actOutUserAt,taskCnt,finishTaskCnt,iterationCnt,calcTime,taskBudgetWorkload,taskBudgetAt,mngUserid,mngUsername,milestone,pleaf,tagIds,tagNames,ntype,childrenCnt,ltime,isKeyPath,pidPaths,lvl,isTpl,phaseClass,productId,phaseBudgetAt,calcType;<br>
* xm_project_phase 项目阶段模板的所有字段名: <br> * xm_project_phase 项目阶段模板的所有字段名: <br>
* id,phase_name,remark,parent_phase_id,branch_id,project_id,begin_date,end_date,phase_budget_hours,phase_budget_staff_nu,ctime,phase_budget_nouser_at,phase_budget_inner_user_at,phase_budget_out_user_at,project_baseline_id,biz_proc_inst_id,biz_flow_state,phase_budget_workload,phase_act_workload,phase_act_inner_user_workload,phase_act_out_user_workload,task_type,plan_type,seq_no,phase_budget_inner_user_workload,phase_budget_out_user_workload,act_nouser_at,act_inner_user_at,phase_budget_inner_user_price,phase_budget_out_user_price,phase_budget_out_user_cnt,phase_budget_inner_user_cnt,act_rate,phase_status,act_out_user_at,task_cnt,finish_task_cnt,iteration_cnt,calc_time,task_budget_workload,task_budget_at,mng_userid,mng_username,milestone,pleaf,tag_ids,tag_names,ntype,children_cnt,ltime,is_key_path,pid_paths,lvl,is_tpl,phase_class,product_id,phase_budget_at;<br>
* id,phase_name,remark,parent_phase_id,branch_id,project_id,begin_date,end_date,phase_budget_hours,phase_budget_staff_nu,ctime,phase_budget_nouser_at,phase_budget_inner_user_at,phase_budget_out_user_at,project_baseline_id,biz_proc_inst_id,biz_flow_state,phase_budget_workload,phase_act_workload,phase_act_inner_user_workload,phase_act_out_user_workload,task_type,plan_type,seq_no,phase_budget_inner_user_workload,phase_budget_out_user_workload,act_nouser_at,act_inner_user_at,phase_budget_inner_user_price,phase_budget_out_user_price,phase_budget_out_user_cnt,phase_budget_inner_user_cnt,act_rate,phase_status,act_out_user_at,task_cnt,finish_task_cnt,iteration_cnt,calc_time,task_budget_workload,task_budget_at,mng_userid,mng_username,milestone,pleaf,tag_ids,tag_names,ntype,children_cnt,ltime,is_key_path,pid_paths,lvl,is_tpl,phase_class,product_id,phase_budget_at,calc_type;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br> * id;<br>
*/ */
@ -191,6 +191,9 @@ public class XmProjectPhase implements java.io.Serializable {
@ApiModelProperty(notes="预算金额",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="预算金额",allowEmptyValue=true,example="",allowableValues="")
BigDecimal phaseBudgetAt; BigDecimal phaseBudgetAt;
@ApiModelProperty(notes="叶子节点数据收集方式0-不计算,1-由任务汇总,2-手工填报",allowEmptyValue=true,example="",allowableValues="")
String calcType;
/**阶段主键**/ /**阶段主键**/
public XmProjectPhase(String id) { public XmProjectPhase(String id) {
this.id = id; this.id = id;
@ -542,6 +545,12 @@ public class XmProjectPhase implements java.io.Serializable {
public void setPhaseBudgetAt(BigDecimal phaseBudgetAt) { public void setPhaseBudgetAt(BigDecimal phaseBudgetAt) {
this.phaseBudgetAt = phaseBudgetAt; this.phaseBudgetAt = phaseBudgetAt;
} }
/**
* 叶子节点数据收集方式0-不计算1-由任务汇总2-手工填报
**/
public void setCalcType(String calcType) {
this.calcType = calcType;
}
/** /**
* 阶段主键 * 阶段主键
@ -885,5 +894,11 @@ public class XmProjectPhase implements java.io.Serializable {
public BigDecimal getPhaseBudgetAt() { public BigDecimal getPhaseBudgetAt() {
return this.phaseBudgetAt; return this.phaseBudgetAt;
} }
/**
* 叶子节点数据收集方式0-不计算1-由任务汇总2-手工填报
**/
public String getCalcType() {
return this.calcType;
}
} }

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

@ -190,7 +190,7 @@
insert into xm_menu( insert into xm_menu(
<include refid="columns"/> <include refid="columns"/>
) values ( ) values (
#{menuId},#{menuName},#{pmenuId},#{productId},#{remark},#{status},#{online},#{demandUrl},#{codeUrl},#{designUrl},#{docUrl},#{helpUrl},#{operDocUrl},#{seqNo},#{mmUserid},#{mmUsername},#{ctime},#{ntype},#{sinceVersion},#{childrenCnt},#{ltime},#{tagIds},#{tagNames},#{pidPaths},#{lvl},#{isTpl},#{budgetHours},#{budgetStaffNu},#{budgetWorkload},#{budgetAmount},#{phaseId},#{iterationId}
#{menuId},#{menuName},#{pmenuId},#{productId},#{remark},#{status},#{online},#{demandUrl},#{codeUrl},#{designUrl},#{docUrl},#{helpUrl},#{operDocUrl},#{seqNo},#{mmUserid},#{mmUsername},#{ctime},#{ntype},#{sinceVersion},#{childrenCnt},#{ltime},#{tagIds},#{tagNames},#{pidPaths},#{lvl},#{isTpl},#{budgetHours},#{budgetStaffNu},#{budgetWorkload},#{budgetAmount},#{phaseId},#{iterationId},#{calcType}
) )
</insert> </insert>
@ -253,7 +253,7 @@
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <sql id="columns">
menu_id,menu_name,pmenu_id,product_id,remark,status,online,demand_url,code_url,design_url,doc_url,help_url,oper_doc_url,seq_no,mm_userid,mm_username,ctime,ntype,since_version,children_cnt,ltime,tag_ids,tag_names,pid_paths,lvl,is_tpl,budget_hours,budget_staff_nu,budget_workload,budget_amount,phase_id,iteration_id
menu_id,menu_name,pmenu_id,product_id,remark,status,online,demand_url,code_url,design_url,doc_url,help_url,oper_doc_url,seq_no,mm_userid,mm_username,ctime,ntype,since_version,children_cnt,ltime,tag_ids,tag_names,pid_paths,lvl,is_tpl,budget_hours,budget_staff_nu,budget_workload,budget_amount,phase_id,iteration_id,calc_type
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -290,6 +290,7 @@
<if test="budgetAmount != null and budgetAmount != ''"> and res.budget_amount = #{budgetAmount} </if> <if test="budgetAmount != null and budgetAmount != ''"> and res.budget_amount = #{budgetAmount} </if>
<if test="phaseId != null and phaseId != ''"> and res.phase_id = #{phaseId} </if> <if test="phaseId != null and phaseId != ''"> and res.phase_id = #{phaseId} </if>
<if test="iterationId != null and iterationId != ''"> and res.iteration_id = #{iterationId} </if> <if test="iterationId != null and iterationId != ''"> and res.iteration_id = #{iterationId} </if>
<if test="calcType != null and calcType != ''"> and res.calc_type = #{calcType} </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -323,7 +324,8 @@
budget_workload = #{budgetWorkload}, budget_workload = #{budgetWorkload},
budget_amount = #{budgetAmount}, budget_amount = #{budgetAmount},
phase_id = #{phaseId}, phase_id = #{phaseId},
iteration_id = #{iterationId}
iteration_id = #{iterationId},
calc_type = #{calcType}
</sql> </sql>
<sql id="someFieldSet"> <sql id="someFieldSet">
<if test="menuName != null and menuName != ''"> menu_name = #{menuName}, </if> <if test="menuName != null and menuName != ''"> menu_name = #{menuName}, </if>
@ -357,6 +359,7 @@
<if test="budgetAmount != null and budgetAmount != ''"> budget_amount = #{budgetAmount}, </if> <if test="budgetAmount != null and budgetAmount != ''"> budget_amount = #{budgetAmount}, </if>
<if test="phaseId != null and phaseId != ''"> phase_id = #{phaseId}, </if> <if test="phaseId != null and phaseId != ''"> phase_id = #{phaseId}, </if>
<if test="iterationId != null and iterationId != ''"> iteration_id = #{iterationId}, </if> <if test="iterationId != null and iterationId != ''"> iteration_id = #{iterationId}, </if>
<if test="calcType != null and calcType != ''"> calc_type = #{calcType}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -390,6 +393,7 @@
budget_workload = #{item.budgetWorkload}, budget_workload = #{item.budgetWorkload},
budget_amount = #{item.budgetAmount}, budget_amount = #{item.budgetAmount},
phase_id = #{item.phaseId}, phase_id = #{item.phaseId},
iteration_id = #{item.iterationId}
iteration_id = #{item.iterationId},
calc_type = #{item.calcType}
</sql> </sql>
</mapper> </mapper>

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

@ -279,7 +279,7 @@
insert into xm_project_phase( insert into xm_project_phase(
<include refid="columns"/> <include refid="columns"/>
) values ( ) values (
#{id},#{phaseName},#{remark},#{parentPhaseId},#{branchId},#{projectId},#{beginDate},#{endDate},#{phaseBudgetHours},#{phaseBudgetStaffNu},#{ctime},#{phaseBudgetNouserAt},#{phaseBudgetInnerUserAt},#{phaseBudgetOutUserAt},#{projectBaselineId},#{bizProcInstId},#{bizFlowState},#{phaseBudgetWorkload},#{phaseActWorkload},#{phaseActInnerUserWorkload},#{phaseActOutUserWorkload},#{taskType},#{planType},#{seqNo},#{phaseBudgetInnerUserWorkload},#{phaseBudgetOutUserWorkload},#{actNouserAt},#{actInnerUserAt},#{phaseBudgetInnerUserPrice},#{phaseBudgetOutUserPrice},#{phaseBudgetOutUserCnt},#{phaseBudgetInnerUserCnt},#{actRate},#{phaseStatus},#{actOutUserAt},#{taskCnt},#{finishTaskCnt},#{iterationCnt},#{calcTime},#{taskBudgetWorkload},#{taskBudgetAt},#{mngUserid},#{mngUsername},#{milestone},#{pleaf},#{tagIds},#{tagNames},#{ntype},#{childrenCnt},#{ltime},#{isKeyPath},#{pidPaths},#{lvl},#{isTpl},#{phaseClass},#{productId},#{phaseBudgetAt}
#{id},#{phaseName},#{remark},#{parentPhaseId},#{branchId},#{projectId},#{beginDate},#{endDate},#{phaseBudgetHours},#{phaseBudgetStaffNu},#{ctime},#{phaseBudgetNouserAt},#{phaseBudgetInnerUserAt},#{phaseBudgetOutUserAt},#{projectBaselineId},#{bizProcInstId},#{bizFlowState},#{phaseBudgetWorkload},#{phaseActWorkload},#{phaseActInnerUserWorkload},#{phaseActOutUserWorkload},#{taskType},#{planType},#{seqNo},#{phaseBudgetInnerUserWorkload},#{phaseBudgetOutUserWorkload},#{actNouserAt},#{actInnerUserAt},#{phaseBudgetInnerUserPrice},#{phaseBudgetOutUserPrice},#{phaseBudgetOutUserCnt},#{phaseBudgetInnerUserCnt},#{actRate},#{phaseStatus},#{actOutUserAt},#{taskCnt},#{finishTaskCnt},#{iterationCnt},#{calcTime},#{taskBudgetWorkload},#{taskBudgetAt},#{mngUserid},#{mngUsername},#{milestone},#{pleaf},#{tagIds},#{tagNames},#{ntype},#{childrenCnt},#{ltime},#{isKeyPath},#{pidPaths},#{lvl},#{isTpl},#{phaseClass},#{productId},#{phaseBudgetAt},#{calcType}
) )
</insert> </insert>
@ -342,7 +342,7 @@
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <sql id="columns">
id,phase_name,remark,parent_phase_id,branch_id,project_id,begin_date,end_date,phase_budget_hours,phase_budget_staff_nu,ctime,phase_budget_nouser_at,phase_budget_inner_user_at,phase_budget_out_user_at,project_baseline_id,biz_proc_inst_id,biz_flow_state,phase_budget_workload,phase_act_workload,phase_act_inner_user_workload,phase_act_out_user_workload,task_type,plan_type,seq_no,phase_budget_inner_user_workload,phase_budget_out_user_workload,act_nouser_at,act_inner_user_at,phase_budget_inner_user_price,phase_budget_out_user_price,phase_budget_out_user_cnt,phase_budget_inner_user_cnt,act_rate,phase_status,act_out_user_at,task_cnt,finish_task_cnt,iteration_cnt,calc_time,task_budget_workload,task_budget_at,mng_userid,mng_username,milestone,pleaf,tag_ids,tag_names,ntype,children_cnt,ltime,is_key_path,pid_paths,lvl,is_tpl,phase_class,product_id,phase_budget_at
id,phase_name,remark,parent_phase_id,branch_id,project_id,begin_date,end_date,phase_budget_hours,phase_budget_staff_nu,ctime,phase_budget_nouser_at,phase_budget_inner_user_at,phase_budget_out_user_at,project_baseline_id,biz_proc_inst_id,biz_flow_state,phase_budget_workload,phase_act_workload,phase_act_inner_user_workload,phase_act_out_user_workload,task_type,plan_type,seq_no,phase_budget_inner_user_workload,phase_budget_out_user_workload,act_nouser_at,act_inner_user_at,phase_budget_inner_user_price,phase_budget_out_user_price,phase_budget_out_user_cnt,phase_budget_inner_user_cnt,act_rate,phase_status,act_out_user_at,task_cnt,finish_task_cnt,iteration_cnt,calc_time,task_budget_workload,task_budget_at,mng_userid,mng_username,milestone,pleaf,tag_ids,tag_names,ntype,children_cnt,ltime,is_key_path,pid_paths,lvl,is_tpl,phase_class,product_id,phase_budget_at,calc_type
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -404,6 +404,7 @@
<if test="phaseClass != null and phaseClass != ''"> and res.phase_class = #{phaseClass} </if> <if test="phaseClass != null and phaseClass != ''"> and res.phase_class = #{phaseClass} </if>
<if test="productId != null and productId != ''"> and res.product_id = #{productId} </if> <if test="productId != null and productId != ''"> and res.product_id = #{productId} </if>
<if test="phaseBudgetAt != null and phaseBudgetAt != ''"> and res.phase_budget_at = #{phaseBudgetAt} </if> <if test="phaseBudgetAt != null and phaseBudgetAt != ''"> and res.phase_budget_at = #{phaseBudgetAt} </if>
<if test="calcType != null and calcType != ''"> and res.calc_type = #{calcType} </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -462,7 +463,8 @@
is_tpl = #{isTpl}, is_tpl = #{isTpl},
phase_class = #{phaseClass}, phase_class = #{phaseClass},
product_id = #{productId}, product_id = #{productId},
phase_budget_at = #{phaseBudgetAt}
phase_budget_at = #{phaseBudgetAt},
calc_type = #{calcType}
</sql> </sql>
<sql id="someFieldSet"> <sql id="someFieldSet">
<if test="phaseName != null and phaseName != ''"> phase_name = #{phaseName}, </if> <if test="phaseName != null and phaseName != ''"> phase_name = #{phaseName}, </if>
@ -521,6 +523,7 @@
<if test="phaseClass != null and phaseClass != ''"> phase_class = #{phaseClass}, </if> <if test="phaseClass != null and phaseClass != ''"> phase_class = #{phaseClass}, </if>
<if test="productId != null and productId != ''"> product_id = #{productId}, </if> <if test="productId != null and productId != ''"> product_id = #{productId}, </if>
<if test="phaseBudgetAt != null and phaseBudgetAt != ''"> phase_budget_at = #{phaseBudgetAt}, </if> <if test="phaseBudgetAt != null and phaseBudgetAt != ''"> phase_budget_at = #{phaseBudgetAt}, </if>
<if test="calcType != null and calcType != ''"> calc_type = #{calcType}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -579,6 +582,7 @@
is_tpl = #{item.isTpl}, is_tpl = #{item.isTpl},
phase_class = #{item.phaseClass}, phase_class = #{item.phaseClass},
product_id = #{item.productId}, product_id = #{item.productId},
phase_budget_at = #{item.phaseBudgetAt}
phase_budget_at = #{item.phaseBudgetAt},
calc_type = #{item.calcType}
</sql> </sql>
</mapper> </mapper>
Loading…
Cancel
Save