end7less
/
program_xm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
39eea58335
commit
f4f3c9331b
5 changed files with 155 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 83
      xm-core/src/main/java/com/xm/core/entity/XmProject.java
  2. 76
      xm-core/src/main/java/com/xm/core/entity/XmTask.java
  3. 4
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
  4. 28
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
  5. 27
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml

83
xm-core/src/main/java/com/xm/core/entity/XmProject.java
View File

@ -8,9 +8,9 @@ import java.math.BigDecimal;
/** /**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br> * 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmProject所有属性名: <br> * 实体 XmProject所有属性名: <br>
* id,code,name,xmType,startTime,endTime,urgent,priority,description,createUserid,createUsername,createTime,assess,assessRemarks,status,branchId,planTotalCost,bizProcInstId,bizFlowState,planNouserAt,planIuserAt,planOuserAt,locked,baseTime,baseRemark,baselineId,planWorkload,totalReceivables,budgetMarginRate,contractAmt,planIuserPrice,planOuserPrice,planOuserCnt,planIuserCnt,planWorkingHours,taxRate,planIuserWorkload,planOuserWorkload,fromTplId,budgetCtrl,deptid,showOut,isTpl,pmUserid,pmUsername,assUserid,assUsername,admUserid,admUsername,phaseBudgetCtrl,phaseActCtrl,del,ltime,ostatus;<br>
* id,code,name,xmType,startTime,endTime,urgent,priority,description,createUserid,createUsername,createTime,assess,assessRemarks,status,branchId,planTotalCost,bizProcInstId,bizFlowState,planNouserAt,planIuserAt,planOuserAt,locked,baseTime,baseRemark,baselineId,planWorkload,totalReceivables,budgetMarginRate,contractAmt,planIuserPrice,planOuserPrice,planOuserCnt,planIuserCnt,planWorkingHours,taxRate,planIuserWorkload,planOuserWorkload,fromTplId,budgetCtrl,deptid,showOut,isTpl,pmUserid,pmUsername,assUserid,assUsername,admUserid,admUsername,budgetEarly,phaseActCtrl,del,ltime,ostatus,workType,wtype,earlyAmt;<br>
* 表 xm_project xm_project的所有字段名: <br> * 表 xm_project xm_project的所有字段名: <br>
* id,code,name,xm_type,start_time,end_time,urgent,priority,description,create_userid,create_username,create_time,assess,assess_remarks,status,branch_id,plan_total_cost,biz_proc_inst_id,biz_flow_state,plan_nouser_at,plan_iuser_at,plan_ouser_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_iuser_price,plan_ouser_price,plan_ouser_cnt,plan_iuser_cnt,plan_working_hours,tax_rate,plan_iuser_workload,plan_ouser_workload,from_tpl_id,budget_ctrl,deptid,show_out,is_tpl,pm_userid,pm_username,ass_userid,ass_username,adm_userid,adm_username,phase_budget_ctrl,phase_act_ctrl,del,ltime,ostatus;<br>
* id,code,name,xm_type,start_time,end_time,urgent,priority,description,create_userid,create_username,create_time,assess,assess_remarks,status,branch_id,plan_total_cost,biz_proc_inst_id,biz_flow_state,plan_nouser_at,plan_iuser_at,plan_ouser_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_iuser_price,plan_ouser_price,plan_ouser_cnt,plan_iuser_cnt,plan_working_hours,tax_rate,plan_iuser_workload,plan_ouser_workload,from_tpl_id,budget_ctrl,deptid,show_out,is_tpl,pm_userid,pm_username,ass_userid,ass_username,adm_userid,adm_username,budget_early,phase_act_ctrl,del,ltime,ostatus,work_type,wtype,early_amt;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br> * id;<br>
*/ */
@ -137,13 +137,13 @@ public class XmProject implements java.io.Serializable {
@ApiModelProperty(notes="关联模板编号",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="关联模板编号",allowEmptyValue=true,example="",allowableValues="")
String fromTplId; String fromTplId;
@ApiModelProperty(notes="是否进行预算控制，计划中一级计划总预算不能大于项目预算",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="是否进行预算控制，计划中一级计划总预算大于项目预算则拒绝添加计划,一般用于瀑布型项目",allowEmptyValue=true,example="",allowableValues="")
String budgetCtrl; String budgetCtrl;
@ApiModelProperty(notes="部门编号",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="部门编号",allowEmptyValue=true,example="",allowableValues="")
String deptid; String deptid;
@ApiModelProperty(notes="是否对外公开0否1是",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="是否对外公开0-完全不可见，1-仅本司人员可见，2-关联人员可见（众包-外包-招投标）",allowEmptyValue=true,example="",allowableValues="")
String showOut; String showOut;
@ApiModelProperty(notes="是否为模板",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="是否为模板",allowEmptyValue=true,example="",allowableValues="")
@ -167,10 +167,10 @@ public class XmProject implements java.io.Serializable {
@ApiModelProperty(notes="主管领导姓名",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="主管领导姓名",allowEmptyValue=true,example="",allowableValues="")
String admUsername; String admUsername;
@ApiModelProperty(notes="是否进行计划明细预算控制，计划中下级预算不能大于上级预算",allowEmptyValue=true,example="",allowableValues="")
String phaseBudgetCtrl;
@ApiModelProperty(notes="是否进行计划预算预警，计划预算超出项目预算既定额度进行预警",allowEmptyValue=true,example="",allowableValues="")
String budgetEarly;
@ApiModelProperty(notes="计划是否进行实际金额控制，实际金额不能大于预算金额",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="计划是否进行实际金额控制，实际金额不能大于预算金额（大于预算金额不得结算）",allowEmptyValue=true,example="",allowableValues="")
String phaseActCtrl; String phaseActCtrl;
@ApiModelProperty(notes="是否已删除0否1是",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="是否已删除0否1是",allowEmptyValue=true,example="",allowableValues="")
@ -181,6 +181,15 @@ public class XmProject implements java.io.Serializable {
@ApiModelProperty(notes="原状态，暂停时记录原状态，暂停恢复后把原状态恢复",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="原状态，暂停时记录原状态，暂停恢复后把原状态恢复",allowEmptyValue=true,example="",allowableValues="")
String ostatus; String ostatus;
@ApiModelProperty(notes="工作方式scrum、kanban",allowEmptyValue=true,example="",allowableValues="")
String workType;
@ApiModelProperty(notes="报工方式0-无须报工，1-每日报工，2-工期内报工",allowEmptyValue=true,example="",allowableValues="")
String wtype;
@ApiModelProperty(notes="超出预算金额多少金额进行预警，正数代表超出的额度，负数代表距离预算的额度",allowEmptyValue=true,example="",allowableValues="")
BigDecimal earlyAmt;
/**项目编号**/ /**项目编号**/
public XmProject(String id) { public XmProject(String id) {
@ -426,7 +435,7 @@ public class XmProject implements java.io.Serializable {
this.fromTplId = fromTplId; this.fromTplId = fromTplId;
} }
/** /**
* 是否进行预算控制，计划中一级计划总预算不能大于项目预算
* 是否进行预算控制，计划中一级计划总预算大于项目预算则拒绝添加计划,一般用于瀑布型项目
**/ **/
public void setBudgetCtrl(String budgetCtrl) { public void setBudgetCtrl(String budgetCtrl) {
this.budgetCtrl = budgetCtrl; this.budgetCtrl = budgetCtrl;
@ -438,7 +447,7 @@ public class XmProject implements java.io.Serializable {
this.deptid = deptid; this.deptid = deptid;
} }
/** /**
* 是否对外公开0否1是
* 是否对外公开0-完全不可见，1-仅本司人员可见，2-关联人员可见（众包-外包-招投标）
**/ **/
public void setShowOut(String showOut) { public void setShowOut(String showOut) {
this.showOut = showOut; this.showOut = showOut;
@ -486,13 +495,13 @@ public class XmProject implements java.io.Serializable {
this.admUsername = admUsername; this.admUsername = admUsername;
} }
/** /**
* 是否进行计划明细预算控制，计划中下级预算不能大于上级预算
* 是否进行计划预算预警，计划预算超出项目预算既定额度进行预警
**/ **/
public void setPhaseBudgetCtrl(String phaseBudgetCtrl) {
this.phaseBudgetCtrl = phaseBudgetCtrl;
public void setBudgetEarly(String budgetEarly) {
this.budgetEarly = budgetEarly;
} }
/** /**
* 计划是否进行实际金额控制，实际金额不能大于预算金额
* 计划是否进行实际金额控制，实际金额不能大于预算金额（大于预算金额不得结算）
**/ **/
public void setPhaseActCtrl(String phaseActCtrl) { public void setPhaseActCtrl(String phaseActCtrl) {
this.phaseActCtrl = phaseActCtrl; this.phaseActCtrl = phaseActCtrl;
@ -515,6 +524,24 @@ public class XmProject implements java.io.Serializable {
public void setOstatus(String ostatus) { public void setOstatus(String ostatus) {
this.ostatus = ostatus; this.ostatus = ostatus;
} }
/**
* 工作方式scrum、kanban
**/
public void setWorkType(String workType) {
this.workType = workType;
}
/**
* 报工方式0-无须报工，1-每日报工，2-工期内报工
**/
public void setWtype(String wtype) {
this.wtype = wtype;
}
/**
* 超出预算金额多少金额进行预警，正数代表超出的额度，负数代表距离预算的额度
**/
public void setEarlyAmt(BigDecimal earlyAmt) {
this.earlyAmt = earlyAmt;
}
/** /**
* 项目编号 * 项目编号
@ -751,7 +778,7 @@ public class XmProject implements java.io.Serializable {
return this.fromTplId; return this.fromTplId;
} }
/** /**
* 是否进行预算控制，计划中一级计划总预算不能大于项目预算
* 是否进行预算控制，计划中一级计划总预算大于项目预算则拒绝添加计划,一般用于瀑布型项目
**/ **/
public String getBudgetCtrl() { public String getBudgetCtrl() {
return this.budgetCtrl; return this.budgetCtrl;
@ -763,7 +790,7 @@ public class XmProject implements java.io.Serializable {
return this.deptid; return this.deptid;
} }
/** /**
* 是否对外公开0否1是
* 是否对外公开0-完全不可见，1-仅本司人员可见，2-关联人员可见（众包-外包-招投标）
**/ **/
public String getShowOut() { public String getShowOut() {
return this.showOut; return this.showOut;
@ -811,13 +838,13 @@ public class XmProject implements java.io.Serializable {
return this.admUsername; return this.admUsername;
} }
/** /**
* 是否进行计划明细预算控制，计划中下级预算不能大于上级预算
* 是否进行计划预算预警，计划预算超出项目预算既定额度进行预警
**/ **/
public String getPhaseBudgetCtrl() {
return this.phaseBudgetCtrl;
public String getBudgetEarly() {
return this.budgetEarly;
} }
/** /**
* 计划是否进行实际金额控制，实际金额不能大于预算金额
* 计划是否进行实际金额控制，实际金额不能大于预算金额（大于预算金额不得结算）
**/ **/
public String getPhaseActCtrl() { public String getPhaseActCtrl() {
return this.phaseActCtrl; return this.phaseActCtrl;
@ -840,5 +867,23 @@ public class XmProject implements java.io.Serializable {
public String getOstatus() { public String getOstatus() {
return this.ostatus; return this.ostatus;
} }
/**
* 工作方式scrum、kanban
**/
public String getWorkType() {
return this.workType;
}
/**
* 报工方式0-无须报工，1-每日报工，2-工期内报工
**/
public String getWtype() {
return this.wtype;
}
/**
* 超出预算金额多少金额进行预警，正数代表超出的额度，负数代表距离预算的额度
**/
public BigDecimal getEarlyAmt() {
return this.earlyAmt;
}
} }

76
xm-core/src/main/java/com/xm/core/entity/XmTask.java
View File

@ -8,9 +8,9 @@ import java.math.BigDecimal;
/** /**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br> * 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmTask所有属性名: <br> * 实体 XmTask所有属性名: <br>
* id,name,parentTaskid,parentTaskname,projectId,projectName,level,sortLevel,executorUserid,executorUsername,preTaskid,preTaskname,startTime,endTime,milestone,description,remarks,createUserid,createUsername,createTime,rate,budgetCost,budgetWorkload,actCost,actWorkload,taskState,taskType,taskClass,toTaskCenter,actStartTime,actEndTime,bizProcInstId,bizFlowState,phaseId,phaseName,taskSkillNames,exeUsernames,taskSkillIds,exeUserids,taskOut,planType,settleSchemel,menuId,menuName,productId,productName,cbranchId,cdeptid,tagIds,tagNames,ntype,childrenCnt,ltime,pidPaths,lvl,isTpl,keyPath,uniInnerPrice,uniOutPrice,calcType,ptype;<br>
* id,name,parentTaskid,parentTaskname,projectId,projectName,level,sortLevel,executorUserid,executorUsername,preTaskid,preTaskname,startTime,endTime,milestone,description,remarks,createUserid,createUsername,createTime,rate,budgetCost,budgetWorkload,actCost,actWorkload,taskState,taskType,taskClass,toTaskCenter,actStartTime,actEndTime,bizProcInstId,bizFlowState,phaseId,phaseName,taskSkillNames,exeUsernames,taskSkillIds,exeUserids,taskOut,planType,settleSchemel,menuId,menuName,productId,productName,cbranchId,cdeptid,tagIds,tagNames,ntype,childrenCnt,ltime,pidPaths,lvl,isTpl,keyPath,uniInnerPrice,uniOutPrice,calcType,ptype,wtype,bctrl;<br>
* 表 xm_task xm_task的所有字段名: <br> * 表 xm_task xm_task的所有字段名: <br>
* id,name,parent_taskid,parent_taskname,project_id,project_name,level,sort_level,executor_userid,executor_username,pre_taskid,pre_taskname,start_time,end_time,milestone,description,remarks,create_userid,create_username,create_time,rate,budget_cost,budget_workload,act_cost,act_workload,task_state,task_type,task_class,to_task_center,act_start_time,act_end_time,biz_proc_inst_id,biz_flow_state,phase_id,phase_name,task_skill_names,exe_usernames,task_skill_ids,exe_userids,task_out,plan_type,settle_schemel,menu_id,menu_name,product_id,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;<br>
* id,name,parent_taskid,parent_taskname,project_id,project_name,level,sort_level,executor_userid,executor_username,pre_taskid,pre_taskname,start_time,end_time,milestone,description,remarks,create_userid,create_username,create_time,rate,budget_cost,budget_workload,act_cost,act_workload,task_state,task_type,task_class,to_task_center,act_start_time,act_end_time,biz_proc_inst_id,biz_flow_state,phase_id,phase_name,task_skill_names,exe_usernames,task_skill_ids,exe_userids,task_out,plan_type,settle_schemel,menu_id,menu_name,product_id,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,wtype,bctrl;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br> * id;<br>
*/ */
@ -80,19 +80,19 @@ public class XmTask implements java.io.Serializable {
@ApiModelProperty(notes="创建时间",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="创建时间",allowEmptyValue=true,example="",allowableValues="")
Date createTime; Date createTime;
@ApiModelProperty(notes="任务进度0-100",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="任务进度0-100（=实际工时/预算工时*100）",allowEmptyValue=true,example="",allowableValues="")
BigDecimal rate; BigDecimal rate;
@ApiModelProperty(notes="当前任务预算金额（包括所有成本，不包括下一级）",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="当前任务预算金额（calc_type=2时预算工时*单价，calc_type=1时下级汇总）",allowEmptyValue=true,example="",allowableValues="")
BigDecimal budgetCost; BigDecimal budgetCost;
@ApiModelProperty(notes="预算工时（不包括下一级）",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="预算工时（calc_type=2时手工填写，calc_type=1时下级汇总）",allowEmptyValue=true,example="",allowableValues="")
BigDecimal budgetWorkload; BigDecimal budgetWorkload;
@ApiModelProperty(notes="当前任务实际费用金额（包括所有成本，不包括下一级）待结算金额",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="当前任务实际费用金额（calc_type=2时，取实际工时*单价，calc_type=1时取下级汇总数据）待结算金额",allowEmptyValue=true,example="",allowableValues="")
BigDecimal actCost; BigDecimal actCost;
@ApiModelProperty(notes="实际工时（不包括下一级）",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="实际工时(calc_type=2时，取工时表数据，calc_type=1时取下级汇总数据)",allowEmptyValue=true,example="",allowableValues="")
BigDecimal actWorkload; BigDecimal actWorkload;
@ApiModelProperty(notes="任务状态0待领取1已领取执行中2已完工3已结算",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="任务状态0待领取1已领取执行中2已完工3已结算",allowEmptyValue=true,example="",allowableValues="")
@ -197,11 +197,17 @@ public class XmTask implements java.io.Serializable {
@ApiModelProperty(notes="外部单位工时单价",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="外部单位工时单价",allowEmptyValue=true,example="",allowableValues="")
BigDecimal uniOutPrice; BigDecimal uniOutPrice;
@ApiModelProperty(notes="实际工作量及金额计算方式0-手工填写，1-根据进度*预算计算，2-其它",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="数据统计方式",allowEmptyValue=true,example="",allowableValues="")
String calcType; String calcType;
@ApiModelProperty(notes="计划分类0-项目，1产品",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="计划分类0-项目，1产品,空为不区分",allowEmptyValue=true,example="",allowableValues="")
String ptype; String ptype;
@ApiModelProperty(notes="报工方式1-强制每日报工，2-工期内报工，0-无需报工",allowEmptyValue=true,example="",allowableValues="")
String wtype;
@ApiModelProperty(notes="报工限制0-不限制，1-不得超出预估工时",allowEmptyValue=true,example="",allowableValues="")
String bctrl;
/**任务编号**/ /**任务编号**/
public XmTask(String id) { public XmTask(String id) {
@ -333,31 +339,31 @@ public class XmTask implements java.io.Serializable {
this.createTime = createTime; this.createTime = createTime;
} }
/** /**
* 任务进度0-100
* 任务进度0-100（=实际工时/预算工时*100）
**/ **/
public void setRate(BigDecimal rate) { public void setRate(BigDecimal rate) {
this.rate = rate; this.rate = rate;
} }
/** /**
* 当前任务预算金额（包括所有成本，不包括下一级）
* 当前任务预算金额（calc_type=2时预算工时*单价，calc_type=1时下级汇总）
**/ **/
public void setBudgetCost(BigDecimal budgetCost) { public void setBudgetCost(BigDecimal budgetCost) {
this.budgetCost = budgetCost; this.budgetCost = budgetCost;
} }
/** /**
* 预算工时（不包括下一级）
* 预算工时（calc_type=2时手工填写，calc_type=1时下级汇总）
**/ **/
public void setBudgetWorkload(BigDecimal budgetWorkload) { public void setBudgetWorkload(BigDecimal budgetWorkload) {
this.budgetWorkload = budgetWorkload; this.budgetWorkload = budgetWorkload;
} }
/** /**
* 当前任务实际费用金额（包括所有成本，不包括下一级）待结算金额
* 当前任务实际费用金额（calc_type=2时，取实际工时*单价，calc_type=1时取下级汇总数据）待结算金额
**/ **/
public void setActCost(BigDecimal actCost) { public void setActCost(BigDecimal actCost) {
this.actCost = actCost; this.actCost = actCost;
} }
/** /**
* 实际工时（不包括下一级）
* 实际工时(calc_type=2时，取工时表数据，calc_type=1时取下级汇总数据)
**/ **/
public void setActWorkload(BigDecimal actWorkload) { public void setActWorkload(BigDecimal actWorkload) {
this.actWorkload = actWorkload; this.actWorkload = actWorkload;
@ -567,17 +573,29 @@ public class XmTask implements java.io.Serializable {
this.uniOutPrice = uniOutPrice; this.uniOutPrice = uniOutPrice;
} }
/** /**
* 实际工作量及金额计算方式0-手工填写，1-根据进度*预算计算，2-其它
* 数据统计方式
**/ **/
public void setCalcType(String calcType) { public void setCalcType(String calcType) {
this.calcType = calcType; this.calcType = calcType;
} }
/** /**
* 计划分类0-项目，1产品
* 计划分类0-项目，1产品,空为不区分
**/ **/
public void setPtype(String ptype) { public void setPtype(String ptype) {
this.ptype = ptype; this.ptype = ptype;
} }
/**
* 报工方式1-强制每日报工，2-工期内报工，0-无需报工
**/
public void setWtype(String wtype) {
this.wtype = wtype;
}
/**
* 报工限制0-不限制，1-不得超出预估工时
**/
public void setBctrl(String bctrl) {
this.bctrl = bctrl;
}
/** /**
* 任务编号 * 任务编号
@ -700,31 +718,31 @@ public class XmTask implements java.io.Serializable {
return this.createTime; return this.createTime;
} }
/** /**
* 任务进度0-100
* 任务进度0-100（=实际工时/预算工时*100）
**/ **/
public BigDecimal getRate() { public BigDecimal getRate() {
return this.rate; return this.rate;
} }
/** /**
* 当前任务预算金额（包括所有成本，不包括下一级）
* 当前任务预算金额（calc_type=2时预算工时*单价，calc_type=1时下级汇总）
**/ **/
public BigDecimal getBudgetCost() { public BigDecimal getBudgetCost() {
return this.budgetCost; return this.budgetCost;
} }
/** /**
* 预算工时（不包括下一级）
* 预算工时（calc_type=2时手工填写，calc_type=1时下级汇总）
**/ **/
public BigDecimal getBudgetWorkload() { public BigDecimal getBudgetWorkload() {
return this.budgetWorkload; return this.budgetWorkload;
} }
/** /**
* 当前任务实际费用金额（包括所有成本，不包括下一级）待结算金额
* 当前任务实际费用金额（calc_type=2时，取实际工时*单价，calc_type=1时取下级汇总数据）待结算金额
**/ **/
public BigDecimal getActCost() { public BigDecimal getActCost() {
return this.actCost; return this.actCost;
} }
/** /**
* 实际工时（不包括下一级）
* 实际工时(calc_type=2时，取工时表数据，calc_type=1时取下级汇总数据)
**/ **/
public BigDecimal getActWorkload() { public BigDecimal getActWorkload() {
return this.actWorkload; return this.actWorkload;
@ -934,16 +952,28 @@ public class XmTask implements java.io.Serializable {
return this.uniOutPrice; return this.uniOutPrice;
} }
/** /**
* 实际工作量及金额计算方式0-手工填写，1-根据进度*预算计算，2-其它
* 数据统计方式
**/ **/
public String getCalcType() { public String getCalcType() {
return this.calcType; return this.calcType;
} }
/** /**
* 计划分类0-项目，1产品
* 计划分类0-项目，1产品,空为不区分
**/ **/
public String getPtype() { public String getPtype() {
return this.ptype; return this.ptype;
} }
/**
* 报工方式1-强制每日报工，2-工期内报工，0-无需报工
**/
public String getWtype() {
return this.wtype;
}
/**
* 报工限制0-不限制，1-不得超出预估工时
**/
public String getBctrl() {
return this.bctrl;
}
} }

4
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
View File

@ -199,7 +199,7 @@
<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> --> <!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->
<select id="selectListByWhere" parameterType="com.xm.core.entity.XmMenu" resultType="com.xm.core.entity.XmMenu"> <select id="selectListByWhere" parameterType="com.xm.core.entity.XmMenu" resultType="com.xm.core.entity.XmMenu">
select res.* from xm_menu res
select * from xm_menu res
<where> <where>
<include refid="where"/> <include refid="where"/>
</where> </where>
@ -207,7 +207,7 @@
<!-- 通过主键查询获取数据对象 返回object --> <!-- 通过主键查询获取数据对象 返回object -->
<select id="selectOneObject" parameterType="com.xm.core.entity.XmMenu" resultType="com.xm.core.entity.XmMenu"> <select id="selectOneObject" parameterType="com.xm.core.entity.XmMenu" resultType="com.xm.core.entity.XmMenu">
select res.* from xm_menu res
select * from xm_menu res
where where
res.menu_id = #{menuId} res.menu_id = #{menuId}
</select> </select>

28
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
View File

@ -165,7 +165,7 @@
insert into xm_project( insert into xm_project(
<include refid="columns"/> <include refid="columns"/>
) values ( ) values (
#{id},#{code},#{name},#{xmType},#{startTime},#{endTime},#{urgent},#{priority},#{description},#{createUserid},#{createUsername},#{createTime},#{assess},#{assessRemarks},#{status},#{branchId},#{planTotalCost},#{bizProcInstId},#{bizFlowState},#{planNouserAt},#{planIuserAt},#{planOuserAt},#{locked},#{baseTime},#{baseRemark},#{baselineId},#{planWorkload},#{totalReceivables},#{budgetMarginRate},#{contractAmt},#{planIuserPrice},#{planOuserPrice},#{planOuserCnt},#{planIuserCnt},#{planWorkingHours},#{taxRate},#{planIuserWorkload},#{planOuserWorkload},#{fromTplId},#{budgetCtrl},#{deptid},#{showOut},#{isTpl},#{pmUserid},#{pmUsername},#{assUserid},#{assUsername},#{admUserid},#{admUsername},#{phaseBudgetCtrl},#{phaseActCtrl},#{del},#{ltime},#{ostatus}
#{id},#{code},#{name},#{xmType},#{startTime},#{endTime},#{urgent},#{priority},#{description},#{createUserid},#{createUsername},#{createTime},#{assess},#{assessRemarks},#{status},#{branchId},#{planTotalCost},#{bizProcInstId},#{bizFlowState},#{planNouserAt},#{planIuserAt},#{planOuserAt},#{locked},#{baseTime},#{baseRemark},#{baselineId},#{planWorkload},#{totalReceivables},#{budgetMarginRate},#{contractAmt},#{planIuserPrice},#{planOuserPrice},#{planOuserCnt},#{planIuserCnt},#{planWorkingHours},#{taxRate},#{planIuserWorkload},#{planOuserWorkload},#{fromTplId},#{budgetCtrl},#{deptid},#{showOut},#{isTpl},#{pmUserid},#{pmUsername},#{assUserid},#{assUsername},#{admUserid},#{admUsername},#{budgetEarly},#{phaseActCtrl},#{del},#{ltime},#{ostatus},#{workType},#{wtype},#{earlyAmt}
) )
</insert> </insert>
@ -228,7 +228,7 @@
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <sql id="columns">
id,code,name,xm_type,start_time,end_time,urgent,priority,description,create_userid,create_username,create_time,assess,assess_remarks,status,branch_id,plan_total_cost,biz_proc_inst_id,biz_flow_state,plan_nouser_at,plan_iuser_at,plan_ouser_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_iuser_price,plan_ouser_price,plan_ouser_cnt,plan_iuser_cnt,plan_working_hours,tax_rate,plan_iuser_workload,plan_ouser_workload,from_tpl_id,budget_ctrl,deptid,show_out,is_tpl,pm_userid,pm_username,ass_userid,ass_username,adm_userid,adm_username,phase_budget_ctrl,phase_act_ctrl,del,ltime,ostatus
id,code,name,xm_type,start_time,end_time,urgent,priority,description,create_userid,create_username,create_time,assess,assess_remarks,status,branch_id,plan_total_cost,biz_proc_inst_id,biz_flow_state,plan_nouser_at,plan_iuser_at,plan_ouser_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_iuser_price,plan_ouser_price,plan_ouser_cnt,plan_iuser_cnt,plan_working_hours,tax_rate,plan_iuser_workload,plan_ouser_workload,from_tpl_id,budget_ctrl,deptid,show_out,is_tpl,pm_userid,pm_username,ass_userid,ass_username,adm_userid,adm_username,budget_early,phase_act_ctrl,del,ltime,ostatus,work_type,wtype,early_amt
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -282,11 +282,14 @@
<if test="assUsername != null and assUsername != ''"> and res.ass_username = #{assUsername} </if> <if test="assUsername != null and assUsername != ''"> and res.ass_username = #{assUsername} </if>
<if test="admUserid != null and admUserid != ''"> and res.adm_userid = #{admUserid} </if> <if test="admUserid != null and admUserid != ''"> and res.adm_userid = #{admUserid} </if>
<if test="admUsername != null and admUsername != ''"> and res.adm_username = #{admUsername} </if> <if test="admUsername != null and admUsername != ''"> and res.adm_username = #{admUsername} </if>
<if test="phaseBudgetCtrl != null and phaseBudgetCtrl != ''"> and res.phase_budget_ctrl = #{phaseBudgetCtrl} </if>
<if test="budgetEarly != null and budgetEarly != ''"> and res.budget_early = #{budgetEarly} </if>
<if test="phaseActCtrl != null and phaseActCtrl != ''"> and res.phase_act_ctrl = #{phaseActCtrl} </if> <if test="phaseActCtrl != null and phaseActCtrl != ''"> and res.phase_act_ctrl = #{phaseActCtrl} </if>
<if test="del != null and del != ''"> and res.del = #{del} </if> <if test="del != null and del != ''"> and res.del = #{del} </if>
<if test="ltime != null"> and date_format(res.ltime,'%Y-%m-%d') = date_format(#{ltime},'%Y-%m-%d') </if> <if test="ltime != null"> and date_format(res.ltime,'%Y-%m-%d') = date_format(#{ltime},'%Y-%m-%d') </if>
<if test="ostatus != null and ostatus != ''"> and res.ostatus = #{ostatus} </if> <if test="ostatus != null and ostatus != ''"> and res.ostatus = #{ostatus} </if>
<if test="workType != null and workType != ''"> and res.work_type = #{workType} </if>
<if test="wtype != null and wtype != ''"> and res.wtype = #{wtype} </if>
<if test="earlyAmt != null and earlyAmt != ''"> and res.early_amt = #{earlyAmt} </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -338,11 +341,14 @@
ass_username = #{assUsername}, ass_username = #{assUsername},
adm_userid = #{admUserid}, adm_userid = #{admUserid},
adm_username = #{admUsername}, adm_username = #{admUsername},
phase_budget_ctrl = #{phaseBudgetCtrl},
budget_early = #{budgetEarly},
phase_act_ctrl = #{phaseActCtrl}, phase_act_ctrl = #{phaseActCtrl},
del = #{del}, del = #{del},
ltime = #{ltime}, ltime = #{ltime},
ostatus = #{ostatus}
ostatus = #{ostatus},
work_type = #{workType},
wtype = #{wtype},
early_amt = #{earlyAmt}
</sql> </sql>
<sql id="someFieldSet"> <sql id="someFieldSet">
<if test="code != null and code != ''"> code = #{code}, </if> <if test="code != null and code != ''"> code = #{code}, </if>
@ -393,11 +399,14 @@
<if test="assUsername != null and assUsername != ''"> ass_username = #{assUsername}, </if> <if test="assUsername != null and assUsername != ''"> ass_username = #{assUsername}, </if>
<if test="admUserid != null and admUserid != ''"> adm_userid = #{admUserid}, </if> <if test="admUserid != null and admUserid != ''"> adm_userid = #{admUserid}, </if>
<if test="admUsername != null and admUsername != ''"> adm_username = #{admUsername}, </if> <if test="admUsername != null and admUsername != ''"> adm_username = #{admUsername}, </if>
<if test="phaseBudgetCtrl != null and phaseBudgetCtrl != ''"> phase_budget_ctrl = #{phaseBudgetCtrl}, </if>
<if test="budgetEarly != null and budgetEarly != ''"> budget_early = #{budgetEarly}, </if>
<if test="phaseActCtrl != null and phaseActCtrl != ''"> phase_act_ctrl = #{phaseActCtrl}, </if> <if test="phaseActCtrl != null and phaseActCtrl != ''"> phase_act_ctrl = #{phaseActCtrl}, </if>
<if test="del != null and del != ''"> del = #{del}, </if> <if test="del != null and del != ''"> del = #{del}, </if>
<if test="ltime != null"> ltime = #{ltime}, </if> <if test="ltime != null"> ltime = #{ltime}, </if>
<if test="ostatus != null and ostatus != ''"> ostatus = #{ostatus}, </if> <if test="ostatus != null and ostatus != ''"> ostatus = #{ostatus}, </if>
<if test="workType != null and workType != ''"> work_type = #{workType}, </if>
<if test="wtype != null and wtype != ''"> wtype = #{wtype}, </if>
<if test="earlyAmt != null and earlyAmt != ''"> early_amt = #{earlyAmt}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -449,10 +458,13 @@
ass_username = #{item.assUsername}, ass_username = #{item.assUsername},
adm_userid = #{item.admUserid}, adm_userid = #{item.admUserid},
adm_username = #{item.admUsername}, adm_username = #{item.admUsername},
phase_budget_ctrl = #{item.phaseBudgetCtrl},
budget_early = #{item.budgetEarly},
phase_act_ctrl = #{item.phaseActCtrl}, phase_act_ctrl = #{item.phaseActCtrl},
del = #{item.del}, del = #{item.del},
ltime = #{item.ltime}, ltime = #{item.ltime},
ostatus = #{item.ostatus}
ostatus = #{item.ostatus},
work_type = #{item.workType},
wtype = #{item.wtype},
early_amt = #{item.earlyAmt}
</sql> </sql>
</mapper> </mapper>

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

@ -331,7 +331,7 @@
and res.ntype='0' and res.ntype='0'
limit 10 limit 10
</select> </select>
<update id="batchChangeParent" parameterType="HashMap"> <update id="batchChangeParent" parameterType="HashMap">
update xm_task res inner join ( update xm_task res inner join (
select t.id,pid_paths,parent_taskid from xm_task t where t.id in select t.id,pid_paths,parent_taskid from xm_task t where t.id in
@ -361,19 +361,16 @@
<!-- 通过条件查询获取数据列表 返回list<map> --> <!-- 通过条件查询获取数据列表 返回list<map> -->
<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap"> <select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
select (select sum(1) from xm_task t where t.parent_taskid=res.id) as children_cnt, res.*
from xm_task res
select * from xm_task res
<where> <where>
<include refid="whereForMap"/> <include refid="whereForMap"/>
<include refid="where"/> <include refid="where"/>
</where> </where>
order by res.sort_level asc
</select> </select>
<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> --> <!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->
<select id="selectListByWhere" parameterType="com.xm.core.entity.XmTask" resultType="com.xm.core.entity.XmTask"> <select id="selectListByWhere" parameterType="com.xm.core.entity.XmTask" resultType="com.xm.core.entity.XmTask">
select (select sum(1) from xm_task t where t.parent_taskid=res.id) as children_cnt, res.* from xm_task res
select * from xm_task res
<where> <where>
<include refid="where"/> <include refid="where"/>
</where> </where>
@ -381,7 +378,7 @@
<!-- 通过主键查询获取数据对象 返回object --> <!-- 通过主键查询获取数据对象 返回object -->
<select id="selectOneObject" parameterType="com.xm.core.entity.XmTask" resultType="com.xm.core.entity.XmTask"> <select id="selectOneObject" parameterType="com.xm.core.entity.XmTask" resultType="com.xm.core.entity.XmTask">
select (select sum(1) from xm_task t where t.parent_taskid=res.id) as children_cnt, res.* from xm_task res
select * from xm_task res
where where
res.id = #{id} res.id = #{id}
</select> </select>
@ -410,7 +407,7 @@
insert into xm_task( insert into xm_task(
<include refid="columns"/> <include refid="columns"/>
) values ( ) 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},#{productName},#{cbranchId},#{cdeptid},#{tagIds},#{tagNames},#{ntype},#{childrenCnt},#{ltime},#{pidPaths},#{lvl},#{isTpl},#{keyPath},#{uniInnerPrice},#{uniOutPrice},#{calcType},#{ptype}
#{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},#{productName},#{cbranchId},#{cdeptid},#{tagIds},#{tagNames},#{ntype},#{childrenCnt},#{ltime},#{pidPaths},#{lvl},#{isTpl},#{keyPath},#{uniInnerPrice},#{uniOutPrice},#{calcType},#{ptype},#{wtype},#{bctrl}
) )
</insert> </insert>
@ -473,7 +470,7 @@
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <sql id="columns">
id,name,parent_taskid,parent_taskname,project_id,project_name,level,sort_level,executor_userid,executor_username,pre_taskid,pre_taskname,start_time,end_time,milestone,description,remarks,create_userid,create_username,create_time,rate,budget_cost,budget_workload,act_cost,act_workload,task_state,task_type,task_class,to_task_center,act_start_time,act_end_time,biz_proc_inst_id,biz_flow_state,phase_id,phase_name,task_skill_names,exe_usernames,task_skill_ids,exe_userids,task_out,plan_type,settle_schemel,menu_id,menu_name,product_id,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,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,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,wtype,bctrl
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -539,6 +536,8 @@
<if test="uniOutPrice != null and uniOutPrice != ''"> and res.uni_out_price = #{uniOutPrice} </if> <if test="uniOutPrice != null and uniOutPrice != ''"> and res.uni_out_price = #{uniOutPrice} </if>
<if test="calcType != null and calcType != ''"> and res.calc_type = #{calcType} </if> <if test="calcType != null and calcType != ''"> and res.calc_type = #{calcType} </if>
<if test="ptype != null and ptype != ''"> and res.ptype = #{ptype} </if> <if test="ptype != null and ptype != ''"> and res.ptype = #{ptype} </if>
<if test="wtype != null and wtype != ''"> and res.wtype = #{wtype} </if>
<if test="bctrl != null and bctrl != ''"> and res.bctrl = #{bctrl} </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -601,7 +600,9 @@
uni_inner_price = #{uniInnerPrice}, uni_inner_price = #{uniInnerPrice},
uni_out_price = #{uniOutPrice}, uni_out_price = #{uniOutPrice},
calc_type = #{calcType}, calc_type = #{calcType},
ptype = #{ptype}
ptype = #{ptype},
wtype = #{wtype},
bctrl = #{bctrl}
</sql> </sql>
<sql id="someFieldSet"> <sql id="someFieldSet">
<if test="name != null and name != ''"> name = #{name}, </if> <if test="name != null and name != ''"> name = #{name}, </if>
@ -664,6 +665,8 @@
<if test="uniOutPrice != null and uniOutPrice != ''"> uni_out_price = #{uniOutPrice}, </if> <if test="uniOutPrice != null and uniOutPrice != ''"> uni_out_price = #{uniOutPrice}, </if>
<if test="calcType != null and calcType != ''"> calc_type = #{calcType}, </if> <if test="calcType != null and calcType != ''"> calc_type = #{calcType}, </if>
<if test="ptype != null and ptype != ''"> ptype = #{ptype}, </if> <if test="ptype != null and ptype != ''"> ptype = #{ptype}, </if>
<if test="wtype != null and wtype != ''"> wtype = #{wtype}, </if>
<if test="bctrl != null and bctrl != ''"> bctrl = #{bctrl}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -726,6 +729,8 @@
uni_inner_price = #{item.uniInnerPrice}, uni_inner_price = #{item.uniInnerPrice},
uni_out_price = #{item.uniOutPrice}, uni_out_price = #{item.uniOutPrice},
calc_type = #{item.calcType}, calc_type = #{item.calcType},
ptype = #{item.ptype}
ptype = #{item.ptype},
wtype = #{item.wtype},
bctrl = #{item.bctrl}
</sql> </sql>
</mapper> </mapper>
Write Preview
Loading…
Cancel
Save