diff --git a/xm-core/src/main/java/com/xm/core/entity/XmQuestion.java b/xm-core/src/main/java/com/xm/core/entity/XmQuestion.java
index fbafe85a..904ec7ba 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmQuestion.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmQuestion.java
@@ -8,9 +8,9 @@ import java.math.BigDecimal;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmQuestion所有属性名:
- * id,name,projectId,projectName,caseId,caseName,endTime,askUserid,askUsername,handlerUserid,handlerUsername,priority,solution,description,createUserid,createUsername,createTime,bugStatus,bizProcInstId,bizFlowState,menuId,menuName,planWorkload,planCostAmount,totalActWorkload,totalActCostAmount,expectResult,opStep,currResult,refRequire,bugSeverity,bugType,tagIds,tagNames,urls,ltime,qtype,taskId,taskName,iterationId,iterationName,caseExecId,lremark,productId,repRate,verNum,vpath,pverNum;
+ * id,name,projectId,projectName,caseId,caseName,endTime,askUserid,askUsername,handlerUserid,handlerUsername,priority,solution,description,createUserid,createUsername,createTime,bugStatus,bizProcInstId,bizFlowState,menuId,menuName,budgetWorkload,budgetCost,actWorkload,actCost,expectResult,opStep,currResult,refRequire,bugSeverity,bugType,tagIds,tagNames,urls,ltime,qtype,iterationId,iterationName,caseExecId,remarks,productId,repRate,verNum,vpath,pverNum,bugReason,rate;
* 表 xm_question xm_question的所有字段名:
- * id,name,project_id,project_name,case_id,case_name,end_time,ask_userid,ask_username,handler_userid,handler_username,priority,solution,description,create_userid,create_username,create_time,bug_status,biz_proc_inst_id,biz_flow_state,menu_id,menu_name,plan_workload,plan_cost_amount,total_act_workload,total_act_cost_amount,expect_result,op_step,curr_result,ref_require,bug_severity,bug_type,tag_ids,tag_names,urls,ltime,qtype,task_id,task_name,iteration_id,iteration_name,case_exec_id,lremark,product_id,rep_rate,ver_num,vpath,pver_num;
+ * id,name,project_id,project_name,case_id,case_name,end_time,ask_userid,ask_username,handler_userid,handler_username,priority,solution,description,create_userid,create_username,create_time,bug_status,biz_proc_inst_id,biz_flow_state,menu_id,menu_name,budget_workload,budget_cost,act_workload,act_cost,expect_result,op_step,curr_result,ref_require,bug_severity,bug_type,tag_ids,tag_names,urls,ltime,qtype,iteration_id,iteration_name,case_exec_id,remarks,product_id,rep_rate,ver_num,vpath,pver_num,bug_reason,rate;
* 当前主键(包括多主键):
* id;
*/
@@ -87,16 +87,16 @@ public class XmQuestion implements java.io.Serializable {
String menuName;
@ApiModelProperty(notes="预估工时单位人时",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal planWorkload;
+ BigDecimal budgetWorkload;
@ApiModelProperty(notes="预估成本金额",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal planCostAmount;
+ BigDecimal budgetCost;
@ApiModelProperty(notes="实际工时",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal totalActWorkload;
+ BigDecimal actWorkload;
@ApiModelProperty(notes="实际总金额",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal totalActCostAmount;
+ BigDecimal actCost;
@ApiModelProperty(notes="期望结果",allowEmptyValue=true,example="",allowableValues="")
String expectResult;
@@ -131,12 +131,6 @@ public class XmQuestion implements java.io.Serializable {
@ApiModelProperty(notes="问题类型risk-风险、bug-功能问题、consult-普通咨询、",allowEmptyValue=true,example="",allowableValues="")
String qtype;
- @ApiModelProperty(notes="测试任务编号关联taskType='test'的任务",allowEmptyValue=true,example="",allowableValues="")
- String taskId;
-
- @ApiModelProperty(notes="测试任务名称",allowEmptyValue=true,example="",allowableValues="")
- String taskName;
-
@ApiModelProperty(notes="迭代编号",allowEmptyValue=true,example="",allowableValues="")
String iterationId;
@@ -147,7 +141,7 @@ public class XmQuestion implements java.io.Serializable {
String caseExecId;
@ApiModelProperty(notes="最后更新说明",allowEmptyValue=true,example="",allowableValues="")
- String lremark;
+ String remarks;
@ApiModelProperty(notes="产品编号",allowEmptyValue=true,example="",allowableValues="")
String productId;
@@ -163,6 +157,12 @@ public class XmQuestion implements java.io.Serializable {
@ApiModelProperty(notes="发布版本",allowEmptyValue=true,example="",allowableValues="")
String pverNum;
+
+ @ApiModelProperty(notes="原因分析",allowEmptyValue=true,example="",allowableValues="")
+ String bugReason;
+
+ @ApiModelProperty(notes="进度0-100",allowEmptyValue=true,example="",allowableValues="")
+ Integer rate;
/**问题编号**/
public XmQuestion(String id) {
@@ -308,26 +308,26 @@ public class XmQuestion implements java.io.Serializable {
/**
* 预估工时单位人时
**/
- public void setPlanWorkload(BigDecimal planWorkload) {
- this.planWorkload = planWorkload;
+ public void setBudgetWorkload(BigDecimal budgetWorkload) {
+ this.budgetWorkload = budgetWorkload;
}
/**
* 预估成本金额
**/
- public void setPlanCostAmount(BigDecimal planCostAmount) {
- this.planCostAmount = planCostAmount;
+ public void setBudgetCost(BigDecimal budgetCost) {
+ this.budgetCost = budgetCost;
}
/**
* 实际工时
**/
- public void setTotalActWorkload(BigDecimal totalActWorkload) {
- this.totalActWorkload = totalActWorkload;
+ public void setActWorkload(BigDecimal actWorkload) {
+ this.actWorkload = actWorkload;
}
/**
* 实际总金额
**/
- public void setTotalActCostAmount(BigDecimal totalActCostAmount) {
- this.totalActCostAmount = totalActCostAmount;
+ public void setActCost(BigDecimal actCost) {
+ this.actCost = actCost;
}
/**
* 期望结果
@@ -395,18 +395,6 @@ public class XmQuestion implements java.io.Serializable {
public void setQtype(String qtype) {
this.qtype = qtype;
}
- /**
- * 测试任务编号关联taskType='test'的任务
- **/
- public void setTaskId(String taskId) {
- this.taskId = taskId;
- }
- /**
- * 测试任务名称
- **/
- public void setTaskName(String taskName) {
- this.taskName = taskName;
- }
/**
* 迭代编号
**/
@@ -428,8 +416,8 @@ public class XmQuestion implements java.io.Serializable {
/**
* 最后更新说明
**/
- public void setLremark(String lremark) {
- this.lremark = lremark;
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
}
/**
* 产品编号
@@ -461,6 +449,18 @@ public class XmQuestion implements java.io.Serializable {
public void setPverNum(String pverNum) {
this.pverNum = pverNum;
}
+ /**
+ * 原因分析
+ **/
+ public void setBugReason(String bugReason) {
+ this.bugReason = bugReason;
+ }
+ /**
+ * 进度0-100
+ **/
+ public void setRate(Integer rate) {
+ this.rate = rate;
+ }
/**
* 问题编号
@@ -597,26 +597,26 @@ public class XmQuestion implements java.io.Serializable {
/**
* 预估工时单位人时
**/
- public BigDecimal getPlanWorkload() {
- return this.planWorkload;
+ public BigDecimal getBudgetWorkload() {
+ return this.budgetWorkload;
}
/**
* 预估成本金额
**/
- public BigDecimal getPlanCostAmount() {
- return this.planCostAmount;
+ public BigDecimal getBudgetCost() {
+ return this.budgetCost;
}
/**
* 实际工时
**/
- public BigDecimal getTotalActWorkload() {
- return this.totalActWorkload;
+ public BigDecimal getActWorkload() {
+ return this.actWorkload;
}
/**
* 实际总金额
**/
- public BigDecimal getTotalActCostAmount() {
- return this.totalActCostAmount;
+ public BigDecimal getActCost() {
+ return this.actCost;
}
/**
* 期望结果
@@ -684,18 +684,6 @@ public class XmQuestion implements java.io.Serializable {
public String getQtype() {
return this.qtype;
}
- /**
- * 测试任务编号关联taskType='test'的任务
- **/
- public String getTaskId() {
- return this.taskId;
- }
- /**
- * 测试任务名称
- **/
- public String getTaskName() {
- return this.taskName;
- }
/**
* 迭代编号
**/
@@ -717,8 +705,8 @@ public class XmQuestion implements java.io.Serializable {
/**
* 最后更新说明
**/
- public String getLremark() {
- return this.lremark;
+ public String getRemarks() {
+ return this.remarks;
}
/**
* 产品编号
@@ -750,5 +738,17 @@ public class XmQuestion implements java.io.Serializable {
public String getPverNum() {
return this.pverNum;
}
+ /**
+ * 原因分析
+ **/
+ public String getBugReason() {
+ return this.bugReason;
+ }
+ /**
+ * 进度0-100
+ **/
+ public Integer getRate() {
+ return this.rate;
+ }
}
\ 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 ea1c5d7d..3b77acfb 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,productName,cbranchId,cdeptid,tagIds,tagNames,ntype,childrenCnt,ltime,pidPaths,lvl,isTpl,keyPath,uniInnerPrice,uniOutPrice,calcType,ptype,wtype,bctrl;
+ * id,name,parentTaskid,parentTaskname,projectId,projectName,level,sortLevel,executorUserid,executorUsername,preTaskid,preTaskname,startTime,endTime,milestone,description,remarks,createUserid,createUsername,createTime,rate,budgetCost,budgetWorkload,actCost,actWorkload,taskState,taskType,taskClass,toTaskCenter,actStartTime,actEndTime,bizProcInstId,bizFlowState,phaseId,phaseName,taskSkillNames,exeUsernames,taskSkillIds,exeUserids,taskOut,planType,settleSchemel,menuId,menuName,productId,cbranchId,cdeptid,tagIds,tagNames,ntype,childrenCnt,ltime,pidPaths,lvl,isTpl,keyPath,uniInnerPrice,uniOutPrice,calcType,ptype,wtype,bctrl;
* 表 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,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;
+ * id,name,parent_taskid,parent_taskname,project_id,project_name,level,sort_level,executor_userid,executor_username,pre_taskid,pre_taskname,start_time,end_time,milestone,description,remarks,create_userid,create_username,create_time,rate,budget_cost,budget_workload,act_cost,act_workload,task_state,task_type,task_class,to_task_center,act_start_time,act_end_time,biz_proc_inst_id,biz_flow_state,phase_id,phase_name,task_skill_names,exe_usernames,task_skill_ids,exe_userids,task_out,plan_type,settle_schemel,menu_id,menu_name,product_id,cbranch_id,cdeptid,tag_ids,tag_names,ntype,children_cnt,ltime,pid_paths,lvl,is_tpl,key_path,uni_inner_price,uni_out_price,calc_type,ptype,wtype,bctrl;
* 当前主键(包括多主键):
* id;
*/
@@ -41,7 +41,7 @@ public class XmTask implements java.io.Serializable {
@ApiModelProperty(notes="任务级别",allowEmptyValue=true,example="",allowableValues="")
String level;
- @ApiModelProperty(notes="排序级别",allowEmptyValue=true,example="",allowableValues="")
+ @ApiModelProperty(notes="序号",allowEmptyValue=true,example="",allowableValues="")
String sortLevel;
@ApiModelProperty(notes="任务执行人编号",allowEmptyValue=true,example="",allowableValues="")
@@ -81,7 +81,7 @@ public class XmTask implements java.io.Serializable {
Date createTime;
@ApiModelProperty(notes="任务进度0-100（=实际工时/预算工时*100）",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal rate;
+ Integer rate;
@ApiModelProperty(notes="当前任务预算金额（calc_type=2时预算工时*单价，calc_type=1时下级汇总）",allowEmptyValue=true,example="",allowableValues="")
BigDecimal budgetCost;
@@ -155,9 +155,6 @@ public class XmTask implements java.io.Serializable {
@ApiModelProperty(notes="产品编号根据功能变化带进",allowEmptyValue=true,example="",allowableValues="")
String productId;
- @ApiModelProperty(notes="产品名称(作废)",allowEmptyValue=true,example="",allowableValues="")
- String productName;
-
@ApiModelProperty(notes="创建机构",allowEmptyValue=true,example="",allowableValues="")
String cbranchId;
@@ -261,7 +258,7 @@ public class XmTask implements java.io.Serializable {
this.level = level;
}
/**
- * 排序级别
+ * 序号
**/
public void setSortLevel(String sortLevel) {
this.sortLevel = sortLevel;
@@ -341,7 +338,7 @@ public class XmTask implements java.io.Serializable {
/**
* 任务进度0-100（=实际工时/预算工时*100）
**/
- public void setRate(BigDecimal rate) {
+ public void setRate(Integer rate) {
this.rate = rate;
}
/**
@@ -488,12 +485,6 @@ public class XmTask implements java.io.Serializable {
public void setProductId(String productId) {
this.productId = productId;
}
- /**
- * 产品名称(作废)
- **/
- public void setProductName(String productName) {
- this.productName = productName;
- }
/**
* 创建机构
**/
@@ -640,7 +631,7 @@ public class XmTask implements java.io.Serializable {
return this.level;
}
/**
- * 排序级别
+ * 序号
**/
public String getSortLevel() {
return this.sortLevel;
@@ -720,7 +711,7 @@ public class XmTask implements java.io.Serializable {
/**
* 任务进度0-100（=实际工时/预算工时*100）
**/
- public BigDecimal getRate() {
+ public Integer getRate() {
return this.rate;
}
/**
@@ -867,12 +858,6 @@ public class XmTask implements java.io.Serializable {
public String getProductId() {
return this.productId;
}
- /**
- * 产品名称(作废)
- **/
- public String getProductName() {
- return this.productName;
- }
/**
* 创建机构
**/
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml
index 7b64e17b..f92ffbfa 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml
@@ -138,7 +138,7 @@
insert into xm_question(
) values (
- #{id},#{name},#{projectId},#{projectName},#{caseId},#{caseName},#{endTime},#{askUserid},#{askUsername},#{handlerUserid},#{handlerUsername},#{priority},#{solution},#{description},#{createUserid},#{createUsername},#{createTime},#{bugStatus},#{bizProcInstId},#{bizFlowState},#{menuId},#{menuName},#{planWorkload},#{planCostAmount},#{totalActWorkload},#{totalActCostAmount},#{expectResult},#{opStep},#{currResult},#{refRequire},#{bugSeverity},#{bugType},#{tagIds},#{tagNames},#{urls},#{ltime},#{qtype},#{taskId},#{taskName},#{iterationId},#{iterationName},#{caseExecId},#{lremark},#{productId},#{repRate},#{verNum},#{vpath},#{pverNum}
+ #{id},#{name},#{projectId},#{projectName},#{caseId},#{caseName},#{endTime},#{askUserid},#{askUsername},#{handlerUserid},#{handlerUsername},#{priority},#{solution},#{description},#{createUserid},#{createUsername},#{createTime},#{bugStatus},#{bizProcInstId},#{bizFlowState},#{menuId},#{menuName},#{budgetWorkload},#{budgetCost},#{actWorkload},#{actCost},#{expectResult},#{opStep},#{currResult},#{refRequire},#{bugSeverity},#{bugType},#{tagIds},#{tagNames},#{urls},#{ltime},#{qtype},#{iterationId},#{iterationName},#{caseExecId},#{remarks},#{productId},#{repRate},#{verNum},#{vpath},#{pverNum},#{bugReason},#{rate}
)
@@ -201,7 +201,7 @@
- id,name,project_id,project_name,case_id,case_name,end_time,ask_userid,ask_username,handler_userid,handler_username,priority,solution,description,create_userid,create_username,create_time,bug_status,biz_proc_inst_id,biz_flow_state,menu_id,menu_name,plan_workload,plan_cost_amount,total_act_workload,total_act_cost_amount,expect_result,op_step,curr_result,ref_require,bug_severity,bug_type,tag_ids,tag_names,urls,ltime,qtype,task_id,task_name,iteration_id,iteration_name,case_exec_id,lremark,product_id,rep_rate,ver_num,vpath,pver_num
+ id,name,project_id,project_name,case_id,case_name,end_time,ask_userid,ask_username,handler_userid,handler_username,priority,solution,description,create_userid,create_username,create_time,bug_status,biz_proc_inst_id,biz_flow_state,menu_id,menu_name,budget_workload,budget_cost,act_workload,act_cost,expect_result,op_step,curr_result,ref_require,bug_severity,bug_type,tag_ids,tag_names,urls,ltime,qtype,iteration_id,iteration_name,case_exec_id,remarks,product_id,rep_rate,ver_num,vpath,pver_num,bug_reason,rate
@@ -228,10 +228,10 @@
and res.biz_flow_state = #{bizFlowState}
and res.menu_id = #{menuId}
and res.menu_name = #{menuName}
- and res.plan_workload = #{planWorkload}
- and res.plan_cost_amount = #{planCostAmount}
- and res.total_act_workload = #{totalActWorkload}
- and res.total_act_cost_amount = #{totalActCostAmount}
+ and res.budget_workload = #{budgetWorkload}
+ and res.budget_cost = #{budgetCost}
+ and res.act_workload = #{actWorkload}
+ and res.act_cost = #{actCost}
and res.expect_result = #{expectResult}
and res.op_step = #{opStep}
and res.curr_result = #{currResult}
@@ -243,17 +243,17 @@
and res.urls = #{urls}
and date_format(res.ltime,'%Y-%m-%d') = date_format(#{ltime},'%Y-%m-%d')
and res.qtype = #{qtype}
- and res.task_id = #{taskId}
- and res.task_name = #{taskName}
and res.iteration_id = #{iterationId}
and res.iteration_name = #{iterationName}
and res.case_exec_id = #{caseExecId}
- and res.lremark = #{lremark}
+ and res.remarks = #{remarks}
and res.product_id = #{productId}
and res.rep_rate = #{repRate}
and res.ver_num = #{verNum}
and res.vpath = #{vpath}
and res.pver_num = #{pverNum}
+ and res.bug_reason = #{bugReason}
+ and res.rate = #{rate}
@@ -278,10 +278,10 @@
biz_flow_state = #{bizFlowState},
menu_id = #{menuId},
menu_name = #{menuName},
- plan_workload = #{planWorkload},
- plan_cost_amount = #{planCostAmount},
- total_act_workload = #{totalActWorkload},
- total_act_cost_amount = #{totalActCostAmount},
+ budget_workload = #{budgetWorkload},
+ budget_cost = #{budgetCost},
+ act_workload = #{actWorkload},
+ act_cost = #{actCost},
expect_result = #{expectResult},
op_step = #{opStep},
curr_result = #{currResult},
@@ -293,17 +293,17 @@
urls = #{urls},
ltime = #{ltime},
qtype = #{qtype},
- task_id = #{taskId},
- task_name = #{taskName},
iteration_id = #{iterationId},
iteration_name = #{iterationName},
case_exec_id = #{caseExecId},
- lremark = #{lremark},
+ remarks = #{remarks},
product_id = #{productId},
rep_rate = #{repRate},
ver_num = #{verNum},
vpath = #{vpath},
- pver_num = #{pverNum}
+ pver_num = #{pverNum},
+ bug_reason = #{bugReason},
+ rate = #{rate}
name = #{name},
@@ -327,10 +327,10 @@
biz_flow_state = #{bizFlowState},
menu_id = #{menuId},
menu_name = #{menuName},
- plan_workload = #{planWorkload},
- plan_cost_amount = #{planCostAmount},
- total_act_workload = #{totalActWorkload},
- total_act_cost_amount = #{totalActCostAmount},
+ budget_workload = #{budgetWorkload},
+ budget_cost = #{budgetCost},
+ act_workload = #{actWorkload},
+ act_cost = #{actCost},
expect_result = #{expectResult},
op_step = #{opStep},
curr_result = #{currResult},
@@ -342,17 +342,17 @@
urls = #{urls},
ltime = #{ltime},
qtype = #{qtype},
- task_id = #{taskId},
- task_name = #{taskName},
iteration_id = #{iterationId},
iteration_name = #{iterationName},
case_exec_id = #{caseExecId},
- lremark = #{lremark},
+ remarks = #{remarks},
product_id = #{productId},
rep_rate = #{repRate},
ver_num = #{verNum},
vpath = #{vpath},
pver_num = #{pverNum},
+ bug_reason = #{bugReason},
+ rate = #{rate},
@@ -377,10 +377,10 @@
biz_flow_state = #{item.bizFlowState},
menu_id = #{item.menuId},
menu_name = #{item.menuName},
- plan_workload = #{item.planWorkload},
- plan_cost_amount = #{item.planCostAmount},
- total_act_workload = #{item.totalActWorkload},
- total_act_cost_amount = #{item.totalActCostAmount},
+ budget_workload = #{item.budgetWorkload},
+ budget_cost = #{item.budgetCost},
+ act_workload = #{item.actWorkload},
+ act_cost = #{item.actCost},
expect_result = #{item.expectResult},
op_step = #{item.opStep},
curr_result = #{item.currResult},
@@ -392,16 +392,16 @@
urls = #{item.urls},
ltime = #{item.ltime},
qtype = #{item.qtype},
- task_id = #{item.taskId},
- task_name = #{item.taskName},
iteration_id = #{item.iterationId},
iteration_name = #{item.iterationName},
case_exec_id = #{item.caseExecId},
- lremark = #{item.lremark},
+ remarks = #{item.remarks},
product_id = #{item.productId},
rep_rate = #{item.repRate},
ver_num = #{item.verNum},
vpath = #{item.vpath},
- pver_num = #{item.pverNum}
+ pver_num = #{item.pverNum},
+ bug_reason = #{item.bugReason},
+ rate = #{item.rate}
\ 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 e06a1531..3f6f7b24 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
@@ -407,7 +407,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},#{productName},#{cbranchId},#{cdeptid},#{tagIds},#{tagNames},#{ntype},#{childrenCnt},#{ltime},#{pidPaths},#{lvl},#{isTpl},#{keyPath},#{uniInnerPrice},#{uniOutPrice},#{calcType},#{ptype},#{wtype},#{bctrl}
+ #{id},#{name},#{parentTaskid},#{parentTaskname},#{projectId},#{projectName},#{level},#{sortLevel},#{executorUserid},#{executorUsername},#{preTaskid},#{preTaskname},#{startTime},#{endTime},#{milestone},#{description},#{remarks},#{createUserid},#{createUsername},#{createTime},#{rate},#{budgetCost},#{budgetWorkload},#{actCost},#{actWorkload},#{taskState},#{taskType},#{taskClass},#{toTaskCenter},#{actStartTime},#{actEndTime},#{bizProcInstId},#{bizFlowState},#{phaseId},#{phaseName},#{taskSkillNames},#{exeUsernames},#{taskSkillIds},#{exeUserids},#{taskOut},#{planType},#{settleSchemel},#{menuId},#{menuName},#{productId},#{cbranchId},#{cdeptid},#{tagIds},#{tagNames},#{ntype},#{childrenCnt},#{ltime},#{pidPaths},#{lvl},#{isTpl},#{keyPath},#{uniInnerPrice},#{uniOutPrice},#{calcType},#{ptype},#{wtype},#{bctrl}
)
@@ -470,7 +470,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,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
+ 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
@@ -520,7 +520,6 @@
and res.menu_id = #{menuId}
and res.menu_name = #{menuName}
and res.product_id = #{productId}
- and res.product_name = #{productName}
and res.cbranch_id = #{cbranchId}
and res.cdeptid = #{cdeptid}
and res.tag_ids = #{tagIds}
@@ -585,7 +584,6 @@
menu_id = #{menuId},
menu_name = #{menuName},
product_id = #{productId},
- product_name = #{productName},
cbranch_id = #{cbranchId},
cdeptid = #{cdeptid},
tag_ids = #{tagIds},
@@ -649,7 +647,6 @@
menu_id = #{menuId},
menu_name = #{menuName},
product_id = #{productId},
- product_name = #{productName},
cbranch_id = #{cbranchId},
cdeptid = #{cdeptid},
tag_ids = #{tagIds},
@@ -714,7 +711,6 @@
menu_id = #{item.menuId},
menu_name = #{item.menuName},
product_id = #{item.productId},
- product_name = #{item.productName},
cbranch_id = #{item.cbranchId},
cdeptid = #{item.cdeptid},
tag_ids = #{item.tagIds},