From 34451dd556a4f31663e680964126321335aa74d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 1 Apr 2022 00:11:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xm/core/entity/XmQuestion.java | 25 +++++++++++++++---- .../main/java/com/xm/core/entity/XmTask.java | 25 +++++++++++++++---- .../mapper/xm/core/dao/XmQuestionMapper.xml | 12 ++++++--- .../mapper/xm/core/dao/XmTaskMapper.xml | 12 ++++++--- 4 files changed, 56 insertions(+), 18 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/entity/XmQuestion.java b/xm-core/src/main/java/com/xm/core/entity/XmQuestion.java index 6eb3dbf0..fdaf9cdd 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmQuestion.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmQuestion.java @@ -8,9 +8,9 @@ import java.math.BigDecimal; /** * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmQuestion所有属性名:
- * 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;
* 表 xm_question xm_question的所有字段名:
- * 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;
* 当前主键(包括多主键):
* id;
*/ @@ -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; + } } \ No newline at end of file diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTask.java b/xm-core/src/main/java/com/xm/core/entity/XmTask.java index b602aead..ae8fb98b 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmTask.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmTask.java @@ -8,9 +8,9 @@ import java.math.BigDecimal; /** * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmTask所有属性名:
- * 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;
* 表 xm_task xm_task的所有字段名:
- * 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;
* 当前主键(包括多主键):
* id;
*/ @@ -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; + } } \ No newline at end of file diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml index 22c71474..fa632f67 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml @@ -140,7 +140,7 @@ insert into xm_question( ) 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} ) @@ -203,7 +203,7 @@ - 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 @@ -255,6 +255,7 @@ and res.bug_reason = #{bugReason} and res.rate = #{rate} and res.rworkload = #{rworkload} + and res.eworkload = #{eworkload} @@ -303,7 +304,8 @@ pver_num = #{pverNum}, bug_reason = #{bugReason}, rate = #{rate}, - rworkload = #{rworkload} + rworkload = #{rworkload}, + eworkload = #{eworkload} name = #{name}, @@ -352,6 +354,7 @@ bug_reason = #{bugReason}, rate = #{rate}, rworkload = #{rworkload}, + eworkload = #{eworkload}, @@ -400,6 +403,7 @@ pver_num = #{item.pverNum}, bug_reason = #{item.bugReason}, rate = #{item.rate}, - rworkload = #{item.rworkload} + rworkload = #{item.rworkload}, + eworkload = #{item.eworkload} \ No newline at end of file diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml index ae06cded..d9e1a769 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml @@ -449,7 +449,7 @@ insert into xm_task( ) 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} ) @@ -512,7 +512,7 @@ - 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 @@ -580,6 +580,7 @@ and res.wtype = #{wtype} and res.bctrl = #{bctrl} and res.rworkload = #{rworkload} + and res.eworkload = #{eworkload} @@ -644,7 +645,8 @@ ptype = #{ptype}, wtype = #{wtype}, bctrl = #{bctrl}, - rworkload = #{rworkload} + rworkload = #{rworkload}, + eworkload = #{eworkload} name = #{name}, @@ -709,6 +711,7 @@ wtype = #{wtype}, bctrl = #{bctrl}, rworkload = #{rworkload}, + eworkload = #{eworkload}, @@ -773,6 +776,7 @@ ptype = #{item.ptype}, wtype = #{item.wtype}, bctrl = #{item.bctrl}, - rworkload = #{item.rworkload} + rworkload = #{item.rworkload}, + eworkload = #{item.eworkload} \ No newline at end of file