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 765522da..4c0e576c 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmTask.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmTask.java
@@ -8,9 +8,9 @@ import java.math.BigDecimal;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmTask所有属性名:
- * id,name,parentTaskid,parentTaskname,projectId,projectName,level,sortLevel,executorUserid,executorUsername,preTaskid,preTaskname,startTime,endTime,milestone,description,remarks,createUserid,createUsername,createTime,rate,budgetCost,budgetWorkload,actCost,actWorkload,taskState,taskType,taskClass,toTaskCenter,actStartTime,actEndTime,bizProcInstId,bizFlowState,phaseId,phaseName,taskSkillNames,exeUsernames,taskSkillIds,exeUserids,taskOut,planType,settleSchemel,menuId,menuName,productId,cbranchId,cdeptid,tagIds,tagNames,ntype,childrenCnt,ltime,pidPaths,lvl,isTpl,keyPath,uniInnerPrice,uniOutPrice,calcType,ptype,wtype,bctrl,initWorkload;
+ * 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;
* 表 xm_task xm_task的所有字段名:
- * id,name,parent_taskid,parent_taskname,project_id,project_name,level,sort_level,executor_userid,executor_username,pre_taskid,pre_taskname,start_time,end_time,milestone,description,remarks,create_userid,create_username,create_time,rate,budget_cost,budget_workload,act_cost,act_workload,task_state,task_type,task_class,to_task_center,act_start_time,act_end_time,biz_proc_inst_id,biz_flow_state,phase_id,phase_name,task_skill_names,exe_usernames,task_skill_ids,exe_userids,task_out,plan_type,settle_schemel,menu_id,menu_name,product_id,cbranch_id,cdeptid,tag_ids,tag_names,ntype,children_cnt,ltime,pid_paths,lvl,is_tpl,key_path,uni_inner_price,uni_out_price,calc_type,ptype,wtype,bctrl,init_workload;
+ * 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;
* 当前主键(包括多主键):
* id;
*/
@@ -84,13 +84,13 @@ public class XmTask implements java.io.Serializable {
Integer rate;
@ApiModelProperty(notes="当前任务预算金额（calc_type=2时预算工时*单价，calc_type=1时下级汇总）",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal budgetCost;
+ BigDecimal budgetAt;
@ApiModelProperty(notes="预算工时（calc_type=2时手工填写，calc_type=1时下级汇总）",allowEmptyValue=true,example="",allowableValues="")
BigDecimal budgetWorkload;
@ApiModelProperty(notes="当前任务实际费用金额（calc_type=2时，取实际工时*单价，calc_type=1时取下级汇总数据）待结算金额",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal actCost;
+ BigDecimal actAt;
@ApiModelProperty(notes="任务取工时表报工工时汇总，",allowEmptyValue=true,example="",allowableValues="")
BigDecimal actWorkload;
@@ -347,8 +347,8 @@ public class XmTask implements java.io.Serializable {
/**
* 当前任务预算金额（calc_type=2时预算工时*单价，calc_type=1时下级汇总）
**/
- public void setBudgetCost(BigDecimal budgetCost) {
- this.budgetCost = budgetCost;
+ public void setBudgetAt(BigDecimal budgetAt) {
+ this.budgetAt = budgetAt;
}
/**
* 预算工时（calc_type=2时手工填写，calc_type=1时下级汇总）
@@ -359,8 +359,8 @@ public class XmTask implements java.io.Serializable {
/**
* 当前任务实际费用金额（calc_type=2时，取实际工时*单价，calc_type=1时取下级汇总数据）待结算金额
**/
- public void setActCost(BigDecimal actCost) {
- this.actCost = actCost;
+ public void setActAt(BigDecimal actAt) {
+ this.actAt = actAt;
}
/**
* 任务取工时表报工工时汇总，
@@ -726,8 +726,8 @@ public class XmTask implements java.io.Serializable {
/**
* 当前任务预算金额（calc_type=2时预算工时*单价，calc_type=1时下级汇总）
**/
- public BigDecimal getBudgetCost() {
- return this.budgetCost;
+ public BigDecimal getBudgetAt() {
+ return this.budgetAt;
}
/**
* 预算工时（calc_type=2时手工填写，calc_type=1时下级汇总）
@@ -738,8 +738,8 @@ public class XmTask implements java.io.Serializable {
/**
* 当前任务实际费用金额（calc_type=2时，取实际工时*单价，calc_type=1时取下级汇总数据）待结算金额
**/
- public BigDecimal getActCost() {
- return this.actCost;
+ public BigDecimal getActAt() {
+ return this.actAt;
}
/**
* 任务取工时表报工工时汇总，
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 0c603a2b..945bc993 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
@@ -504,7 +504,7 @@
insert into xm_task(
) values (
- #{id},#{name},#{parentTaskid},#{parentTaskname},#{projectId},#{projectName},#{level},#{sortLevel},#{executorUserid},#{executorUsername},#{preTaskid},#{preTaskname},#{startTime},#{endTime},#{milestone},#{description},#{remarks},#{createUserid},#{createUsername},#{createTime},#{rate},#{budgetCost},#{budgetWorkload},#{actCost},#{actWorkload},#{taskState},#{taskType},#{taskClass},#{toTaskCenter},#{actStartTime},#{actEndTime},#{bizProcInstId},#{bizFlowState},#{phaseId},#{phaseName},#{taskSkillNames},#{exeUsernames},#{taskSkillIds},#{exeUserids},#{taskOut},#{planType},#{settleSchemel},#{menuId},#{menuName},#{productId},#{cbranchId},#{cdeptid},#{tagIds},#{tagNames},#{ntype},#{childrenCnt},#{ltime},#{pidPaths},#{lvl},#{isTpl},#{keyPath},#{uniInnerPrice},#{uniOutPrice},#{calcType},#{ptype},#{wtype},#{bctrl},#{initWorkload}
+ #{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}
)
@@ -567,7 +567,7 @@
- id,name,parent_taskid,parent_taskname,project_id,project_name,level,sort_level,executor_userid,executor_username,pre_taskid,pre_taskname,start_time,end_time,milestone,description,remarks,create_userid,create_username,create_time,rate,budget_cost,budget_workload,act_cost,act_workload,task_state,task_type,task_class,to_task_center,act_start_time,act_end_time,biz_proc_inst_id,biz_flow_state,phase_id,phase_name,task_skill_names,exe_usernames,task_skill_ids,exe_userids,task_out,plan_type,settle_schemel,menu_id,menu_name,product_id,cbranch_id,cdeptid,tag_ids,tag_names,ntype,children_cnt,ltime,pid_paths,lvl,is_tpl,key_path,uni_inner_price,uni_out_price,calc_type,ptype,wtype,bctrl,init_workload
+ 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
@@ -593,9 +593,9 @@
and res.create_username = #{createUsername}
and date_format(res.create_time,'%Y-%m-%d') = date_format(#{createTime},'%Y-%m-%d')
and res.rate = #{rate}
- and res.budget_cost = #{budgetCost}
+ and res.budget_at = #{budgetAt}
and res.budget_workload = #{budgetWorkload}
- and res.act_cost = #{actCost}
+ and res.act_at = #{actAt}
and res.act_workload = #{actWorkload}
and res.task_state = #{taskState}
and res.task_type = #{taskType}
@@ -658,9 +658,9 @@
create_username = #{createUsername},
create_time = #{createTime},
rate = #{rate},
- budget_cost = #{budgetCost},
+ budget_at = #{budgetAt},
budget_workload = #{budgetWorkload},
- act_cost = #{actCost},
+ act_at = #{actAt},
act_workload = #{actWorkload},
task_state = #{taskState},
task_type = #{taskType},
@@ -722,9 +722,9 @@
create_username = #{createUsername},
create_time = #{createTime},
rate = #{rate},
- budget_cost = #{budgetCost},
+ budget_at = #{budgetAt},
budget_workload = #{budgetWorkload},
- act_cost = #{actCost},
+ act_at = #{actAt},
act_workload = #{actWorkload},
task_state = #{taskState},
task_type = #{taskType},
@@ -787,9 +787,9 @@
create_username = #{item.createUsername},
create_time = #{item.createTime},
rate = #{item.rate},
- budget_cost = #{item.budgetCost},
+ budget_at = #{item.budgetAt},
budget_workload = #{item.budgetWorkload},
- act_cost = #{item.actCost},
+ act_at = #{item.actAt},
act_workload = #{item.actWorkload},
task_state = #{item.taskState},
task_type = #{item.taskType},