From e18a04070c3a13cf1bef557f51edbafaeb91e400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Tue, 29 Mar 2022 15:40:28 +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 --- .../main/java/com/xm/core/entity/XmMenu.java | 57 ++++++++++++------- .../java/com/xm/core/entity/XmQuestion.java | 25 ++++++-- .../main/java/com/xm/core/entity/XmTask.java | 31 +++++++--- .../mapper/xm/core/dao/XmMenuMapper.xml | 28 +++++---- .../mapper/xm/core/dao/XmQuestionMapper.xml | 12 ++-- .../mapper/xm/core/dao/XmTaskMapper.xml | 12 ++-- 6 files changed, 111 insertions(+), 54 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/entity/XmMenu.java b/xm-core/src/main/java/com/xm/core/entity/XmMenu.java index 780bc1d6..cab255e6 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmMenu.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmMenu.java @@ -8,9 +8,9 @@ import java.math.BigDecimal; /** * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmMenu所有属性名:
- * startTime,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,mactWorkload,mactAmount,mactRate,source,proposerId,proposerName,dlvl,dtype,priority,dclass,iterationName,endTime;
+ * startTime,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,budgetCost,phaseId,iterationId,calcType,mactWorkload,mactCost,mactRate,source,proposerId,proposerName,dlvl,dtype,priority,dclass,iterationName,endTime,rworkload;
* 表 xm_menu 功能表的所有字段名:
- * start_time,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,mact_workload,mact_amount,mact_rate,source,proposer_id,proposer_name,dlvl,dtype,priority,dclass,iteration_name,end_time;
+ * start_time,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_cost,phase_id,iteration_id,calc_type,mact_workload,mact_cost,mact_rate,source,proposer_id,proposer_name,dlvl,dtype,priority,dclass,iteration_name,end_time,rworkload;
* 当前主键(包括多主键):
* menu_id;
*/ @@ -111,7 +111,7 @@ public class XmMenu implements java.io.Serializable { BigDecimal budgetWorkload; @ApiModelProperty(notes="预算金额，从上到下汇总，从上到下分配，下级汇总不能大于上级",allowEmptyValue=true,example="",allowableValues="") - BigDecimal budgetAmount; + BigDecimal budgetCost; @ApiModelProperty(notes="计划编号",allowEmptyValue=true,example="",allowableValues="") String phaseId; @@ -122,13 +122,13 @@ public class XmMenu implements java.io.Serializable { @ApiModelProperty(notes="叶子节点数据收集方式0-不计算，1-由任务汇总，2-手工填报，3-下往上",allowEmptyValue=true,example="",allowableValues="") String calcType; - @ApiModelProperty(notes="手工填报的情况下填报的工作量，其余为下级往上汇总数据",allowEmptyValue=true,example="",allowableValues="") + @ApiModelProperty(notes="用户故事由任务和bug报工工时汇总，其余为下级往上汇总数据",allowEmptyValue=true,example="",allowableValues="") BigDecimal mactWorkload; - @ApiModelProperty(notes="手工填报情况下填报的费用总额，其余为下级往上汇总数据",allowEmptyValue=true,example="",allowableValues="") - String mactAmount; + @ApiModelProperty(notes="用户故事由任务和bug报工工时汇总工时*工时单价，其余为下级往上汇总数据",allowEmptyValue=true,example="",allowableValues="") + String mactCost; - @ApiModelProperty(notes="手工填报下的进度",allowEmptyValue=true,example="",allowableValues="") + @ApiModelProperty(notes="用户故事由任务和bug报工工时/(报工工时+剩余工时)汇总，其余为下级往上汇总数据",allowEmptyValue=true,example="",allowableValues="") Integer mactRate; @ApiModelProperty(notes="需求来源",allowEmptyValue=true,example="",allowableValues="") @@ -157,6 +157,9 @@ public class XmMenu implements java.io.Serializable { @ApiModelProperty(notes="结束时间",allowEmptyValue=true,example="",allowableValues="") Date endTime; + + @ApiModelProperty(notes="用户故事由任务和bug报工剩余工时汇总，其余为下级往上汇总数据",allowEmptyValue=true,example="",allowableValues="") + BigDecimal rworkload; /**功能编号**/ public XmMenu(String menuId) { @@ -350,8 +353,8 @@ public class XmMenu implements java.io.Serializable { /** * 预算金额，从上到下汇总，从上到下分配，下级汇总不能大于上级 **/ - public void setBudgetAmount(BigDecimal budgetAmount) { - this.budgetAmount = budgetAmount; + public void setBudgetCost(BigDecimal budgetCost) { + this.budgetCost = budgetCost; } /** * 计划编号 @@ -372,19 +375,19 @@ public class XmMenu implements java.io.Serializable { this.calcType = calcType; } /** - * 手工填报的情况下填报的工作量，其余为下级往上汇总数据 + * 用户故事由任务和bug报工工时汇总，其余为下级往上汇总数据 **/ public void setMactWorkload(BigDecimal mactWorkload) { this.mactWorkload = mactWorkload; } /** - * 手工填报情况下填报的费用总额，其余为下级往上汇总数据 + * 用户故事由任务和bug报工工时汇总工时*工时单价，其余为下级往上汇总数据 **/ - public void setMactAmount(String mactAmount) { - this.mactAmount = mactAmount; + public void setMactCost(String mactCost) { + this.mactCost = mactCost; } /** - * 手工填报下的进度 + * 用户故事由任务和bug报工工时/(报工工时+剩余工时)汇总，其余为下级往上汇总数据 **/ public void setMactRate(Integer mactRate) { this.mactRate = mactRate; @@ -443,6 +446,12 @@ public class XmMenu implements java.io.Serializable { public void setEndTime(Date endTime) { this.endTime = endTime; } + /** + * 用户故事由任务和bug报工剩余工时汇总，其余为下级往上汇总数据 + **/ + public void setRworkload(BigDecimal rworkload) { + this.rworkload = rworkload; + } /** * 开始时间 @@ -627,8 +636,8 @@ public class XmMenu implements java.io.Serializable { /** * 预算金额，从上到下汇总，从上到下分配，下级汇总不能大于上级 **/ - public BigDecimal getBudgetAmount() { - return this.budgetAmount; + public BigDecimal getBudgetCost() { + return this.budgetCost; } /** * 计划编号 @@ -649,19 +658,19 @@ public class XmMenu implements java.io.Serializable { return this.calcType; } /** - * 手工填报的情况下填报的工作量，其余为下级往上汇总数据 + * 用户故事由任务和bug报工工时汇总，其余为下级往上汇总数据 **/ public BigDecimal getMactWorkload() { return this.mactWorkload; } /** - * 手工填报情况下填报的费用总额，其余为下级往上汇总数据 + * 用户故事由任务和bug报工工时汇总工时*工时单价，其余为下级往上汇总数据 **/ - public String getMactAmount() { - return this.mactAmount; + public String getMactCost() { + return this.mactCost; } /** - * 手工填报下的进度 + * 用户故事由任务和bug报工工时/(报工工时+剩余工时)汇总，其余为下级往上汇总数据 **/ public Integer getMactRate() { return this.mactRate; @@ -720,5 +729,11 @@ public class XmMenu implements java.io.Serializable { public Date getEndTime() { return this.endTime; } + /** + * 用户故事由任务和bug报工剩余工时汇总，其余为下级往上汇总数据 + **/ + public BigDecimal getRworkload() { + return this.rworkload; + } } \ No newline at end of file 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 9942a61d..6eb3dbf0 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;
+ * 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;
* 表 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;
+ * 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;
*/ @@ -92,7 +92,7 @@ public class XmQuestion implements java.io.Serializable { @ApiModelProperty(notes="预估成本金额",allowEmptyValue=true,example="",allowableValues="") BigDecimal budgetCost; - @ApiModelProperty(notes="实际工时",allowEmptyValue=true,example="",allowableValues="") + @ApiModelProperty(notes="实际工时（取报工实际工时汇总）",allowEmptyValue=true,example="",allowableValues="") BigDecimal actWorkload; @ApiModelProperty(notes="实际总金额",allowEmptyValue=true,example="",allowableValues="") @@ -157,6 +157,9 @@ public class XmQuestion implements java.io.Serializable { @ApiModelProperty(notes="进度0-100",allowEmptyValue=true,example="",allowableValues="") Integer rate; + + @ApiModelProperty(notes="剩余工时，手工填写",allowEmptyValue=true,example="",allowableValues="") + BigDecimal rworkload; /**问题编号**/ public XmQuestion(String id) { @@ -312,7 +315,7 @@ public class XmQuestion implements java.io.Serializable { this.budgetCost = budgetCost; } /** - * 实际工时 + * 实际工时（取报工实际工时汇总） **/ public void setActWorkload(BigDecimal actWorkload) { this.actWorkload = actWorkload; @@ -443,6 +446,12 @@ public class XmQuestion implements java.io.Serializable { public void setRate(Integer rate) { this.rate = rate; } + /** + * 剩余工时，手工填写 + **/ + public void setRworkload(BigDecimal rworkload) { + this.rworkload = rworkload; + } /** * 问题编号 @@ -589,7 +598,7 @@ public class XmQuestion implements java.io.Serializable { return this.budgetCost; } /** - * 实际工时 + * 实际工时（取报工实际工时汇总） **/ public BigDecimal getActWorkload() { return this.actWorkload; @@ -720,5 +729,11 @@ public class XmQuestion implements java.io.Serializable { public Integer getRate() { return this.rate; } + /** + * 剩余工时，手工填写 + **/ + public BigDecimal getRworkload() { + return this.rworkload; + } } \ 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 3b77acfb..b602aead 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;
+ * 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;
* 表 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;
+ * 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;
*/ @@ -80,7 +80,7 @@ public class XmTask implements java.io.Serializable { @ApiModelProperty(notes="创建时间",allowEmptyValue=true,example="",allowableValues="") Date createTime; - @ApiModelProperty(notes="任务进度0-100（=实际工时/预算工时*100）",allowEmptyValue=true,example="",allowableValues="") + @ApiModelProperty(notes="任务进度0-100（=实际工时/(实际工时+剩余工时)*100）",allowEmptyValue=true,example="",allowableValues="") Integer rate; @ApiModelProperty(notes="当前任务预算金额（calc_type=2时预算工时*单价，calc_type=1时下级汇总）",allowEmptyValue=true,example="",allowableValues="") @@ -92,7 +92,7 @@ public class XmTask implements java.io.Serializable { @ApiModelProperty(notes="当前任务实际费用金额（calc_type=2时，取实际工时*单价，calc_type=1时取下级汇总数据）待结算金额",allowEmptyValue=true,example="",allowableValues="") BigDecimal actCost; - @ApiModelProperty(notes="实际工时(calc_type=2时，取工时表数据，calc_type=1时取下级汇总数据)",allowEmptyValue=true,example="",allowableValues="") + @ApiModelProperty(notes="任务取工时表报工工时汇总，",allowEmptyValue=true,example="",allowableValues="") BigDecimal actWorkload; @ApiModelProperty(notes="任务状态0待领取1已领取执行中2已完工3已结算",allowEmptyValue=true,example="",allowableValues="") @@ -205,6 +205,9 @@ public class XmTask implements java.io.Serializable { @ApiModelProperty(notes="报工限制0-不限制，1-不得超出预估工时",allowEmptyValue=true,example="",allowableValues="") String bctrl; + + @ApiModelProperty(notes="任务剩余工时，手工填写，计划由下往上汇总",allowEmptyValue=true,example="",allowableValues="") + BigDecimal rworkload; /**任务编号**/ public XmTask(String id) { @@ -336,7 +339,7 @@ public class XmTask implements java.io.Serializable { this.createTime = createTime; } /** - * 任务进度0-100（=实际工时/预算工时*100） + * 任务进度0-100（=实际工时/(实际工时+剩余工时)*100） **/ public void setRate(Integer rate) { this.rate = rate; @@ -360,7 +363,7 @@ public class XmTask implements java.io.Serializable { this.actCost = actCost; } /** - * 实际工时(calc_type=2时，取工时表数据，calc_type=1时取下级汇总数据) + * 任务取工时表报工工时汇总， **/ public void setActWorkload(BigDecimal actWorkload) { this.actWorkload = actWorkload; @@ -587,6 +590,12 @@ public class XmTask implements java.io.Serializable { public void setBctrl(String bctrl) { this.bctrl = bctrl; } + /** + * 任务剩余工时，手工填写，计划由下往上汇总 + **/ + public void setRworkload(BigDecimal rworkload) { + this.rworkload = rworkload; + } /** * 任务编号 @@ -709,7 +718,7 @@ public class XmTask implements java.io.Serializable { return this.createTime; } /** - * 任务进度0-100（=实际工时/预算工时*100） + * 任务进度0-100（=实际工时/(实际工时+剩余工时)*100） **/ public Integer getRate() { return this.rate; @@ -733,7 +742,7 @@ public class XmTask implements java.io.Serializable { return this.actCost; } /** - * 实际工时(calc_type=2时，取工时表数据，calc_type=1时取下级汇总数据) + * 任务取工时表报工工时汇总， **/ public BigDecimal getActWorkload() { return this.actWorkload; @@ -960,5 +969,11 @@ public class XmTask implements java.io.Serializable { public String getBctrl() { return this.bctrl; } + /** + * 任务剩余工时，手工填写，计划由下往上汇总 + **/ + public BigDecimal getRworkload() { + return this.rworkload; + } } \ No newline at end of file diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml index 9fabd758..68221dfb 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml @@ -245,7 +245,7 @@ insert into xm_menu( ) values ( - #{startTime},#{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},#{mactWorkload},#{mactAmount},#{mactRate},#{source},#{proposerId},#{proposerName},#{dlvl},#{dtype},#{priority},#{dclass},#{iterationName},#{endTime} + #{startTime},#{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},#{budgetCost},#{phaseId},#{iterationId},#{calcType},#{mactWorkload},#{mactCost},#{mactRate},#{source},#{proposerId},#{proposerName},#{dlvl},#{dtype},#{priority},#{dclass},#{iterationName},#{endTime},#{rworkload} ) @@ -308,7 +308,7 @@ - start_time,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,mact_workload,mact_amount,mact_rate,source,proposer_id,proposer_name,dlvl,dtype,priority,dclass,iteration_name,end_time + start_time,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_cost,phase_id,iteration_id,calc_type,mact_workload,mact_cost,mact_rate,source,proposer_id,proposer_name,dlvl,dtype,priority,dclass,iteration_name,end_time,rworkload @@ -343,12 +343,12 @@ and res.budget_hours = #{budgetHours} and res.budget_staff_nu = #{budgetStaffNu} and res.budget_workload = #{budgetWorkload} - and res.budget_amount = #{budgetAmount} + and res.budget_cost = #{budgetCost} and res.phase_id = #{phaseId} and res.iteration_id = #{iterationId} and res.calc_type = #{calcType} and res.mact_workload = #{mactWorkload} - and res.mact_amount = #{mactAmount} + and res.mact_cost = #{mactCost} and res.mact_rate = #{mactRate} and res.source = #{source} and res.proposer_id = #{proposerId} @@ -359,6 +359,7 @@ and res.dclass = #{dclass} and res.iteration_name = #{iterationName} and date_format(res.end_time,'%Y-%m-%d') = date_format(#{endTime},'%Y-%m-%d') + and res.rworkload = #{rworkload} @@ -391,12 +392,12 @@ budget_hours = #{budgetHours}, budget_staff_nu = #{budgetStaffNu}, budget_workload = #{budgetWorkload}, - budget_amount = #{budgetAmount}, + budget_cost = #{budgetCost}, phase_id = #{phaseId}, iteration_id = #{iterationId}, calc_type = #{calcType}, mact_workload = #{mactWorkload}, - mact_amount = #{mactAmount}, + mact_cost = #{mactCost}, mact_rate = #{mactRate}, source = #{source}, proposer_id = #{proposerId}, @@ -406,7 +407,8 @@ priority = #{priority}, dclass = #{dclass}, iteration_name = #{iterationName}, - end_time = #{endTime} + end_time = #{endTime}, + rworkload = #{rworkload} start_time = #{startTime}, @@ -438,12 +440,12 @@ budget_hours = #{budgetHours}, budget_staff_nu = #{budgetStaffNu}, budget_workload = #{budgetWorkload}, - budget_amount = #{budgetAmount}, + budget_cost = #{budgetCost}, phase_id = #{phaseId}, iteration_id = #{iterationId}, calc_type = #{calcType}, mact_workload = #{mactWorkload}, - mact_amount = #{mactAmount}, + mact_cost = #{mactCost}, mact_rate = #{mactRate}, source = #{source}, proposer_id = #{proposerId}, @@ -454,6 +456,7 @@ dclass = #{dclass}, iteration_name = #{iterationName}, end_time = #{endTime}, + rworkload = #{rworkload}, @@ -486,12 +489,12 @@ budget_hours = #{item.budgetHours}, budget_staff_nu = #{item.budgetStaffNu}, budget_workload = #{item.budgetWorkload}, - budget_amount = #{item.budgetAmount}, + budget_cost = #{item.budgetCost}, phase_id = #{item.phaseId}, iteration_id = #{item.iterationId}, calc_type = #{item.calcType}, mact_workload = #{item.mactWorkload}, - mact_amount = #{item.mactAmount}, + mact_cost = #{item.mactCost}, mact_rate = #{item.mactRate}, source = #{item.source}, proposer_id = #{item.proposerId}, @@ -501,6 +504,7 @@ priority = #{item.priority}, dclass = #{item.dclass}, iteration_name = #{item.iterationName}, - end_time = #{item.endTime} + end_time = #{item.endTime}, + rworkload = #{item.rworkload} \ 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 5e3dc733..22c71474 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} + #{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} ) @@ -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 + 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 @@ -254,6 +254,7 @@ and res.pver_num = #{pverNum} and res.bug_reason = #{bugReason} and res.rate = #{rate} + and res.rworkload = #{rworkload} @@ -301,7 +302,8 @@ vpath = #{vpath}, pver_num = #{pverNum}, bug_reason = #{bugReason}, - rate = #{rate} + rate = #{rate}, + rworkload = #{rworkload} name = #{name}, @@ -349,6 +351,7 @@ pver_num = #{pverNum}, bug_reason = #{bugReason}, rate = #{rate}, + rworkload = #{rworkload}, @@ -396,6 +399,7 @@ vpath = #{item.vpath}, pver_num = #{item.pverNum}, bug_reason = #{item.bugReason}, - rate = #{item.rate} + rate = #{item.rate}, + rworkload = #{item.rworkload} \ 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 b67c598b..f559001e 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 @@ -418,7 +418,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} + #{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} ) @@ -481,7 +481,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 + 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 @@ -548,6 +548,7 @@ and res.ptype = #{ptype} and res.wtype = #{wtype} and res.bctrl = #{bctrl} + and res.rworkload = #{rworkload} @@ -611,7 +612,8 @@ calc_type = #{calcType}, ptype = #{ptype}, wtype = #{wtype}, - bctrl = #{bctrl} + bctrl = #{bctrl}, + rworkload = #{rworkload} name = #{name}, @@ -675,6 +677,7 @@ ptype = #{ptype}, wtype = #{wtype}, bctrl = #{bctrl}, + rworkload = #{rworkload}, @@ -738,6 +741,7 @@ calc_type = #{item.calcType}, ptype = #{item.ptype}, wtype = #{item.wtype}, - bctrl = #{item.bctrl} + bctrl = #{item.bctrl}, + rworkload = #{item.rworkload} \ No newline at end of file