添加节点类型、标签等

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

@@ -8,9 +8,9 @@ import java.math.BigDecimal;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmQuestion所有属性名: <br>
- *	id,name,projectId,projectName,caseId,caseName,endTime,askUserid,askUsername,handlerUserid,handlerUsername,priority,solution,description,createUserid,createUsername,createTime,bugStatus,bizProcInstId,bizFlowState,menuId,menuName,budgetWorkload,budgetCost,actWorkload,actCost,expectResult,opStep,currResult,refRequire,bugSeverity,bugType,tagIds,tagNames,urls,ltime,qtype,caseExecId,remarks,productId,repRate,verNum,vpath,pverNum,bugReason,rate,rworkload;<br>
+ *	id,name,projectId,projectName,caseId,caseName,endTime,askUserid,askUsername,handlerUserid,handlerUsername,priority,solution,description,createUserid,createUsername,createTime,bugStatus,bizProcInstId,bizFlowState,menuId,menuName,budgetWorkload,budgetCost,actWorkload,actCost,expectResult,opStep,currResult,refRequire,bugSeverity,bugType,tagIds,tagNames,urls,ltime,qtype,caseExecId,remarks,productId,repRate,verNum,vpath,pverNum,bugReason,rate,rworkload,eworkload;<br>
  * 表 xm_question xm_question的所有字段名: <br>
- *	id,name,project_id,project_name,case_id,case_name,end_time,ask_userid,ask_username,handler_userid,handler_username,priority,solution,description,create_userid,create_username,create_time,bug_status,biz_proc_inst_id,biz_flow_state,menu_id,menu_name,budget_workload,budget_cost,act_workload,act_cost,expect_result,op_step,curr_result,ref_require,bug_severity,bug_type,tag_ids,tag_names,urls,ltime,qtype,case_exec_id,remarks,product_id,rep_rate,ver_num,vpath,pver_num,bug_reason,rate,rworkload;<br>
+ *	id,name,project_id,project_name,case_id,case_name,end_time,ask_userid,ask_username,handler_userid,handler_username,priority,solution,description,create_userid,create_username,create_time,bug_status,biz_proc_inst_id,biz_flow_state,menu_id,menu_name,budget_workload,budget_cost,act_workload,act_cost,expect_result,op_step,curr_result,ref_require,bug_severity,bug_type,tag_ids,tag_names,urls,ltime,qtype,case_exec_id,remarks,product_id,rep_rate,ver_num,vpath,pver_num,bug_reason,rate,rworkload,eworkload;<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -158,8 +158,11 @@ public class XmQuestion  implements java.io.Serializable {
 	@ApiModelProperty(notes="进度0-100",allowEmptyValue=true,example="",allowableValues="")
 	Integer rate;
 	
-	@ApiModelProperty(notes="剩余工时，手工填写",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="剩余工作量(永远不保存数据，参与estimate",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal rworkload;
+	
+	@ApiModelProperty(notes="重新评估工作量，eeworkload=(rworkload+act_workload)",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal eworkload;
 
 	/**问题编号**/
 	public XmQuestion(String id) {
@@ -447,11 +450,17 @@ public class XmQuestion  implements java.io.Serializable {
 		this.rate = rate;
 	}
 	/**
-	 * 剩余工时，手工填写
+	 * 剩余工作量(永远不保存数据，参与estimate
 	 **/
 	public void setRworkload(BigDecimal rworkload) {
 		this.rworkload = rworkload;
 	}
+	/**
+	 * 重新评估工作量，eeworkload=(rworkload+act_workload)
+	 **/
+	public void setEworkload(BigDecimal eworkload) {
+		this.eworkload = eworkload;
+	}
 	
 	/**
 	 * 问题编号
@@ -730,10 +739,16 @@ public class XmQuestion  implements java.io.Serializable {
 		return this.rate;
 	}
 	/**
-	 * 剩余工时，手工填写
+	 * 剩余工作量(永远不保存数据，参与estimate
 	 **/
 	public BigDecimal getRworkload() {
 		return this.rworkload;
 	}
+	/**
+	 * 重新评估工作量，eeworkload=(rworkload+act_workload)
+	 **/
+	public BigDecimal getEworkload() {
+		return this.eworkload;
+	}
 
 }

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

@@ -8,9 +8,9 @@ import java.math.BigDecimal;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmTask所有属性名: <br>
- *	id,name,parentTaskid,parentTaskname,projectId,projectName,level,sortLevel,executorUserid,executorUsername,preTaskid,preTaskname,startTime,endTime,milestone,description,remarks,createUserid,createUsername,createTime,rate,budgetCost,budgetWorkload,actCost,actWorkload,taskState,taskType,taskClass,toTaskCenter,actStartTime,actEndTime,bizProcInstId,bizFlowState,phaseId,phaseName,taskSkillNames,exeUsernames,taskSkillIds,exeUserids,taskOut,planType,settleSchemel,menuId,menuName,productId,cbranchId,cdeptid,tagIds,tagNames,ntype,childrenCnt,ltime,pidPaths,lvl,isTpl,keyPath,uniInnerPrice,uniOutPrice,calcType,ptype,wtype,bctrl,rworkload;<br>
+ *	id,name,parentTaskid,parentTaskname,projectId,projectName,level,sortLevel,executorUserid,executorUsername,preTaskid,preTaskname,startTime,endTime,milestone,description,remarks,createUserid,createUsername,createTime,rate,budgetCost,budgetWorkload,actCost,actWorkload,taskState,taskType,taskClass,toTaskCenter,actStartTime,actEndTime,bizProcInstId,bizFlowState,phaseId,phaseName,taskSkillNames,exeUsernames,taskSkillIds,exeUserids,taskOut,planType,settleSchemel,menuId,menuName,productId,cbranchId,cdeptid,tagIds,tagNames,ntype,childrenCnt,ltime,pidPaths,lvl,isTpl,keyPath,uniInnerPrice,uniOutPrice,calcType,ptype,wtype,bctrl,rworkload,eworkload;<br>
  * 表 xm_task xm_task的所有字段名: <br>
- *	id,name,parent_taskid,parent_taskname,project_id,project_name,level,sort_level,executor_userid,executor_username,pre_taskid,pre_taskname,start_time,end_time,milestone,description,remarks,create_userid,create_username,create_time,rate,budget_cost,budget_workload,act_cost,act_workload,task_state,task_type,task_class,to_task_center,act_start_time,act_end_time,biz_proc_inst_id,biz_flow_state,phase_id,phase_name,task_skill_names,exe_usernames,task_skill_ids,exe_userids,task_out,plan_type,settle_schemel,menu_id,menu_name,product_id,cbranch_id,cdeptid,tag_ids,tag_names,ntype,children_cnt,ltime,pid_paths,lvl,is_tpl,key_path,uni_inner_price,uni_out_price,calc_type,ptype,wtype,bctrl,rworkload;<br>
+ *	id,name,parent_taskid,parent_taskname,project_id,project_name,level,sort_level,executor_userid,executor_username,pre_taskid,pre_taskname,start_time,end_time,milestone,description,remarks,create_userid,create_username,create_time,rate,budget_cost,budget_workload,act_cost,act_workload,task_state,task_type,task_class,to_task_center,act_start_time,act_end_time,biz_proc_inst_id,biz_flow_state,phase_id,phase_name,task_skill_names,exe_usernames,task_skill_ids,exe_userids,task_out,plan_type,settle_schemel,menu_id,menu_name,product_id,cbranch_id,cdeptid,tag_ids,tag_names,ntype,children_cnt,ltime,pid_paths,lvl,is_tpl,key_path,uni_inner_price,uni_out_price,calc_type,ptype,wtype,bctrl,rworkload,eworkload;<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -206,8 +206,11 @@ public class XmTask  implements java.io.Serializable {
 	@ApiModelProperty(notes="报工限制0-不限制，1-不得超出预估工时",allowEmptyValue=true,example="",allowableValues="")
 	String bctrl;
 	
-	@ApiModelProperty(notes="任务剩余工时，手工填写，计划由下往上汇总",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="剩余工作量(永远不保存数据，参与estimate",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal rworkload;
+	
+	@ApiModelProperty(notes="重新评估工作量，eworkload=(rworkload+act_workload)",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal eworkload;
 
 	/**任务编号**/
 	public XmTask(String id) {
@@ -591,11 +594,17 @@ public class XmTask  implements java.io.Serializable {
 		this.bctrl = bctrl;
 	}
 	/**
-	 * 任务剩余工时，手工填写，计划由下往上汇总
+	 * 剩余工作量(永远不保存数据，参与estimate
 	 **/
 	public void setRworkload(BigDecimal rworkload) {
 		this.rworkload = rworkload;
 	}
+	/**
+	 * 重新评估工作量，eworkload=(rworkload+act_workload)
+	 **/
+	public void setEworkload(BigDecimal eworkload) {
+		this.eworkload = eworkload;
+	}
 	
 	/**
 	 * 任务编号
@@ -970,10 +979,16 @@ public class XmTask  implements java.io.Serializable {
 		return this.bctrl;
 	}
 	/**
-	 * 任务剩余工时，手工填写，计划由下往上汇总
+	 * 剩余工作量(永远不保存数据，参与estimate
 	 **/
 	public BigDecimal getRworkload() {
 		return this.rworkload;
 	}
+	/**
+	 * 重新评估工作量，eworkload=(rworkload+act_workload)
+	 **/
+	public BigDecimal getEworkload() {
+		return this.eworkload;
+	}
 
 }

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

@@ -140,7 +140,7 @@
 		insert into xm_question(
 			<include refid="columns"/>
 		) values (
-		#{id},#{name},#{projectId},#{projectName},#{caseId},#{caseName},#{endTime},#{askUserid},#{askUsername},#{handlerUserid},#{handlerUsername},#{priority},#{solution},#{description},#{createUserid},#{createUsername},#{createTime},#{bugStatus},#{bizProcInstId},#{bizFlowState},#{menuId},#{menuName},#{budgetWorkload},#{budgetCost},#{actWorkload},#{actCost},#{expectResult},#{opStep},#{currResult},#{refRequire},#{bugSeverity},#{bugType},#{tagIds},#{tagNames},#{urls},#{ltime},#{qtype},#{caseExecId},#{remarks},#{productId},#{repRate},#{verNum},#{vpath},#{pverNum},#{bugReason},#{rate},#{rworkload}
+		#{id},#{name},#{projectId},#{projectName},#{caseId},#{caseName},#{endTime},#{askUserid},#{askUsername},#{handlerUserid},#{handlerUsername},#{priority},#{solution},#{description},#{createUserid},#{createUsername},#{createTime},#{bugStatus},#{bizProcInstId},#{bizFlowState},#{menuId},#{menuName},#{budgetWorkload},#{budgetCost},#{actWorkload},#{actCost},#{expectResult},#{opStep},#{currResult},#{refRequire},#{bugSeverity},#{bugType},#{tagIds},#{tagNames},#{urls},#{ltime},#{qtype},#{caseExecId},#{remarks},#{productId},#{repRate},#{verNum},#{vpath},#{pverNum},#{bugReason},#{rate},#{rworkload},#{eworkload}
 		)
 	</insert>
 	
@@ -203,7 +203,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		id,name,project_id,project_name,case_id,case_name,end_time,ask_userid,ask_username,handler_userid,handler_username,priority,solution,description,create_userid,create_username,create_time,bug_status,biz_proc_inst_id,biz_flow_state,menu_id,menu_name,budget_workload,budget_cost,act_workload,act_cost,expect_result,op_step,curr_result,ref_require,bug_severity,bug_type,tag_ids,tag_names,urls,ltime,qtype,case_exec_id,remarks,product_id,rep_rate,ver_num,vpath,pver_num,bug_reason,rate,rworkload
+		id,name,project_id,project_name,case_id,case_name,end_time,ask_userid,ask_username,handler_userid,handler_username,priority,solution,description,create_userid,create_username,create_time,bug_status,biz_proc_inst_id,biz_flow_state,menu_id,menu_name,budget_workload,budget_cost,act_workload,act_cost,expect_result,op_step,curr_result,ref_require,bug_severity,bug_type,tag_ids,tag_names,urls,ltime,qtype,case_exec_id,remarks,product_id,rep_rate,ver_num,vpath,pver_num,bug_reason,rate,rworkload,eworkload
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -255,6 +255,7 @@
 		<if test="bugReason != null and bugReason != ''">      and res.bug_reason = #{bugReason}     </if>
 		<if test="rate != null and rate != ''">      and res.rate = #{rate}     </if>
 		<if test="rworkload != null and rworkload != ''">      and res.rworkload = #{rworkload}     </if>
+		<if test="eworkload != null and eworkload != ''">      and res.eworkload = #{eworkload}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -303,7 +304,8 @@
 		pver_num = #{pverNum},
 		bug_reason = #{bugReason},
 		rate = #{rate},
-		rworkload = #{rworkload}
+		rworkload = #{rworkload},
+		eworkload = #{eworkload}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="name != null and name != ''"> name = #{name},     </if>
@@ -352,6 +354,7 @@
 		<if test="bugReason != null and bugReason != ''"> bug_reason = #{bugReason},     </if>
 		<if test="rate != null and rate != ''"> rate = #{rate},     </if>
 		<if test="rworkload != null and rworkload != ''"> rworkload = #{rworkload},     </if>
+		<if test="eworkload != null and eworkload != ''"> eworkload = #{eworkload},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -400,6 +403,7 @@
 			pver_num = #{item.pverNum},
 			bug_reason = #{item.bugReason},
 			rate = #{item.rate},
-			rworkload = #{item.rworkload}
+			rworkload = #{item.rworkload},
+			eworkload = #{item.eworkload}
 	</sql>
 </mapper>

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

@@ -449,7 +449,7 @@
 		insert into xm_task(
 			<include refid="columns"/>
 		) values (
-		#{id},#{name},#{parentTaskid},#{parentTaskname},#{projectId},#{projectName},#{level},#{sortLevel},#{executorUserid},#{executorUsername},#{preTaskid},#{preTaskname},#{startTime},#{endTime},#{milestone},#{description},#{remarks},#{createUserid},#{createUsername},#{createTime},#{rate},#{budgetCost},#{budgetWorkload},#{actCost},#{actWorkload},#{taskState},#{taskType},#{taskClass},#{toTaskCenter},#{actStartTime},#{actEndTime},#{bizProcInstId},#{bizFlowState},#{phaseId},#{phaseName},#{taskSkillNames},#{exeUsernames},#{taskSkillIds},#{exeUserids},#{taskOut},#{planType},#{settleSchemel},#{menuId},#{menuName},#{productId},#{cbranchId},#{cdeptid},#{tagIds},#{tagNames},#{ntype},#{childrenCnt},#{ltime},#{pidPaths},#{lvl},#{isTpl},#{keyPath},#{uniInnerPrice},#{uniOutPrice},#{calcType},#{ptype},#{wtype},#{bctrl},#{rworkload}
+		#{id},#{name},#{parentTaskid},#{parentTaskname},#{projectId},#{projectName},#{level},#{sortLevel},#{executorUserid},#{executorUsername},#{preTaskid},#{preTaskname},#{startTime},#{endTime},#{milestone},#{description},#{remarks},#{createUserid},#{createUsername},#{createTime},#{rate},#{budgetCost},#{budgetWorkload},#{actCost},#{actWorkload},#{taskState},#{taskType},#{taskClass},#{toTaskCenter},#{actStartTime},#{actEndTime},#{bizProcInstId},#{bizFlowState},#{phaseId},#{phaseName},#{taskSkillNames},#{exeUsernames},#{taskSkillIds},#{exeUserids},#{taskOut},#{planType},#{settleSchemel},#{menuId},#{menuName},#{productId},#{cbranchId},#{cdeptid},#{tagIds},#{tagNames},#{ntype},#{childrenCnt},#{ltime},#{pidPaths},#{lvl},#{isTpl},#{keyPath},#{uniInnerPrice},#{uniOutPrice},#{calcType},#{ptype},#{wtype},#{bctrl},#{rworkload},#{eworkload}
 		)
 	</insert>
 	
@@ -512,7 +512,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		id,name,parent_taskid,parent_taskname,project_id,project_name,level,sort_level,executor_userid,executor_username,pre_taskid,pre_taskname,start_time,end_time,milestone,description,remarks,create_userid,create_username,create_time,rate,budget_cost,budget_workload,act_cost,act_workload,task_state,task_type,task_class,to_task_center,act_start_time,act_end_time,biz_proc_inst_id,biz_flow_state,phase_id,phase_name,task_skill_names,exe_usernames,task_skill_ids,exe_userids,task_out,plan_type,settle_schemel,menu_id,menu_name,product_id,cbranch_id,cdeptid,tag_ids,tag_names,ntype,children_cnt,ltime,pid_paths,lvl,is_tpl,key_path,uni_inner_price,uni_out_price,calc_type,ptype,wtype,bctrl,rworkload
+		id,name,parent_taskid,parent_taskname,project_id,project_name,level,sort_level,executor_userid,executor_username,pre_taskid,pre_taskname,start_time,end_time,milestone,description,remarks,create_userid,create_username,create_time,rate,budget_cost,budget_workload,act_cost,act_workload,task_state,task_type,task_class,to_task_center,act_start_time,act_end_time,biz_proc_inst_id,biz_flow_state,phase_id,phase_name,task_skill_names,exe_usernames,task_skill_ids,exe_userids,task_out,plan_type,settle_schemel,menu_id,menu_name,product_id,cbranch_id,cdeptid,tag_ids,tag_names,ntype,children_cnt,ltime,pid_paths,lvl,is_tpl,key_path,uni_inner_price,uni_out_price,calc_type,ptype,wtype,bctrl,rworkload,eworkload
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -580,6 +580,7 @@
 		<if test="wtype != null and wtype != ''">      and res.wtype = #{wtype}     </if>
 		<if test="bctrl != null and bctrl != ''">      and res.bctrl = #{bctrl}     </if>
 		<if test="rworkload != null and rworkload != ''">      and res.rworkload = #{rworkload}     </if>
+		<if test="eworkload != null and eworkload != ''">      and res.eworkload = #{eworkload}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -644,7 +645,8 @@
 		ptype = #{ptype},
 		wtype = #{wtype},
 		bctrl = #{bctrl},
-		rworkload = #{rworkload}
+		rworkload = #{rworkload},
+		eworkload = #{eworkload}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="name != null and name != ''"> name = #{name},     </if>
@@ -709,6 +711,7 @@
 		<if test="wtype != null and wtype != ''"> wtype = #{wtype},     </if>
 		<if test="bctrl != null and bctrl != ''"> bctrl = #{bctrl},     </if>
 		<if test="rworkload != null and rworkload != ''"> rworkload = #{rworkload},     </if>
+		<if test="eworkload != null and eworkload != ''"> eworkload = #{eworkload},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -773,6 +776,7 @@
 			ptype = #{item.ptype},
 			wtype = #{item.wtype},
 			bctrl = #{item.bctrl},
-			rworkload = #{item.rworkload}
+			rworkload = #{item.rworkload},
+			eworkload = #{item.eworkload}
 	</sql>
 </mapper>