diff --git a/xm-core/src/main/java/com/xm/core/entity/XmPhase.java b/xm-core/src/main/java/com/xm/core/entity/XmPhase.java index 10102cb7..fea67211 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmPhase.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmPhase.java @@ -7,15 +7,15 @@ import java.math.BigDecimal; /** * 组织 com 顶级模块 xm 大模块 core 小模块
- * 实体 XmProjectPhase所有属性名:
- * 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;
- * 表 xm_project_phase 项目阶段模板的所有字段名:
- * 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;
+ * 实体 XmPhase所有属性名:
+ * id,name,remark,parentId,branchId,projectId,beginDate,endDate,budgetHours,budgetStaffNu,ctime,budgetNouserAt,budgetIuserAt,budgetOuserAt,baselineId,bizProcInstId,bizFlowState,budgetWorkload,actWorkload,actIuserWorkload,actOuserWorkload,taskType,planType,seqNo,udgetIuserWorkload,budgetOuserWorkload,actNouserAt,actIuserAt,budgetIuserPrice,budgetOuserPrice,budgetOuserCnt,budgetIuserCnt,actRate,pstatus,actOutUserAt,taskCnt,finishTaskCnt,iterationCnt,calcTime,taskBudgetWorkload,taskBudgetAt,mngUserid,mngUsername,milestone,pleaf,tagIds,tagNames,ntype,childrenCnt,ltime,isKeyPath,pidPaths,lvl,isTpl,phaseClass,productId,budgetAt,calcType,actAt;
+ * 表 xm_phase 项目、产品计划表（将计划并入任务表，暂时作废），合并进任务表了的所有字段名:
+ * id,name,remark,parent_id,branch_id,project_id,begin_date,end_date,budget_hours,budget_staff_nu,ctime,budget_nouser_at,budget_iuser_at,budget_ouser_at,baseline_id,biz_proc_inst_id,biz_flow_state,budget_workload,act_workload,act_iuser_workload,act_ouser_workload,task_type,plan_type,seq_no,udget_iuser_workload,budget_ouser_workload,act_nouser_at,act_iuser_at,budget_iuser_price,budget_ouser_price,budget_ouser_cnt,budget_iuser_cnt,act_rate,pstatus,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,budget_at,calc_type,act_at;
* 当前主键(包括多主键):
* id;
*/ -@ApiModel(description="项目阶段模板") -public class XmPhase implements java.io.Serializable { +@ApiModel(description="项目、产品计划表（将计划并入任务表，暂时作废），合并进任务表了") +public class XmPhase implements java.io.Serializable { private static final long serialVersionUID = 1L; @@ -24,13 +24,13 @@ public class XmPhase implements java.io.Serializable { @ApiModelProperty(notes="阶段名称",allowEmptyValue=true,example="",allowableValues="") - String phaseName; + String name; @ApiModelProperty(notes="备注",allowEmptyValue=true,example="",allowableValues="") String remark; @ApiModelProperty(notes="上级阶段编号",allowEmptyValue=true,example="",allowableValues="") - String parentPhaseId; + String parentId; @ApiModelProperty(notes="机构编号",allowEmptyValue=true,example="",allowableValues="") String branchId; @@ -45,25 +45,25 @@ public class XmPhase implements java.io.Serializable { Date endDate; @ApiModelProperty(notes="工时(上到下控制大于儿子总数)-应该大于或等于task中总工时",allowEmptyValue=true,example="",allowableValues="") - BigDecimal phaseBudgetHours; + BigDecimal budgetHours; @ApiModelProperty(notes="投入人员数(上到下控制大于儿子总数)-应该大于或等于task中总人数",allowEmptyValue=true,example="",allowableValues="") - Integer phaseBudgetStaffNu; + Integer budgetStaffNu; @ApiModelProperty(notes="创建时间",allowEmptyValue=true,example="",allowableValues="") Date ctime; @ApiModelProperty(notes="非人力成本总预算(上到下控制大于儿子总数)-应该大于或等于task中非人力总成本",allowEmptyValue=true,example="",allowableValues="") - BigDecimal phaseBudgetNouserAt; + BigDecimal budgetNouserAt; @ApiModelProperty(notes="内部人力成本总预算(上到下控制大于儿子总数)-应该大于或等于task中内部人力总成本",allowEmptyValue=true,example="",allowableValues="") - BigDecimal phaseBudgetInnerUserAt; + BigDecimal budgetIuserAt; @ApiModelProperty(notes="外购人力成本总预算(上到下控制大于儿子总数)-应该大于或等于task中外购总成本",allowEmptyValue=true,example="",allowableValues="") - BigDecimal phaseBudgetOutUserAt; + BigDecimal budgetOuserAt; @ApiModelProperty(notes="项目级基线",allowEmptyValue=true,example="",allowableValues="") - String projectBaselineId; + String baselineId; @ApiModelProperty(notes="当前流程实例编号",allowEmptyValue=true,example="",allowableValues="") String bizProcInstId; @@ -72,16 +72,16 @@ public class XmPhase implements java.io.Serializable { String bizFlowState; @ApiModelProperty(notes="总工作量单位人时上到下控制大于儿子总数-应该大于或者等于task中的预算总工作量",allowEmptyValue=true,example="",allowableValues="") - BigDecimal phaseBudgetWorkload; + BigDecimal budgetWorkload; @ApiModelProperty(notes="已完成工作量单位人时-从task中的实际工作量算出",allowEmptyValue=true,example="",allowableValues="") - BigDecimal phaseActWorkload; + BigDecimal actWorkload; @ApiModelProperty(notes="实际内部人力工作量-来自任务表合计",allowEmptyValue=true,example="",allowableValues="") - BigDecimal phaseActInnerUserWorkload; + BigDecimal actIuserWorkload; @ApiModelProperty(notes="实际外购人力工作量-来自任务表合计",allowEmptyValue=true,example="",allowableValues="") - BigDecimal phaseActOutUserWorkload; + BigDecimal actOuserWorkload; @ApiModelProperty(notes="0售前方案1投标2需求3设计4开发5测试6验收7部署8运维--来自基础数据表taskType",allowEmptyValue=true,example="",allowableValues="") String taskType; @@ -93,34 +93,34 @@ public class XmPhase implements java.io.Serializable { String seqNo; @ApiModelProperty(notes="内部人力工作量总预算(上到下控制大于儿子总数)-应该大于或等于task中内部人力总成本",allowEmptyValue=true,example="",allowableValues="") - BigDecimal phaseBudgetInnerUserWorkload; + BigDecimal udgetIuserWorkload; @ApiModelProperty(notes="外购人力工作量总预算(上到下控制大于儿子总数)-应该大于或等于task中外购总成本",allowEmptyValue=true,example="",allowableValues="") - BigDecimal phaseBudgetOutUserWorkload; + BigDecimal budgetOuserWorkload; @ApiModelProperty(notes="实际非人力成本-来自任务表合计",allowEmptyValue=true,example="",allowableValues="") BigDecimal actNouserAt; @ApiModelProperty(notes="实际内部人力成本-来自任务表合计",allowEmptyValue=true,example="",allowableValues="") - BigDecimal actInnerUserAt; + BigDecimal actIuserAt; @ApiModelProperty(notes="内部人力成本单价元/人时",allowEmptyValue=true,example="",allowableValues="") - BigDecimal phaseBudgetInnerUserPrice; + BigDecimal budgetIuserPrice; @ApiModelProperty(notes="外购人力成本单价元/人时",allowEmptyValue=true,example="",allowableValues="") - BigDecimal phaseBudgetOutUserPrice; + BigDecimal budgetOuserPrice; @ApiModelProperty(notes="外购人数",allowEmptyValue=true,example="",allowableValues="") - Integer phaseBudgetOutUserCnt; + Integer budgetOuserCnt; @ApiModelProperty(notes="内部人数",allowEmptyValue=true,example="",allowableValues="") - Integer phaseBudgetInnerUserCnt; + Integer budgetIuserCnt; @ApiModelProperty(notes="实际进度0-100",allowEmptyValue=true,example="",allowableValues="") BigDecimal actRate; @ApiModelProperty(notes="阶段状态0初始1执行中2完工3关闭4删除中5已删除6暂停",allowEmptyValue=true,example="",allowableValues="") - String phaseStatus; + String pstatus; @ApiModelProperty(notes="实际外部人力成本",allowEmptyValue=true,example="",allowableValues="") BigDecimal actOutUserAt; @@ -161,7 +161,7 @@ public class XmPhase implements java.io.Serializable { @ApiModelProperty(notes="标签名称，逗号分割",allowEmptyValue=true,example="",allowableValues="") String tagNames; - @ApiModelProperty(notes="节点类型0-任务，1-计划项。计划项下建任务，任务下不允许建立任何子节点",allowEmptyValue=true,example="",allowableValues="") + @ApiModelProperty(notes="节点类型0-任务，1-任务集。任务集下建任务，任务下不允许建立任何子节点",allowEmptyValue=true,example="",allowableValues="") String ntype; @ApiModelProperty(notes="儿子节点个数",allowEmptyValue=true,example="",allowableValues="") @@ -189,17 +189,20 @@ public class XmPhase implements java.io.Serializable { String productId; @ApiModelProperty(notes="预算金额",allowEmptyValue=true,example="",allowableValues="") - BigDecimal phaseBudgetAt; + BigDecimal budgetAt; @ApiModelProperty(notes="叶子节点数据收集方式0-不计算，1-由任务汇总，2-手工填报",allowEmptyValue=true,example="",allowableValues="") String calcType; + + @ApiModelProperty(notes="实际金额，如手工填写，则为填写金额，否则为汇总金额",allowEmptyValue=true,example="",allowableValues="") + BigDecimal actAt; /**阶段主键**/ public XmPhase(String id) { this.id = id; } - /**项目阶段模板**/ + /**项目、产品计划表（将计划并入任务表，暂时作废），合并进任务表了**/ public XmPhase() { } @@ -212,8 +215,8 @@ public class XmPhase implements java.io.Serializable { /** * 阶段名称 **/ - public void setPhaseName(String phaseName) { - this.phaseName = phaseName; + public void setName(String name) { + this.name = name; } /** * 备注 @@ -224,8 +227,8 @@ public class XmPhase implements java.io.Serializable { /** * 上级阶段编号 **/ - public void setParentPhaseId(String parentPhaseId) { - this.parentPhaseId = parentPhaseId; + public void setParentId(String parentId) { + this.parentId = parentId; } /** * 机构编号 @@ -254,14 +257,14 @@ public class XmPhase implements java.io.Serializable { /** * 工时(上到下控制大于儿子总数)-应该大于或等于task中总工时 **/ - public void setPhaseBudgetHours(BigDecimal phaseBudgetHours) { - this.phaseBudgetHours = phaseBudgetHours; + public void setBudgetHours(BigDecimal budgetHours) { + this.budgetHours = budgetHours; } /** * 投入人员数(上到下控制大于儿子总数)-应该大于或等于task中总人数 **/ - public void setPhaseBudgetStaffNu(Integer phaseBudgetStaffNu) { - this.phaseBudgetStaffNu = phaseBudgetStaffNu; + public void setBudgetStaffNu(Integer budgetStaffNu) { + this.budgetStaffNu = budgetStaffNu; } /** * 创建时间 @@ -272,26 +275,26 @@ public class XmPhase implements java.io.Serializable { /** * 非人力成本总预算(上到下控制大于儿子总数)-应该大于或等于task中非人力总成本 **/ - public void setPhaseBudgetNouserAt(BigDecimal phaseBudgetNouserAt) { - this.phaseBudgetNouserAt = phaseBudgetNouserAt; + public void setBudgetNouserAt(BigDecimal budgetNouserAt) { + this.budgetNouserAt = budgetNouserAt; } /** * 内部人力成本总预算(上到下控制大于儿子总数)-应该大于或等于task中内部人力总成本 **/ - public void setPhaseBudgetInnerUserAt(BigDecimal phaseBudgetInnerUserAt) { - this.phaseBudgetInnerUserAt = phaseBudgetInnerUserAt; + public void setBudgetIuserAt(BigDecimal budgetIuserAt) { + this.budgetIuserAt = budgetIuserAt; } /** * 外购人力成本总预算(上到下控制大于儿子总数)-应该大于或等于task中外购总成本 **/ - public void setPhaseBudgetOutUserAt(BigDecimal phaseBudgetOutUserAt) { - this.phaseBudgetOutUserAt = phaseBudgetOutUserAt; + public void setBudgetOuserAt(BigDecimal budgetOuserAt) { + this.budgetOuserAt = budgetOuserAt; } /** * 项目级基线 **/ - public void setProjectBaselineId(String projectBaselineId) { - this.projectBaselineId = projectBaselineId; + public void setBaselineId(String baselineId) { + this.baselineId = baselineId; } /** * 当前流程实例编号 @@ -308,26 +311,26 @@ public class XmPhase implements java.io.Serializable { /** * 总工作量单位人时上到下控制大于儿子总数-应该大于或者等于task中的预算总工作量 **/ - public void setPhaseBudgetWorkload(BigDecimal phaseBudgetWorkload) { - this.phaseBudgetWorkload = phaseBudgetWorkload; + public void setBudgetWorkload(BigDecimal budgetWorkload) { + this.budgetWorkload = budgetWorkload; } /** * 已完成工作量单位人时-从task中的实际工作量算出 **/ - public void setPhaseActWorkload(BigDecimal phaseActWorkload) { - this.phaseActWorkload = phaseActWorkload; + public void setActWorkload(BigDecimal actWorkload) { + this.actWorkload = actWorkload; } /** * 实际内部人力工作量-来自任务表合计 **/ - public void setPhaseActInnerUserWorkload(BigDecimal phaseActInnerUserWorkload) { - this.phaseActInnerUserWorkload = phaseActInnerUserWorkload; + public void setActIuserWorkload(BigDecimal actIuserWorkload) { + this.actIuserWorkload = actIuserWorkload; } /** * 实际外购人力工作量-来自任务表合计 **/ - public void setPhaseActOutUserWorkload(BigDecimal phaseActOutUserWorkload) { - this.phaseActOutUserWorkload = phaseActOutUserWorkload; + public void setActOuserWorkload(BigDecimal actOuserWorkload) { + this.actOuserWorkload = actOuserWorkload; } /** * 0售前方案1投标2需求3设计4开发5测试6验收7部署8运维--来自基础数据表taskType @@ -350,14 +353,14 @@ public class XmPhase implements java.io.Serializable { /** * 内部人力工作量总预算(上到下控制大于儿子总数)-应该大于或等于task中内部人力总成本 **/ - public void setPhaseBudgetInnerUserWorkload(BigDecimal phaseBudgetInnerUserWorkload) { - this.phaseBudgetInnerUserWorkload = phaseBudgetInnerUserWorkload; + public void setUdgetIuserWorkload(BigDecimal udgetIuserWorkload) { + this.udgetIuserWorkload = udgetIuserWorkload; } /** * 外购人力工作量总预算(上到下控制大于儿子总数)-应该大于或等于task中外购总成本 **/ - public void setPhaseBudgetOutUserWorkload(BigDecimal phaseBudgetOutUserWorkload) { - this.phaseBudgetOutUserWorkload = phaseBudgetOutUserWorkload; + public void setBudgetOuserWorkload(BigDecimal budgetOuserWorkload) { + this.budgetOuserWorkload = budgetOuserWorkload; } /** * 实际非人力成本-来自任务表合计 @@ -368,32 +371,32 @@ public class XmPhase implements java.io.Serializable { /** * 实际内部人力成本-来自任务表合计 **/ - public void setActInnerUserAt(BigDecimal actInnerUserAt) { - this.actInnerUserAt = actInnerUserAt; + public void setActIuserAt(BigDecimal actIuserAt) { + this.actIuserAt = actIuserAt; } /** * 内部人力成本单价元/人时 **/ - public void setPhaseBudgetInnerUserPrice(BigDecimal phaseBudgetInnerUserPrice) { - this.phaseBudgetInnerUserPrice = phaseBudgetInnerUserPrice; + public void setBudgetIuserPrice(BigDecimal budgetIuserPrice) { + this.budgetIuserPrice = budgetIuserPrice; } /** * 外购人力成本单价元/人时 **/ - public void setPhaseBudgetOutUserPrice(BigDecimal phaseBudgetOutUserPrice) { - this.phaseBudgetOutUserPrice = phaseBudgetOutUserPrice; + public void setBudgetOuserPrice(BigDecimal budgetOuserPrice) { + this.budgetOuserPrice = budgetOuserPrice; } /** * 外购人数 **/ - public void setPhaseBudgetOutUserCnt(Integer phaseBudgetOutUserCnt) { - this.phaseBudgetOutUserCnt = phaseBudgetOutUserCnt; + public void setBudgetOuserCnt(Integer budgetOuserCnt) { + this.budgetOuserCnt = budgetOuserCnt; } /** * 内部人数 **/ - public void setPhaseBudgetInnerUserCnt(Integer phaseBudgetInnerUserCnt) { - this.phaseBudgetInnerUserCnt = phaseBudgetInnerUserCnt; + public void setBudgetIuserCnt(Integer budgetIuserCnt) { + this.budgetIuserCnt = budgetIuserCnt; } /** * 实际进度0-100 @@ -404,8 +407,8 @@ public class XmPhase implements java.io.Serializable { /** * 阶段状态0初始1执行中2完工3关闭4删除中5已删除6暂停 **/ - public void setPhaseStatus(String phaseStatus) { - this.phaseStatus = phaseStatus; + public void setPstatus(String pstatus) { + this.pstatus = pstatus; } /** * 实际外部人力成本 @@ -486,7 +489,7 @@ public class XmPhase implements java.io.Serializable { this.tagNames = tagNames; } /** - * 节点类型0-任务，1-计划项。计划项下建任务，任务下不允许建立任何子节点 + * 节点类型0-任务，1-任务集。任务集下建任务，任务下不允许建立任何子节点 **/ public void setNtype(String ntype) { this.ntype = ntype; @@ -542,8 +545,8 @@ public class XmPhase implements java.io.Serializable { /** * 预算金额 **/ - public void setPhaseBudgetAt(BigDecimal phaseBudgetAt) { - this.phaseBudgetAt = phaseBudgetAt; + public void setBudgetAt(BigDecimal budgetAt) { + this.budgetAt = budgetAt; } /** * 叶子节点数据收集方式0-不计算，1-由任务汇总，2-手工填报 @@ -551,6 +554,12 @@ public class XmPhase implements java.io.Serializable { public void setCalcType(String calcType) { this.calcType = calcType; } + /** + * 实际金额，如手工填写，则为填写金额，否则为汇总金额 + **/ + public void setActAt(BigDecimal actAt) { + this.actAt = actAt; + } /** * 阶段主键 @@ -561,8 +570,8 @@ public class XmPhase implements java.io.Serializable { /** * 阶段名称 **/ - public String getPhaseName() { - return this.phaseName; + public String getName() { + return this.name; } /** * 备注 @@ -573,8 +582,8 @@ public class XmPhase implements java.io.Serializable { /** * 上级阶段编号 **/ - public String getParentPhaseId() { - return this.parentPhaseId; + public String getParentId() { + return this.parentId; } /** * 机构编号 @@ -603,14 +612,14 @@ public class XmPhase implements java.io.Serializable { /** * 工时(上到下控制大于儿子总数)-应该大于或等于task中总工时 **/ - public BigDecimal getPhaseBudgetHours() { - return this.phaseBudgetHours; + public BigDecimal getBudgetHours() { + return this.budgetHours; } /** * 投入人员数(上到下控制大于儿子总数)-应该大于或等于task中总人数 **/ - public Integer getPhaseBudgetStaffNu() { - return this.phaseBudgetStaffNu; + public Integer getBudgetStaffNu() { + return this.budgetStaffNu; } /** * 创建时间 @@ -621,26 +630,26 @@ public class XmPhase implements java.io.Serializable { /** * 非人力成本总预算(上到下控制大于儿子总数)-应该大于或等于task中非人力总成本 **/ - public BigDecimal getPhaseBudgetNouserAt() { - return this.phaseBudgetNouserAt; + public BigDecimal getBudgetNouserAt() { + return this.budgetNouserAt; } /** * 内部人力成本总预算(上到下控制大于儿子总数)-应该大于或等于task中内部人力总成本 **/ - public BigDecimal getPhaseBudgetInnerUserAt() { - return this.phaseBudgetInnerUserAt; + public BigDecimal getBudgetIuserAt() { + return this.budgetIuserAt; } /** * 外购人力成本总预算(上到下控制大于儿子总数)-应该大于或等于task中外购总成本 **/ - public BigDecimal getPhaseBudgetOutUserAt() { - return this.phaseBudgetOutUserAt; + public BigDecimal getBudgetOuserAt() { + return this.budgetOuserAt; } /** * 项目级基线 **/ - public String getProjectBaselineId() { - return this.projectBaselineId; + public String getBaselineId() { + return this.baselineId; } /** * 当前流程实例编号 @@ -657,26 +666,26 @@ public class XmPhase implements java.io.Serializable { /** * 总工作量单位人时上到下控制大于儿子总数-应该大于或者等于task中的预算总工作量 **/ - public BigDecimal getPhaseBudgetWorkload() { - return this.phaseBudgetWorkload; + public BigDecimal getBudgetWorkload() { + return this.budgetWorkload; } /** * 已完成工作量单位人时-从task中的实际工作量算出 **/ - public BigDecimal getPhaseActWorkload() { - return this.phaseActWorkload; + public BigDecimal getActWorkload() { + return this.actWorkload; } /** * 实际内部人力工作量-来自任务表合计 **/ - public BigDecimal getPhaseActInnerUserWorkload() { - return this.phaseActInnerUserWorkload; + public BigDecimal getActIuserWorkload() { + return this.actIuserWorkload; } /** * 实际外购人力工作量-来自任务表合计 **/ - public BigDecimal getPhaseActOutUserWorkload() { - return this.phaseActOutUserWorkload; + public BigDecimal getActOuserWorkload() { + return this.actOuserWorkload; } /** * 0售前方案1投标2需求3设计4开发5测试6验收7部署8运维--来自基础数据表taskType @@ -699,14 +708,14 @@ public class XmPhase implements java.io.Serializable { /** * 内部人力工作量总预算(上到下控制大于儿子总数)-应该大于或等于task中内部人力总成本 **/ - public BigDecimal getPhaseBudgetInnerUserWorkload() { - return this.phaseBudgetInnerUserWorkload; + public BigDecimal getUdgetIuserWorkload() { + return this.udgetIuserWorkload; } /** * 外购人力工作量总预算(上到下控制大于儿子总数)-应该大于或等于task中外购总成本 **/ - public BigDecimal getPhaseBudgetOutUserWorkload() { - return this.phaseBudgetOutUserWorkload; + public BigDecimal getBudgetOuserWorkload() { + return this.budgetOuserWorkload; } /** * 实际非人力成本-来自任务表合计 @@ -717,32 +726,32 @@ public class XmPhase implements java.io.Serializable { /** * 实际内部人力成本-来自任务表合计 **/ - public BigDecimal getActInnerUserAt() { - return this.actInnerUserAt; + public BigDecimal getActIuserAt() { + return this.actIuserAt; } /** * 内部人力成本单价元/人时 **/ - public BigDecimal getPhaseBudgetInnerUserPrice() { - return this.phaseBudgetInnerUserPrice; + public BigDecimal getBudgetIuserPrice() { + return this.budgetIuserPrice; } /** * 外购人力成本单价元/人时 **/ - public BigDecimal getPhaseBudgetOutUserPrice() { - return this.phaseBudgetOutUserPrice; + public BigDecimal getBudgetOuserPrice() { + return this.budgetOuserPrice; } /** * 外购人数 **/ - public Integer getPhaseBudgetOutUserCnt() { - return this.phaseBudgetOutUserCnt; + public Integer getBudgetOuserCnt() { + return this.budgetOuserCnt; } /** * 内部人数 **/ - public Integer getPhaseBudgetInnerUserCnt() { - return this.phaseBudgetInnerUserCnt; + public Integer getBudgetIuserCnt() { + return this.budgetIuserCnt; } /** * 实际进度0-100 @@ -753,8 +762,8 @@ public class XmPhase implements java.io.Serializable { /** * 阶段状态0初始1执行中2完工3关闭4删除中5已删除6暂停 **/ - public String getPhaseStatus() { - return this.phaseStatus; + public String getPstatus() { + return this.pstatus; } /** * 实际外部人力成本 @@ -835,7 +844,7 @@ public class XmPhase implements java.io.Serializable { return this.tagNames; } /** - * 节点类型0-任务，1-计划项。计划项下建任务，任务下不允许建立任何子节点 + * 节点类型0-任务，1-任务集。任务集下建任务，任务下不允许建立任何子节点 **/ public String getNtype() { return this.ntype; @@ -891,8 +900,8 @@ public class XmPhase implements java.io.Serializable { /** * 预算金额 **/ - public BigDecimal getPhaseBudgetAt() { - return this.phaseBudgetAt; + public BigDecimal getBudgetAt() { + return this.budgetAt; } /** * 叶子节点数据收集方式0-不计算，1-由任务汇总，2-手工填报 @@ -900,5 +909,11 @@ public class XmPhase implements java.io.Serializable { public String getCalcType() { return this.calcType; } + /** + * 实际金额，如手工填写，则为填写金额，否则为汇总金额 + **/ + public BigDecimal getActAt() { + return this.actAt; + } } \ 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 019cf6c7..b089f9c9 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,projectPhaseId,projectPhaseName,taskSkillNames,exeUsernames,taskSkillIds,exeUserids,taskOut,planType,settleSchemel,menuId,menuName,productId,productName,cbranchId,cdeptid,tagIds,tagNames,ntype,childrenCnt,ltime,pidPaths,lvl,isTpl;
+ * 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,projectPhaseId,projectPhaseName,taskSkillNames,exeUsernames,taskSkillIds,exeUserids,taskOut,planType,settleSchemel,menuId,menuName,productId,productName,cbranchId,cdeptid,tagIds,tagNames,ntype,childrenCnt,ltime,pidPaths,lvl,isTpl,keyPath,uniInnerPrice,uniOutPrice,calcType,ptype;
* 表 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,project_phase_id,project_phase_name,task_skill_names,exe_usernames,task_skill_ids,exe_userids,task_out,plan_type,settle_schemel,menu_id,menu_name,product_id,product_name,cbranch_id,cdeptid,tag_ids,tag_names,ntype,children_cnt,ltime,pid_paths,lvl,is_tpl;
+ * 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,project_phase_id,project_phase_name,task_skill_names,exe_usernames,task_skill_ids,exe_userids,task_out,plan_type,settle_schemel,menu_id,menu_name,product_id,product_name,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;
* 当前主键(包括多主键):
* id;
*/ @@ -89,7 +89,7 @@ public class XmTask implements java.io.Serializable { @ApiModelProperty(notes="预算工时（不包括下一级）",allowEmptyValue=true,example="",allowableValues="") BigDecimal budgetWorkload; - @ApiModelProperty(notes="当前任务实际费用金额（包括所有成本，不包括下一级）",allowEmptyValue=true,example="",allowableValues="") + @ApiModelProperty(notes="当前任务实际费用金额（包括所有成本，不包括下一级）待结算金额",allowEmptyValue=true,example="",allowableValues="") BigDecimal actCost; @ApiModelProperty(notes="实际工时（不包括下一级）",allowEmptyValue=true,example="",allowableValues="") @@ -119,10 +119,10 @@ public class XmTask implements java.io.Serializable { @ApiModelProperty(notes="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",allowEmptyValue=true,example="",allowableValues="") String bizFlowState; - @ApiModelProperty(notes="项目计划编号",allowEmptyValue=true,example="",allowableValues="") + @ApiModelProperty(notes="项目阶段编号(作废)",allowEmptyValue=true,example="",allowableValues="") String projectPhaseId; - @ApiModelProperty(notes="项目计划名称",allowEmptyValue=true,example="",allowableValues="") + @ApiModelProperty(notes="项目阶段名称(作废)",allowEmptyValue=true,example="",allowableValues="") String projectPhaseName; @ApiModelProperty(notes="技能列表,逗号分隔",allowEmptyValue=true,example="",allowableValues="") @@ -152,10 +152,10 @@ public class XmTask implements java.io.Serializable { @ApiModelProperty(notes="归属功能名称",allowEmptyValue=true,example="",allowableValues="") String menuName; - @ApiModelProperty(notes="产品编号",allowEmptyValue=true,example="",allowableValues="") + @ApiModelProperty(notes="产品编号根据功能变化带进",allowEmptyValue=true,example="",allowableValues="") String productId; - @ApiModelProperty(notes="产品名称",allowEmptyValue=true,example="",allowableValues="") + @ApiModelProperty(notes="产品名称(作废)",allowEmptyValue=true,example="",allowableValues="") String productName; @ApiModelProperty(notes="创建机构",allowEmptyValue=true,example="",allowableValues="") @@ -170,7 +170,7 @@ public class XmTask implements java.io.Serializable { @ApiModelProperty(notes="标签名称，逗号分割",allowEmptyValue=true,example="",allowableValues="") String tagNames; - @ApiModelProperty(notes="节点类型0-任务，1-计划项。计划项下建任务，任务下不允许建立任何子节点",allowEmptyValue=true,example="",allowableValues="") + @ApiModelProperty(notes="节点类型0-任务，1-计划。计划下可建立计划和任务，任务下不允许再扩展。也就是非叶子节点都是计划，叶子节点有可能是计划或者任务",allowEmptyValue=true,example="",allowableValues="") String ntype; @ApiModelProperty(notes="儿子节点个数",allowEmptyValue=true,example="",allowableValues="") @@ -187,6 +187,21 @@ public class XmTask implements java.io.Serializable { @ApiModelProperty(notes="是否为模板",allowEmptyValue=true,example="",allowableValues="") String isTpl; + + @ApiModelProperty(notes="是否为关键路径上的节点",allowEmptyValue=true,example="",allowableValues="") + String keyPath; + + @ApiModelProperty(notes="内部单位工时单价",allowEmptyValue=true,example="",allowableValues="") + BigDecimal uniInnerPrice; + + @ApiModelProperty(notes="外部单位工时单价",allowEmptyValue=true,example="",allowableValues="") + BigDecimal uniOutPrice; + + @ApiModelProperty(notes="实际工作量及金额计算方式0-手工填写，1-根据进度*预算计算，2-其它",allowEmptyValue=true,example="",allowableValues="") + String calcType; + + @ApiModelProperty(notes="计划分类0-项目，1产品",allowEmptyValue=true,example="",allowableValues="") + String ptype; /**任务编号**/ public XmTask(String id) { @@ -336,7 +351,7 @@ public class XmTask implements java.io.Serializable { this.budgetWorkload = budgetWorkload; } /** - * 当前任务实际费用金额（包括所有成本，不包括下一级） + * 当前任务实际费用金额（包括所有成本，不包括下一级）待结算金额 **/ public void setActCost(BigDecimal actCost) { this.actCost = actCost; @@ -396,13 +411,13 @@ public class XmTask implements java.io.Serializable { this.bizFlowState = bizFlowState; } /** - * 项目计划编号 + * 项目阶段编号(作废) **/ public void setProjectPhaseId(String projectPhaseId) { this.projectPhaseId = projectPhaseId; } /** - * 项目计划名称 + * 项目阶段名称(作废) **/ public void setProjectPhaseName(String projectPhaseName) { this.projectPhaseName = projectPhaseName; @@ -462,13 +477,13 @@ public class XmTask implements java.io.Serializable { this.menuName = menuName; } /** - * 产品编号 + * 产品编号根据功能变化带进 **/ public void setProductId(String productId) { this.productId = productId; } /** - * 产品名称 + * 产品名称(作废) **/ public void setProductName(String productName) { this.productName = productName; @@ -498,7 +513,7 @@ public class XmTask implements java.io.Serializable { this.tagNames = tagNames; } /** - * 节点类型0-任务，1-计划项。计划项下建任务，任务下不允许建立任何子节点 + * 节点类型0-任务，1-计划。计划下可建立计划和任务，任务下不允许再扩展。也就是非叶子节点都是计划，叶子节点有可能是计划或者任务 **/ public void setNtype(String ntype) { this.ntype = ntype; @@ -533,6 +548,36 @@ public class XmTask implements java.io.Serializable { public void setIsTpl(String isTpl) { this.isTpl = isTpl; } + /** + * 是否为关键路径上的节点 + **/ + public void setKeyPath(String keyPath) { + this.keyPath = keyPath; + } + /** + * 内部单位工时单价 + **/ + public void setUniInnerPrice(BigDecimal uniInnerPrice) { + this.uniInnerPrice = uniInnerPrice; + } + /** + * 外部单位工时单价 + **/ + public void setUniOutPrice(BigDecimal uniOutPrice) { + this.uniOutPrice = uniOutPrice; + } + /** + * 实际工作量及金额计算方式0-手工填写，1-根据进度*预算计算，2-其它 + **/ + public void setCalcType(String calcType) { + this.calcType = calcType; + } + /** + * 计划分类0-项目，1产品 + **/ + public void setPtype(String ptype) { + this.ptype = ptype; + } /** * 任务编号 @@ -673,7 +718,7 @@ public class XmTask implements java.io.Serializable { return this.budgetWorkload; } /** - * 当前任务实际费用金额（包括所有成本，不包括下一级） + * 当前任务实际费用金额（包括所有成本，不包括下一级）待结算金额 **/ public BigDecimal getActCost() { return this.actCost; @@ -733,13 +778,13 @@ public class XmTask implements java.io.Serializable { return this.bizFlowState; } /** - * 项目计划编号 + * 项目阶段编号(作废) **/ public String getProjectPhaseId() { return this.projectPhaseId; } /** - * 项目计划名称 + * 项目阶段名称(作废) **/ public String getProjectPhaseName() { return this.projectPhaseName; @@ -799,13 +844,13 @@ public class XmTask implements java.io.Serializable { return this.menuName; } /** - * 产品编号 + * 产品编号根据功能变化带进 **/ public String getProductId() { return this.productId; } /** - * 产品名称 + * 产品名称(作废) **/ public String getProductName() { return this.productName; @@ -835,7 +880,7 @@ public class XmTask implements java.io.Serializable { return this.tagNames; } /** - * 节点类型0-任务，1-计划项。计划项下建任务，任务下不允许建立任何子节点 + * 节点类型0-任务，1-计划。计划下可建立计划和任务，任务下不允许再扩展。也就是非叶子节点都是计划，叶子节点有可能是计划或者任务 **/ public String getNtype() { return this.ntype; @@ -870,5 +915,35 @@ public class XmTask implements java.io.Serializable { public String getIsTpl() { return this.isTpl; } + /** + * 是否为关键路径上的节点 + **/ + public String getKeyPath() { + return this.keyPath; + } + /** + * 内部单位工时单价 + **/ + public BigDecimal getUniInnerPrice() { + return this.uniInnerPrice; + } + /** + * 外部单位工时单价 + **/ + public BigDecimal getUniOutPrice() { + return this.uniOutPrice; + } + /** + * 实际工作量及金额计算方式0-手工填写，1-根据进度*预算计算，2-其它 + **/ + public String getCalcType() { + return this.calcType; + } + /** + * 计划分类0-项目，1产品 + **/ + public String getPtype() { + return this.ptype; + } } \ No newline at end of file diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmPhaseMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmPhaseMapper.xml index 9312fc9d..daf1f36a 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmPhaseMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmPhaseMapper.xml @@ -272,32 +272,32 @@ where res.id = #{id} - + - - insert into xm_project_phase( + + insert into xm_phase( ) 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},#{calcType} + #{id},#{name},#{remark},#{parentId},#{branchId},#{projectId},#{beginDate},#{endDate},#{budgetHours},#{budgetStaffNu},#{ctime},#{budgetNouserAt},#{budgetIuserAt},#{budgetOuserAt},#{baselineId},#{bizProcInstId},#{bizFlowState},#{budgetWorkload},#{actWorkload},#{actIuserWorkload},#{actOuserWorkload},#{taskType},#{planType},#{seqNo},#{udgetIuserWorkload},#{budgetOuserWorkload},#{actNouserAt},#{actIuserAt},#{budgetIuserPrice},#{budgetOuserPrice},#{budgetOuserCnt},#{budgetIuserCnt},#{actRate},#{pstatus},#{actOutUserAt},#{taskCnt},#{finishTaskCnt},#{iterationCnt},#{calcTime},#{taskBudgetWorkload},#{taskBudgetAt},#{mngUserid},#{mngUsername},#{milestone},#{pleaf},#{tagIds},#{tagNames},#{ntype},#{childrenCnt},#{ltime},#{isKeyPath},#{pidPaths},#{lvl},#{isTpl},#{phaseClass},#{productId},#{budgetAt},#{calcType},#{actAt} ) - delete from xm_project_phase res + delete from xm_phase res @@ -305,13 +305,13 @@ - delete from xm_project_phase + delete from xm_phase where id = #{id} - update xm_project_phase + update xm_phase @@ -320,7 +320,7 @@ - update xm_project_phase + update xm_phase @@ -335,7 +335,7 @@ - update xm_project_phase + update xm_phase set where id = #{item.id} @@ -343,7 +343,7 @@ - delete from xm_project_phase + delete from xm_phase where (id) in @@ -354,45 +354,45 @@ - 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 + id,name,remark,parent_id,branch_id,project_id,begin_date,end_date,budget_hours,budget_staff_nu,ctime,budget_nouser_at,budget_iuser_at,budget_ouser_at,baseline_id,biz_proc_inst_id,biz_flow_state,budget_workload,act_workload,act_iuser_workload,act_ouser_workload,task_type,plan_type,seq_no,udget_iuser_workload,budget_ouser_workload,act_nouser_at,act_iuser_at,budget_iuser_price,budget_ouser_price,budget_ouser_cnt,budget_iuser_cnt,act_rate,pstatus,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,budget_at,calc_type,act_at and res.id = #{id} - and res.phase_name = #{phaseName} + and res.name = #{name} and res.remark = #{remark} - and res.parent_phase_id = #{parentPhaseId} + and res.parent_id = #{parentId} and res.branch_id = #{branchId} and res.project_id = #{projectId} and date_format(res.begin_date,'%Y-%m-%d') = date_format(#{beginDate},'%Y-%m-%d') and date_format(res.end_date,'%Y-%m-%d') = date_format(#{endDate},'%Y-%m-%d') - and res.phase_budget_hours = #{phaseBudgetHours} - and res.phase_budget_staff_nu = #{phaseBudgetStaffNu} + and res.budget_hours = #{budgetHours} + and res.budget_staff_nu = #{budgetStaffNu} and date_format(res.ctime,'%Y-%m-%d') = date_format(#{ctime},'%Y-%m-%d') - and res.phase_budget_nouser_at = #{phaseBudgetNouserAt} - and res.phase_budget_inner_user_at = #{phaseBudgetInnerUserAt} - and res.phase_budget_out_user_at = #{phaseBudgetOutUserAt} - and res.project_baseline_id = #{projectBaselineId} + and res.budget_nouser_at = #{budgetNouserAt} + and res.budget_iuser_at = #{budgetIuserAt} + and res.budget_ouser_at = #{budgetOuserAt} + and res.baseline_id = #{baselineId} and res.biz_proc_inst_id = #{bizProcInstId} and res.biz_flow_state = #{bizFlowState} - and res.phase_budget_workload = #{phaseBudgetWorkload} - and res.phase_act_workload = #{phaseActWorkload} - and res.phase_act_inner_user_workload = #{phaseActInnerUserWorkload} - and res.phase_act_out_user_workload = #{phaseActOutUserWorkload} + and res.budget_workload = #{budgetWorkload} + and res.act_workload = #{actWorkload} + and res.act_iuser_workload = #{actIuserWorkload} + and res.act_ouser_workload = #{actOuserWorkload} and res.task_type = #{taskType} and res.plan_type = #{planType} and res.seq_no = #{seqNo} - and res.phase_budget_inner_user_workload = #{phaseBudgetInnerUserWorkload} - and res.phase_budget_out_user_workload = #{phaseBudgetOutUserWorkload} + and res.udget_iuser_workload = #{udgetIuserWorkload} + and res.budget_ouser_workload = #{budgetOuserWorkload} and res.act_nouser_at = #{actNouserAt} - and res.act_inner_user_at = #{actInnerUserAt} - and res.phase_budget_inner_user_price = #{phaseBudgetInnerUserPrice} - and res.phase_budget_out_user_price = #{phaseBudgetOutUserPrice} - and res.phase_budget_out_user_cnt = #{phaseBudgetOutUserCnt} - and res.phase_budget_inner_user_cnt = #{phaseBudgetInnerUserCnt} + and res.act_iuser_at = #{actIuserAt} + and res.budget_iuser_price = #{budgetIuserPrice} + and res.budget_ouser_price = #{budgetOuserPrice} + and res.budget_ouser_cnt = #{budgetOuserCnt} + and res.budget_iuser_cnt = #{budgetIuserCnt} and res.act_rate = #{actRate} - and res.phase_status = #{phaseStatus} + and res.pstatus = #{pstatus} and res.act_out_user_at = #{actOutUserAt} and res.task_cnt = #{taskCnt} and res.finish_task_cnt = #{finishTaskCnt} @@ -415,44 +415,45 @@ and res.is_tpl = #{isTpl} and res.phase_class = #{phaseClass} and res.product_id = #{productId} - and res.phase_budget_at = #{phaseBudgetAt} + and res.budget_at = #{budgetAt} and res.calc_type = #{calcType} + and res.act_at = #{actAt} - phase_name = #{phaseName}, + name = #{name}, remark = #{remark}, - parent_phase_id = #{parentPhaseId}, + parent_id = #{parentId}, branch_id = #{branchId}, project_id = #{projectId}, begin_date = #{beginDate}, end_date = #{endDate}, - phase_budget_hours = #{phaseBudgetHours}, - phase_budget_staff_nu = #{phaseBudgetStaffNu}, + budget_hours = #{budgetHours}, + budget_staff_nu = #{budgetStaffNu}, ctime = #{ctime}, - phase_budget_nouser_at = #{phaseBudgetNouserAt}, - phase_budget_inner_user_at = #{phaseBudgetInnerUserAt}, - phase_budget_out_user_at = #{phaseBudgetOutUserAt}, - project_baseline_id = #{projectBaselineId}, + budget_nouser_at = #{budgetNouserAt}, + budget_iuser_at = #{budgetIuserAt}, + budget_ouser_at = #{budgetOuserAt}, + baseline_id = #{baselineId}, biz_proc_inst_id = #{bizProcInstId}, biz_flow_state = #{bizFlowState}, - phase_budget_workload = #{phaseBudgetWorkload}, - phase_act_workload = #{phaseActWorkload}, - phase_act_inner_user_workload = #{phaseActInnerUserWorkload}, - phase_act_out_user_workload = #{phaseActOutUserWorkload}, + budget_workload = #{budgetWorkload}, + act_workload = #{actWorkload}, + act_iuser_workload = #{actIuserWorkload}, + act_ouser_workload = #{actOuserWorkload}, task_type = #{taskType}, plan_type = #{planType}, seq_no = #{seqNo}, - phase_budget_inner_user_workload = #{phaseBudgetInnerUserWorkload}, - phase_budget_out_user_workload = #{phaseBudgetOutUserWorkload}, + udget_iuser_workload = #{udgetIuserWorkload}, + budget_ouser_workload = #{budgetOuserWorkload}, act_nouser_at = #{actNouserAt}, - act_inner_user_at = #{actInnerUserAt}, - phase_budget_inner_user_price = #{phaseBudgetInnerUserPrice}, - phase_budget_out_user_price = #{phaseBudgetOutUserPrice}, - phase_budget_out_user_cnt = #{phaseBudgetOutUserCnt}, - phase_budget_inner_user_cnt = #{phaseBudgetInnerUserCnt}, + act_iuser_at = #{actIuserAt}, + budget_iuser_price = #{budgetIuserPrice}, + budget_ouser_price = #{budgetOuserPrice}, + budget_ouser_cnt = #{budgetOuserCnt}, + budget_iuser_cnt = #{budgetIuserCnt}, act_rate = #{actRate}, - phase_status = #{phaseStatus}, + pstatus = #{pstatus}, act_out_user_at = #{actOutUserAt}, task_cnt = #{taskCnt}, finish_task_cnt = #{finishTaskCnt}, @@ -475,43 +476,44 @@ is_tpl = #{isTpl}, phase_class = #{phaseClass}, product_id = #{productId}, - phase_budget_at = #{phaseBudgetAt}, - calc_type = #{calcType} + budget_at = #{budgetAt}, + calc_type = #{calcType}, + act_at = #{actAt} - phase_name = #{phaseName}, + name = #{name}, remark = #{remark}, - parent_phase_id = #{parentPhaseId}, + parent_id = #{parentId}, branch_id = #{branchId}, project_id = #{projectId}, begin_date = #{beginDate}, end_date = #{endDate}, - phase_budget_hours = #{phaseBudgetHours}, - phase_budget_staff_nu = #{phaseBudgetStaffNu}, + budget_hours = #{budgetHours}, + budget_staff_nu = #{budgetStaffNu}, ctime = #{ctime}, - phase_budget_nouser_at = #{phaseBudgetNouserAt}, - phase_budget_inner_user_at = #{phaseBudgetInnerUserAt}, - phase_budget_out_user_at = #{phaseBudgetOutUserAt}, - project_baseline_id = #{projectBaselineId}, + budget_nouser_at = #{budgetNouserAt}, + budget_iuser_at = #{budgetIuserAt}, + budget_ouser_at = #{budgetOuserAt}, + baseline_id = #{baselineId}, biz_proc_inst_id = #{bizProcInstId}, biz_flow_state = #{bizFlowState}, - phase_budget_workload = #{phaseBudgetWorkload}, - phase_act_workload = #{phaseActWorkload}, - phase_act_inner_user_workload = #{phaseActInnerUserWorkload}, - phase_act_out_user_workload = #{phaseActOutUserWorkload}, + budget_workload = #{budgetWorkload}, + act_workload = #{actWorkload}, + act_iuser_workload = #{actIuserWorkload}, + act_ouser_workload = #{actOuserWorkload}, task_type = #{taskType}, plan_type = #{planType}, seq_no = #{seqNo}, - phase_budget_inner_user_workload = #{phaseBudgetInnerUserWorkload}, - phase_budget_out_user_workload = #{phaseBudgetOutUserWorkload}, + udget_iuser_workload = #{udgetIuserWorkload}, + budget_ouser_workload = #{budgetOuserWorkload}, act_nouser_at = #{actNouserAt}, - act_inner_user_at = #{actInnerUserAt}, - phase_budget_inner_user_price = #{phaseBudgetInnerUserPrice}, - phase_budget_out_user_price = #{phaseBudgetOutUserPrice}, - phase_budget_out_user_cnt = #{phaseBudgetOutUserCnt}, - phase_budget_inner_user_cnt = #{phaseBudgetInnerUserCnt}, + act_iuser_at = #{actIuserAt}, + budget_iuser_price = #{budgetIuserPrice}, + budget_ouser_price = #{budgetOuserPrice}, + budget_ouser_cnt = #{budgetOuserCnt}, + budget_iuser_cnt = #{budgetIuserCnt}, act_rate = #{actRate}, - phase_status = #{phaseStatus}, + pstatus = #{pstatus}, act_out_user_at = #{actOutUserAt}, task_cnt = #{taskCnt}, finish_task_cnt = #{finishTaskCnt}, @@ -534,44 +536,45 @@ is_tpl = #{isTpl}, phase_class = #{phaseClass}, product_id = #{productId}, - phase_budget_at = #{phaseBudgetAt}, + budget_at = #{budgetAt}, calc_type = #{calcType}, + act_at = #{actAt}, - phase_name = #{item.phaseName}, + name = #{item.name}, remark = #{item.remark}, - parent_phase_id = #{item.parentPhaseId}, + parent_id = #{item.parentId}, branch_id = #{item.branchId}, project_id = #{item.projectId}, begin_date = #{item.beginDate}, end_date = #{item.endDate}, - phase_budget_hours = #{item.phaseBudgetHours}, - phase_budget_staff_nu = #{item.phaseBudgetStaffNu}, + budget_hours = #{item.budgetHours}, + budget_staff_nu = #{item.budgetStaffNu}, ctime = #{item.ctime}, - phase_budget_nouser_at = #{item.phaseBudgetNouserAt}, - phase_budget_inner_user_at = #{item.phaseBudgetInnerUserAt}, - phase_budget_out_user_at = #{item.phaseBudgetOutUserAt}, - project_baseline_id = #{item.projectBaselineId}, + budget_nouser_at = #{item.budgetNouserAt}, + budget_iuser_at = #{item.budgetIuserAt}, + budget_ouser_at = #{item.budgetOuserAt}, + baseline_id = #{item.baselineId}, biz_proc_inst_id = #{item.bizProcInstId}, biz_flow_state = #{item.bizFlowState}, - phase_budget_workload = #{item.phaseBudgetWorkload}, - phase_act_workload = #{item.phaseActWorkload}, - phase_act_inner_user_workload = #{item.phaseActInnerUserWorkload}, - phase_act_out_user_workload = #{item.phaseActOutUserWorkload}, + budget_workload = #{item.budgetWorkload}, + act_workload = #{item.actWorkload}, + act_iuser_workload = #{item.actIuserWorkload}, + act_ouser_workload = #{item.actOuserWorkload}, task_type = #{item.taskType}, plan_type = #{item.planType}, seq_no = #{item.seqNo}, - phase_budget_inner_user_workload = #{item.phaseBudgetInnerUserWorkload}, - phase_budget_out_user_workload = #{item.phaseBudgetOutUserWorkload}, + udget_iuser_workload = #{item.udgetIuserWorkload}, + budget_ouser_workload = #{item.budgetOuserWorkload}, act_nouser_at = #{item.actNouserAt}, - act_inner_user_at = #{item.actInnerUserAt}, - phase_budget_inner_user_price = #{item.phaseBudgetInnerUserPrice}, - phase_budget_out_user_price = #{item.phaseBudgetOutUserPrice}, - phase_budget_out_user_cnt = #{item.phaseBudgetOutUserCnt}, - phase_budget_inner_user_cnt = #{item.phaseBudgetInnerUserCnt}, + act_iuser_at = #{item.actIuserAt}, + budget_iuser_price = #{item.budgetIuserPrice}, + budget_ouser_price = #{item.budgetOuserPrice}, + budget_ouser_cnt = #{item.budgetOuserCnt}, + budget_iuser_cnt = #{item.budgetIuserCnt}, act_rate = #{item.actRate}, - phase_status = #{item.phaseStatus}, + pstatus = #{item.pstatus}, act_out_user_at = #{item.actOutUserAt}, task_cnt = #{item.taskCnt}, finish_task_cnt = #{item.finishTaskCnt}, @@ -594,7 +597,8 @@ is_tpl = #{item.isTpl}, phase_class = #{item.phaseClass}, product_id = #{item.productId}, - phase_budget_at = #{item.phaseBudgetAt}, - calc_type = #{item.calcType} + budget_at = #{item.budgetAt}, + calc_type = #{item.calcType}, + act_at = #{item.actAt} \ 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 11823323..ae17187e 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 @@ -343,7 +343,7 @@ where res.id = #{id} - +