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 6fb65b07..edecf614 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
@@ -1,20 +1,19 @@
package com.xm.core.entity;
+import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
import java.util.Date;
+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,budgetAt,budgetWorkload,actAt,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,initWorkload,crowd,shareFee,oshare;
- * 表 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_at,budget_workload,act_at,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,init_workload,crowd,share_fee,oshare;
+ * "id","任务编号","name","任务名称","parentTaskid","父任务编号","parentTaskname","父任务名称","projectId","项目编号","projectName","项目名称","level","任务级别","sortLevel","序号","executorUserid","任务执行人编号","executorUsername","任务执行人","preTaskid","前置任务编号","preTaskname","前置任务名称","startTime","任务开始时间","endTime","任务结束时间","milestone","里程碑","description","任务描述","remarks","备注","createUserid","任务创建人编号(谁创建谁负责)","createUsername","任务创建人(谁创建谁负责)","createTime","创建时间","rate","任务进度0-100(=实际工时/(实际工时+剩余工时)*100)","budgetAt","当前任务预算金额(calc_type=2时预算工时*单价,calc_type=1时下级汇总)","budgetWorkload","预算工时(calc_type=2时手工填写,calc_type=1时下级汇总)","actAt","当前任务实际费用金额(calc_type=2时,取实际工时*单价,calc_type=1时取下级汇总数据)待结算金额","actWorkload","任务取工时表报工工时汇总,","taskState","任务状态0待领取1已领取执行中2已完工3已结算4已关闭","taskType","0售前方案1投标2需求3设计4开发5测试6验收7部署8运维--来自基础数据表taskType","taskClass","1需结算0不需结算","toTaskCenter","是否发布到任务大厅0否1是,1时互联网可访问","actStartTime","实际开始时间-任务状态变成执行中的时间","actEndTime","实际结束时间-任务状态变成完工状态时的时间","bizProcInstId","当前流程实例编号","bizFlowState","当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除","phaseId","项目阶段编号(作废)","phaseName","项目阶段名称(作废)","taskSkillNames","技能列表,逗号分隔","exeUsernames","执行人列表逗号分隔如陈x(审核人),王x(监控人)","taskSkillIds","技能编号列表逗号分隔","exeUserids","执行人编号列表逗号分隔如u1(1),u2(2)","taskOut","执行方式-0内研1外购","planType","计划类型w1-周,w2-2周,w3-3周,m1-1月,m2-2月,q1-季,q2-半年,y1-年","settleSchemel","任务结算方案-来自数字字典xmTaskSettleSchemel","menuId","归属功能编号","menuName","归属功能名称","productId","产品编号根据功能变化带进","cbranchId","创建机构","cdeptid","创建部门","tagIds","标签编号,逗号分割","tagNames","标签名称,逗号分割","ntype","节点类型0-任务,1-计划。计划下可建立计划和任务,任务下不允许再扩展。也就是非叶子节点都是计划,叶子节点有可能是计划或者任务","childrenCnt","儿子节点个数","ltime","更新时间","pidPaths","父级id逗号分割,最后一个为本节点节点编号,以,号结尾","lvl","层级0-顶级,1-一级,2-二级,3-三级,4-四级。总共5级","isTpl","是否为模板","keyPath","是否为关键路径上的节点","uniInnerPrice","内部单位工时单价","uniOutPrice","外部单位工时单价","calcType","数据统计方式","ptype","计划分类0-项目,1产品,空为不区分","wtype","报工方式1-强制每日报工,2-工期内报工,0-无需报工","bctrl","报工限制0-不限制,1-不得超出预估工时","initWorkload","原始预估工作量,budget_workload发生变化后,进行备份","shareFee","分享赚佣金","oshare","开启分享赚功能0-否1是","crowd","是否众包0否1是,众包属于外购的一种";
* 当前主键(包括多主键):
* id;
*/
+ @Data
@ApiModel(description="xm_task")
public class XmTask implements java.io.Serializable {
@@ -96,7 +95,7 @@ public class XmTask implements java.io.Serializable {
@ApiModelProperty(notes="任务取工时表报工工时汇总,",allowEmptyValue=true,example="",allowableValues="")
BigDecimal actWorkload;
- @ApiModelProperty(notes="任务状态0待领取1已领取执行中2已完工3已结算",allowEmptyValue=true,example="",allowableValues="")
+ @ApiModelProperty(notes="任务状态0待领取1已领取执行中2已完工3已结算4已关闭",allowEmptyValue=true,example="",allowableValues="")
String taskState;
@ApiModelProperty(notes="0售前方案1投标2需求3设计4开发5测试6验收7部署8运维--来自基础数据表taskType",allowEmptyValue=true,example="",allowableValues="")
@@ -105,13 +104,13 @@ public class XmTask implements java.io.Serializable {
@ApiModelProperty(notes="1需结算0不需结算",allowEmptyValue=true,example="",allowableValues="")
String taskClass;
- @ApiModelProperty(notes="是否发布到任务大厅0否1是",allowEmptyValue=true,example="",allowableValues="")
+ @ApiModelProperty(notes="是否发布到任务大厅0否1是,1时互联网可访问",allowEmptyValue=true,example="",allowableValues="")
String toTaskCenter;
- @ApiModelProperty(notes="实际开始时间",allowEmptyValue=true,example="",allowableValues="")
+ @ApiModelProperty(notes="实际开始时间-任务状态变成执行中的时间",allowEmptyValue=true,example="",allowableValues="")
Date actStartTime;
- @ApiModelProperty(notes="实际结束时间",allowEmptyValue=true,example="",allowableValues="")
+ @ApiModelProperty(notes="实际结束时间-任务状态变成完工状态时的时间",allowEmptyValue=true,example="",allowableValues="")
Date actEndTime;
@ApiModelProperty(notes="当前流程实例编号",allowEmptyValue=true,example="",allowableValues="")
@@ -138,7 +137,7 @@ public class XmTask implements java.io.Serializable {
@ApiModelProperty(notes="执行人编号列表逗号分隔如u1(1),u2(2)",allowEmptyValue=true,example="",allowableValues="")
String exeUserids;
- @ApiModelProperty(notes="是否外购",allowEmptyValue=true,example="",allowableValues="")
+ @ApiModelProperty(notes="执行方式-0内研1外购",allowEmptyValue=true,example="",allowableValues="")
String taskOut;
@ApiModelProperty(notes="计划类型w1-周,w2-2周,w3-3周,m1-1月,m2-2月,q1-季,q2-半年,y1-年",allowEmptyValue=true,example="",allowableValues="")
@@ -210,816 +209,26 @@ public class XmTask implements java.io.Serializable {
@ApiModelProperty(notes="原始预估工作量,budget_workload发生变化后,进行备份",allowEmptyValue=true,example="",allowableValues="")
BigDecimal initWorkload;
- @ApiModelProperty(notes="是否众包0-否1是-众包互联网上才能看见",allowEmptyValue=true,example="",allowableValues="")
- String crowd;
-
@ApiModelProperty(notes="分享赚佣金",allowEmptyValue=true,example="",allowableValues="")
BigDecimal shareFee;
@ApiModelProperty(notes="开启分享赚功能0-否1是",allowEmptyValue=true,example="",allowableValues="")
String oshare;
+
+ @ApiModelProperty(notes="是否众包0否1是,众包属于外购的一种",allowEmptyValue=true,example="",allowableValues="")
+ String crowd;
- /**任务编号**/
+ /**
+ *任务编号
+ **/
public XmTask(String id) {
this.id = id;
}
- /**xm_task**/
+ /**
+ * xm_task
+ **/
public XmTask() {
}
-
- /**
- * 任务编号
- **/
- public void setId(String id) {
- this.id = id;
- }
- /**
- * 任务名称
- **/
- public void setName(String name) {
- this.name = name;
- }
- /**
- * 父任务编号
- **/
- public void setParentTaskid(String parentTaskid) {
- this.parentTaskid = parentTaskid;
- }
- /**
- * 父任务名称
- **/
- public void setParentTaskname(String parentTaskname) {
- this.parentTaskname = parentTaskname;
- }
- /**
- * 项目编号
- **/
- public void setProjectId(String projectId) {
- this.projectId = projectId;
- }
- /**
- * 项目名称
- **/
- public void setProjectName(String projectName) {
- this.projectName = projectName;
- }
- /**
- * 任务级别
- **/
- public void setLevel(String level) {
- this.level = level;
- }
- /**
- * 序号
- **/
- public void setSortLevel(String sortLevel) {
- this.sortLevel = sortLevel;
- }
- /**
- * 任务执行人编号
- **/
- public void setExecutorUserid(String executorUserid) {
- this.executorUserid = executorUserid;
- }
- /**
- * 任务执行人
- **/
- public void setExecutorUsername(String executorUsername) {
- this.executorUsername = executorUsername;
- }
- /**
- * 前置任务编号
- **/
- public void setPreTaskid(String preTaskid) {
- this.preTaskid = preTaskid;
- }
- /**
- * 前置任务名称
- **/
- public void setPreTaskname(String preTaskname) {
- this.preTaskname = preTaskname;
- }
- /**
- * 任务开始时间
- **/
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
- /**
- * 任务结束时间
- **/
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
- /**
- * 里程碑
- **/
- public void setMilestone(String milestone) {
- this.milestone = milestone;
- }
- /**
- * 任务描述
- **/
- public void setDescription(String description) {
- this.description = description;
- }
- /**
- * 备注
- **/
- public void setRemarks(String remarks) {
- this.remarks = remarks;
- }
- /**
- * 任务创建人编号(谁创建谁负责)
- **/
- public void setCreateUserid(String createUserid) {
- this.createUserid = createUserid;
- }
- /**
- * 任务创建人(谁创建谁负责)
- **/
- public void setCreateUsername(String createUsername) {
- this.createUsername = createUsername;
- }
- /**
- * 创建时间
- **/
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
- /**
- * 任务进度0-100(=实际工时/(实际工时+剩余工时)*100)
- **/
- public void setRate(Integer rate) {
- this.rate = rate;
- }
- /**
- * 当前任务预算金额(calc_type=2时预算工时*单价,calc_type=1时下级汇总)
- **/
- public void setBudgetAt(BigDecimal budgetAt) {
- this.budgetAt = budgetAt;
- }
- /**
- * 预算工时(calc_type=2时手工填写,calc_type=1时下级汇总)
- **/
- public void setBudgetWorkload(BigDecimal budgetWorkload) {
- this.budgetWorkload = budgetWorkload;
- }
- /**
- * 当前任务实际费用金额(calc_type=2时,取实际工时*单价,calc_type=1时取下级汇总数据)待结算金额
- **/
- public void setActAt(BigDecimal actAt) {
- this.actAt = actAt;
- }
- /**
- * 任务取工时表报工工时汇总,
- **/
- public void setActWorkload(BigDecimal actWorkload) {
- this.actWorkload = actWorkload;
- }
- /**
- * 任务状态0待领取1已领取执行中2已完工3已结算
- **/
- public void setTaskState(String taskState) {
- this.taskState = taskState;
- }
- /**
- * 0售前方案1投标2需求3设计4开发5测试6验收7部署8运维--来自基础数据表taskType
- **/
- public void setTaskType(String taskType) {
- this.taskType = taskType;
- }
- /**
- * 1需结算0不需结算
- **/
- public void setTaskClass(String taskClass) {
- this.taskClass = taskClass;
- }
- /**
- * 是否发布到任务大厅0否1是
- **/
- public void setToTaskCenter(String toTaskCenter) {
- this.toTaskCenter = toTaskCenter;
- }
- /**
- * 实际开始时间
- **/
- public void setActStartTime(Date actStartTime) {
- this.actStartTime = actStartTime;
- }
- /**
- * 实际结束时间
- **/
- public void setActEndTime(Date actEndTime) {
- this.actEndTime = actEndTime;
- }
- /**
- * 当前流程实例编号
- **/
- public void setBizProcInstId(String bizProcInstId) {
- this.bizProcInstId = bizProcInstId;
- }
- /**
- * 当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除
- **/
- public void setBizFlowState(String bizFlowState) {
- this.bizFlowState = bizFlowState;
- }
- /**
- * 项目阶段编号(作废)
- **/
- public void setPhaseId(String phaseId) {
- this.phaseId = phaseId;
- }
- /**
- * 项目阶段名称(作废)
- **/
- public void setPhaseName(String phaseName) {
- this.phaseName = phaseName;
- }
- /**
- * 技能列表,逗号分隔
- **/
- public void setTaskSkillNames(String taskSkillNames) {
- this.taskSkillNames = taskSkillNames;
- }
- /**
- * 执行人列表逗号分隔如陈x(审核人),王x(监控人)
- **/
- public void setExeUsernames(String exeUsernames) {
- this.exeUsernames = exeUsernames;
- }
- /**
- * 技能编号列表逗号分隔
- **/
- public void setTaskSkillIds(String taskSkillIds) {
- this.taskSkillIds = taskSkillIds;
- }
- /**
- * 执行人编号列表逗号分隔如u1(1),u2(2)
- **/
- public void setExeUserids(String exeUserids) {
- this.exeUserids = exeUserids;
- }
- /**
- * 是否外购
- **/
- public void setTaskOut(String taskOut) {
- this.taskOut = taskOut;
- }
- /**
- * 计划类型w1-周,w2-2周,w3-3周,m1-1月,m2-2月,q1-季,q2-半年,y1-年
- **/
- public void setPlanType(String planType) {
- this.planType = planType;
- }
- /**
- * 任务结算方案-来自数字字典xmTaskSettleSchemel
- **/
- public void setSettleSchemel(String settleSchemel) {
- this.settleSchemel = settleSchemel;
- }
- /**
- * 归属功能编号
- **/
- public void setMenuId(String menuId) {
- this.menuId = menuId;
- }
- /**
- * 归属功能名称
- **/
- public void setMenuName(String menuName) {
- this.menuName = menuName;
- }
- /**
- * 产品编号根据功能变化带进
- **/
- public void setProductId(String productId) {
- this.productId = productId;
- }
- /**
- * 创建机构
- **/
- public void setCbranchId(String cbranchId) {
- this.cbranchId = cbranchId;
- }
- /**
- * 创建部门
- **/
- public void setCdeptid(String cdeptid) {
- this.cdeptid = cdeptid;
- }
- /**
- * 标签编号,逗号分割
- **/
- public void setTagIds(String tagIds) {
- this.tagIds = tagIds;
- }
- /**
- * 标签名称,逗号分割
- **/
- public void setTagNames(String tagNames) {
- this.tagNames = tagNames;
- }
- /**
- * 节点类型0-任务,1-计划。计划下可建立计划和任务,任务下不允许再扩展。也就是非叶子节点都是计划,叶子节点有可能是计划或者任务
- **/
- public void setNtype(String ntype) {
- this.ntype = ntype;
- }
- /**
- * 儿子节点个数
- **/
- public void setChildrenCnt(Integer childrenCnt) {
- this.childrenCnt = childrenCnt;
- }
- /**
- * 更新时间
- **/
- public void setLtime(Date ltime) {
- this.ltime = ltime;
- }
- /**
- * 父级id逗号分割,最后一个为本节点节点编号,以,号结尾
- **/
- public void setPidPaths(String pidPaths) {
- this.pidPaths = pidPaths;
- }
- /**
- * 层级0-顶级,1-一级,2-二级,3-三级,4-四级。总共5级
- **/
- public void setLvl(Integer lvl) {
- this.lvl = lvl;
- }
- /**
- * 是否为模板
- **/
- 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;
- }
- /**
- * 数据统计方式
- **/
- public void setCalcType(String calcType) {
- this.calcType = calcType;
- }
- /**
- * 计划分类0-项目,1产品,空为不区分
- **/
- public void setPtype(String 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;
- }
- /**
- * 原始预估工作量,budget_workload发生变化后,进行备份
- **/
- public void setInitWorkload(BigDecimal initWorkload) {
- this.initWorkload = initWorkload;
- }
- /**
- * 是否众包0-否1是-众包互联网上才能看见
- **/
- public void setCrowd(String crowd) {
- this.crowd = crowd;
- }
- /**
- * 分享赚佣金
- **/
- public void setShareFee(BigDecimal shareFee) {
- this.shareFee = shareFee;
- }
- /**
- * 开启分享赚功能0-否1是
- **/
- public void setOshare(String oshare) {
- this.oshare = oshare;
- }
-
- /**
- * 任务编号
- **/
- public String getId() {
- return this.id;
- }
- /**
- * 任务名称
- **/
- public String getName() {
- return this.name;
- }
- /**
- * 父任务编号
- **/
- public String getParentTaskid() {
- return this.parentTaskid;
- }
- /**
- * 父任务名称
- **/
- public String getParentTaskname() {
- return this.parentTaskname;
- }
- /**
- * 项目编号
- **/
- public String getProjectId() {
- return this.projectId;
- }
- /**
- * 项目名称
- **/
- public String getProjectName() {
- return this.projectName;
- }
- /**
- * 任务级别
- **/
- public String getLevel() {
- return this.level;
- }
- /**
- * 序号
- **/
- public String getSortLevel() {
- return this.sortLevel;
- }
- /**
- * 任务执行人编号
- **/
- public String getExecutorUserid() {
- return this.executorUserid;
- }
- /**
- * 任务执行人
- **/
- public String getExecutorUsername() {
- return this.executorUsername;
- }
- /**
- * 前置任务编号
- **/
- public String getPreTaskid() {
- return this.preTaskid;
- }
- /**
- * 前置任务名称
- **/
- public String getPreTaskname() {
- return this.preTaskname;
- }
- /**
- * 任务开始时间
- **/
- public Date getStartTime() {
- return this.startTime;
- }
- /**
- * 任务结束时间
- **/
- public Date getEndTime() {
- return this.endTime;
- }
- /**
- * 里程碑
- **/
- public String getMilestone() {
- return this.milestone;
- }
- /**
- * 任务描述
- **/
- public String getDescription() {
- return this.description;
- }
- /**
- * 备注
- **/
- public String getRemarks() {
- return this.remarks;
- }
- /**
- * 任务创建人编号(谁创建谁负责)
- **/
- public String getCreateUserid() {
- return this.createUserid;
- }
- /**
- * 任务创建人(谁创建谁负责)
- **/
- public String getCreateUsername() {
- return this.createUsername;
- }
- /**
- * 创建时间
- **/
- public Date getCreateTime() {
- return this.createTime;
- }
- /**
- * 任务进度0-100(=实际工时/(实际工时+剩余工时)*100)
- **/
- public Integer getRate() {
- return this.rate;
- }
- /**
- * 当前任务预算金额(calc_type=2时预算工时*单价,calc_type=1时下级汇总)
- **/
- public BigDecimal getBudgetAt() {
- return this.budgetAt;
- }
- /**
- * 预算工时(calc_type=2时手工填写,calc_type=1时下级汇总)
- **/
- public BigDecimal getBudgetWorkload() {
- return this.budgetWorkload;
- }
- /**
- * 当前任务实际费用金额(calc_type=2时,取实际工时*单价,calc_type=1时取下级汇总数据)待结算金额
- **/
- public BigDecimal getActAt() {
- return this.actAt;
- }
- /**
- * 任务取工时表报工工时汇总,
- **/
- public BigDecimal getActWorkload() {
- return this.actWorkload;
- }
- /**
- * 任务状态0待领取1已领取执行中2已完工3已结算
- **/
- public String getTaskState() {
- return this.taskState;
- }
- /**
- * 0售前方案1投标2需求3设计4开发5测试6验收7部署8运维--来自基础数据表taskType
- **/
- public String getTaskType() {
- return this.taskType;
- }
- /**
- * 1需结算0不需结算
- **/
- public String getTaskClass() {
- return this.taskClass;
- }
- /**
- * 是否发布到任务大厅0否1是
- **/
- public String getToTaskCenter() {
- return this.toTaskCenter;
- }
- /**
- * 实际开始时间
- **/
- public Date getActStartTime() {
- return this.actStartTime;
- }
- /**
- * 实际结束时间
- **/
- public Date getActEndTime() {
- return this.actEndTime;
- }
- /**
- * 当前流程实例编号
- **/
- public String getBizProcInstId() {
- return this.bizProcInstId;
- }
- /**
- * 当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除
- **/
- public String getBizFlowState() {
- return this.bizFlowState;
- }
- /**
- * 项目阶段编号(作废)
- **/
- public String getPhaseId() {
- return this.phaseId;
- }
- /**
- * 项目阶段名称(作废)
- **/
- public String getPhaseName() {
- return this.phaseName;
- }
- /**
- * 技能列表,逗号分隔
- **/
- public String getTaskSkillNames() {
- return this.taskSkillNames;
- }
- /**
- * 执行人列表逗号分隔如陈x(审核人),王x(监控人)
- **/
- public String getExeUsernames() {
- return this.exeUsernames;
- }
- /**
- * 技能编号列表逗号分隔
- **/
- public String getTaskSkillIds() {
- return this.taskSkillIds;
- }
- /**
- * 执行人编号列表逗号分隔如u1(1),u2(2)
- **/
- public String getExeUserids() {
- return this.exeUserids;
- }
- /**
- * 是否外购
- **/
- public String getTaskOut() {
- return this.taskOut;
- }
- /**
- * 计划类型w1-周,w2-2周,w3-3周,m1-1月,m2-2月,q1-季,q2-半年,y1-年
- **/
- public String getPlanType() {
- return this.planType;
- }
- /**
- * 任务结算方案-来自数字字典xmTaskSettleSchemel
- **/
- public String getSettleSchemel() {
- return this.settleSchemel;
- }
- /**
- * 归属功能编号
- **/
- public String getMenuId() {
- return this.menuId;
- }
- /**
- * 归属功能名称
- **/
- public String getMenuName() {
- return this.menuName;
- }
- /**
- * 产品编号根据功能变化带进
- **/
- public String getProductId() {
- return this.productId;
- }
- /**
- * 创建机构
- **/
- public String getCbranchId() {
- return this.cbranchId;
- }
- /**
- * 创建部门
- **/
- public String getCdeptid() {
- return this.cdeptid;
- }
- /**
- * 标签编号,逗号分割
- **/
- public String getTagIds() {
- return this.tagIds;
- }
- /**
- * 标签名称,逗号分割
- **/
- public String getTagNames() {
- return this.tagNames;
- }
- /**
- * 节点类型0-任务,1-计划。计划下可建立计划和任务,任务下不允许再扩展。也就是非叶子节点都是计划,叶子节点有可能是计划或者任务
- **/
- public String getNtype() {
- return this.ntype;
- }
- /**
- * 儿子节点个数
- **/
- public Integer getChildrenCnt() {
- return this.childrenCnt;
- }
- /**
- * 更新时间
- **/
- public Date getLtime() {
- return this.ltime;
- }
- /**
- * 父级id逗号分割,最后一个为本节点节点编号,以,号结尾
- **/
- public String getPidPaths() {
- return this.pidPaths;
- }
- /**
- * 层级0-顶级,1-一级,2-二级,3-三级,4-四级。总共5级
- **/
- public Integer getLvl() {
- return this.lvl;
- }
- /**
- * 是否为模板
- **/
- public String getIsTpl() {
- return this.isTpl;
- }
- /**
- * 是否为关键路径上的节点
- **/
- public String getKeyPath() {
- return this.keyPath;
- }
- /**
- * 内部单位工时单价
- **/
- public BigDecimal getUniInnerPrice() {
- return this.uniInnerPrice;
- }
- /**
- * 外部单位工时单价
- **/
- public BigDecimal getUniOutPrice() {
- return this.uniOutPrice;
- }
- /**
- * 数据统计方式
- **/
- public String getCalcType() {
- return this.calcType;
- }
- /**
- * 计划分类0-项目,1产品,空为不区分
- **/
- public String getPtype() {
- return this.ptype;
- }
- /**
- * 报工方式1-强制每日报工,2-工期内报工,0-无需报工
- **/
- public String getWtype() {
- return this.wtype;
- }
- /**
- * 报工限制0-不限制,1-不得超出预估工时
- **/
- public String getBctrl() {
- return this.bctrl;
- }
- /**
- * 原始预估工作量,budget_workload发生变化后,进行备份
- **/
- public BigDecimal getInitWorkload() {
- return this.initWorkload;
- }
- /**
- * 是否众包0-否1是-众包互联网上才能看见
- **/
- public String getCrowd() {
- return this.crowd;
- }
- /**
- * 分享赚佣金
- **/
- public BigDecimal getShareFee() {
- return this.shareFee;
- }
- /**
- * 开启分享赚功能0-否1是
- **/
- public String getOshare() {
- return this.oshare;
- }
}
\ 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 2900d2e0..bf9140b1 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
@@ -461,7 +461,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},#{budgetAt},#{budgetWorkload},#{actAt},#{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},#{initWorkload},#{crowd},#{shareFee},#{oshare}
+ #{id},#{name},#{parentTaskid},#{parentTaskname},#{projectId},#{projectName},#{level},#{sortLevel},#{executorUserid},#{executorUsername},#{preTaskid},#{preTaskname},#{startTime},#{endTime},#{milestone},#{description},#{remarks},#{createUserid},#{createUsername},#{createTime},#{rate},#{budgetAt},#{budgetWorkload},#{actAt},#{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},#{initWorkload},#{shareFee},#{oshare},#{crowd}
)
@@ -512,6 +512,17 @@
+
+
+ update xm_task
+
+
+
+ where (id) in
+
+ ( #{item})
+
+
delete from xm_task
@@ -525,7 +536,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_at,budget_workload,act_at,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,init_workload,crowd,share_fee,oshare
+ 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_at,budget_workload,act_at,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,init_workload,share_fee,oshare,crowd
@@ -593,9 +604,9 @@
and res.wtype = #{wtype}
and res.bctrl = #{bctrl}
and res.init_workload = #{initWorkload}
- and res.crowd = #{crowd}
and res.share_fee = #{shareFee}
and res.oshare = #{oshare}
+ and res.crowd = #{crowd}
@@ -661,9 +672,9 @@
wtype = #{wtype},
bctrl = #{bctrl},
init_workload = #{initWorkload},
- crowd = #{crowd},
share_fee = #{shareFee},
- oshare = #{oshare}
+ oshare = #{oshare},
+ crowd = #{crowd}
name = #{name},
@@ -728,9 +739,9 @@
wtype = #{wtype},
bctrl = #{bctrl},
init_workload = #{initWorkload},
- crowd = #{crowd},
share_fee = #{shareFee},
oshare = #{oshare},
+ crowd = #{crowd},
@@ -796,8 +807,8 @@
wtype = #{item.wtype},
bctrl = #{item.bctrl},
init_workload = #{item.initWorkload},
- crowd = #{item.crowd},
share_fee = #{item.shareFee},
- oshare = #{item.oshare}
+ oshare = #{item.oshare},
+ crowd = #{item.crowd}
\ No newline at end of file