diff --git a/xm-core/src/main/java/com/xm/core/entity/XmBranchState.java b/xm-core/src/main/java/com/xm/core/entity/XmBranchState.java
index 11900461..669b72fd 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmBranchState.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmBranchState.java
@@ -8,9 +8,9 @@ import java.util.Date;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmBranchState所有属性名:
- * bizDate,totalFileCnt,totalBugCnt,totalTaskCnt,totalBudgetNouserAmount,totalStaffCnt,calcTime,calcStatus,totalCostNouserAmount,totalClosedBugCnt,totalResolvedBugCnt,totalCompleteTaskCnt,totalPhaseCnt,totalCompletePhaseCnt,totalNeedPayAmount,totalFinishPayAmount,totalNeedColAmount,totalFinishColAmount,totalCostUserAmount,totalBudgetInnerUserAmount,totalPlanWorkload,totalRiskCnt,totalCompleteRiskCnt,branchId,branchName,totalBudgetOutUserAmount,totalCompleteWorkload,totalCostInnerUserAmount,totalCostOutUserAmount,totalProgress,totalActiveBugCnt,totalConfirmedBugCnt,projectStatus,totalActWorkload,totalActOutWorkload,totalActInnerWorkload,totalTaskBudgetCostAt,totalTaskOutCnt,totalNeedPayCnt,totalFinishPayCnt,totalFinishPayUserCnt,totalNeedPayUserCnt,totalPlanInnerUserWorkload,totalPlanOutUserWorkload,testCases,execCases,designCases,finishCases,iterationCnt,productCnt,menuCnt,projectCnt;
+ * bizDate,totalFileCnt,totalBugCnt,totalTaskCnt,totalBudgetNouserAmount,totalStaffCnt,calcTime,calcStatus,totalCostNouserAmount,totalClosedBugCnt,totalResolvedBugCnt,totalCompleteTaskCnt,totalPhaseCnt,totalCompletePhaseCnt,totalNeedPayAmount,totalFinishPayAmount,totalNeedColAmount,totalFinishColAmount,totalCostUserAmount,totalBudgetIuserAmount,totalPlanWorkload,totalRiskCnt,totalCompleteRiskCnt,branchId,branchName,totalBudgetOuserAmount,totalCompleteWorkload,totalCostIuserAmount,totalCostOuserAmount,totalProgress,totalActiveBugCnt,totalConfirmedBugCnt,projectStatus,totalActWorkload,totalActOutWorkload,totalActInnerWorkload,totalTaskBudgetCostAt,totalTaskOutCnt,totalNeedPayCnt,totalFinishPayCnt,totalFinishPayUserCnt,totalNeedPayUserCnt,totalPlanIuserWorkload,totalPlanOuserWorkload,testCases,execCases,designCases,finishCases,iterationCnt,productCnt,menuCnt,projectCnt,productBudgetWorkload,productActWorkload,estimateWorkload,execTaskCnt,toStartTaskCnt,execMenuCnt,toStartMenuCnt;
* 表 xm_branch_state 机构内所有项目指标汇总的所有字段名:
- * biz_date,total_file_cnt,total_bug_cnt,total_task_cnt,total_budget_nouser_amount,total_staff_cnt,calc_time,calc_status,total_cost_nouser_amount,total_closed_bug_cnt,total_resolved_bug_cnt,total_complete_task_cnt,total_phase_cnt,total_complete_phase_cnt,total_need_pay_amount,total_finish_pay_amount,total_need_col_amount,total_finish_col_amount,total_cost_user_amount,total_budget_inner_user_amount,total_plan_workload,total_risk_cnt,total_complete_risk_cnt,branch_id,branch_name,total_budget_out_user_amount,total_complete_workload,total_cost_inner_user_amount,total_cost_out_user_amount,total_progress,total_active_bug_cnt,total_confirmed_bug_cnt,project_status,total_act_workload,total_act_out_workload,total_act_inner_workload,total_task_budget_cost_at,total_task_out_cnt,total_need_pay_cnt,total_finish_pay_cnt,total_finish_pay_user_cnt,total_need_pay_user_cnt,total_plan_inner_user_workload,total_plan_out_user_workload,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,menu_cnt,project_cnt;
+ * biz_date,total_file_cnt,total_bug_cnt,total_task_cnt,total_budget_nouser_amount,total_staff_cnt,calc_time,calc_status,total_cost_nouser_amount,total_closed_bug_cnt,total_resolved_bug_cnt,total_complete_task_cnt,total_phase_cnt,total_complete_phase_cnt,total_need_pay_amount,total_finish_pay_amount,total_need_col_amount,total_finish_col_amount,total_cost_user_amount,total_budget_iuser_amount,total_plan_workload,total_risk_cnt,total_complete_risk_cnt,branch_id,branch_name,total_budget_ouser_amount,total_complete_workload,total_cost_iuser_amount,total_cost_ouser_amount,total_progress,total_active_bug_cnt,total_confirmed_bug_cnt,project_status,total_act_workload,total_act_out_workload,total_act_inner_workload,total_task_budget_cost_at,total_task_out_cnt,total_need_pay_cnt,total_finish_pay_cnt,total_finish_pay_user_cnt,total_need_pay_user_cnt,total_plan_iuser_workload,total_plan_ouser_workload,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,menu_cnt,project_cnt,product_budget_workload,product_act_workload,estimate_workload,exec_task_cnt,to_start_task_cnt,exec_menu_cnt,to_start_menu_cnt;
* 当前主键(包括多主键):
* branch_id;
*/
@@ -81,7 +81,7 @@ public class XmBranchState implements java.io.Serializable {
BigDecimal totalCostUserAmount;
@ApiModelProperty(notes="项目总内部人力预算-来自项目表",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal totalBudgetInnerUserAmount;
+ BigDecimal totalBudgetIuserAmount;
@ApiModelProperty(notes="项目总预算工作量-来自项目表",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalPlanWorkload;
@@ -96,16 +96,16 @@ public class XmBranchState implements java.io.Serializable {
String branchName;
@ApiModelProperty(notes="项目总外购人力预算-来自项目表",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal totalBudgetOutUserAmount;
+ BigDecimal totalBudgetOuserAmount;
@ApiModelProperty(notes="已完成工作量-来自计划中实际完成工作量",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalCompleteWorkload;
@ApiModelProperty(notes="项目总内部人力成本金额",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal totalCostInnerUserAmount;
+ BigDecimal totalCostIuserAmount;
@ApiModelProperty(notes="项目总外购人力成本金额",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal totalCostOutUserAmount;
+ BigDecimal totalCostOuserAmount;
@ApiModelProperty(notes="项目进度0~100之间，来自任务表",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalProgress;
@@ -147,10 +147,10 @@ public class XmBranchState implements java.io.Serializable {
BigDecimal totalNeedPayUserCnt;
@ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal totalPlanInnerUserWorkload;
+ BigDecimal totalPlanIuserWorkload;
@ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal totalPlanOutUserWorkload;
+ BigDecimal totalPlanOuserWorkload;
@ApiModelProperty(notes="测试案例总数",allowEmptyValue=true,example="",allowableValues="")
Integer testCases;
@@ -175,6 +175,27 @@ public class XmBranchState implements java.io.Serializable {
@ApiModelProperty(notes="项目数量",allowEmptyValue=true,example="",allowableValues="")
Integer projectCnt;
+
+ @ApiModelProperty(notes="产品总工时",allowEmptyValue=true,example="",allowableValues="")
+ BigDecimal productBudgetWorkload;
+
+ @ApiModelProperty(notes="产品实际完成总工作量",allowEmptyValue=true,example="",allowableValues="")
+ BigDecimal productActWorkload;
+
+ @ApiModelProperty(notes="预估完成工作量",allowEmptyValue=true,example="",allowableValues="")
+ BigDecimal estimateWorkload;
+
+ @ApiModelProperty(notes="执行中任务数=任务表开始日期小于当前日期，进度<100的任务",allowEmptyValue=true,example="",allowableValues="")
+ Integer execTaskCnt;
+
+ @ApiModelProperty(notes="待开始的任务数=任务表中开始日期大于当前日期的任务数",allowEmptyValue=true,example="",allowableValues="")
+ Integer toStartTaskCnt;
+
+ @ApiModelProperty(notes="执行中需求=需求表中开始日期小于小于当前日期，进度<100的需求",allowEmptyValue=true,example="",allowableValues="")
+ Integer execMenuCnt;
+
+ @ApiModelProperty(notes="待开始需求数=需求表中开始日期大于当前日期的需求数",allowEmptyValue=true,example="",allowableValues="")
+ Integer toStartMenuCnt;
/**机构编号**/
public XmBranchState(String branchId) {
@@ -302,8 +323,8 @@ public class XmBranchState implements java.io.Serializable {
/**
* 项目总内部人力预算-来自项目表
**/
- public void setTotalBudgetInnerUserAmount(BigDecimal totalBudgetInnerUserAmount) {
- this.totalBudgetInnerUserAmount = totalBudgetInnerUserAmount;
+ public void setTotalBudgetIuserAmount(BigDecimal totalBudgetIuserAmount) {
+ this.totalBudgetIuserAmount = totalBudgetIuserAmount;
}
/**
* 项目总预算工作量-来自项目表
@@ -338,8 +359,8 @@ public class XmBranchState implements java.io.Serializable {
/**
* 项目总外购人力预算-来自项目表
**/
- public void setTotalBudgetOutUserAmount(BigDecimal totalBudgetOutUserAmount) {
- this.totalBudgetOutUserAmount = totalBudgetOutUserAmount;
+ public void setTotalBudgetOuserAmount(BigDecimal totalBudgetOuserAmount) {
+ this.totalBudgetOuserAmount = totalBudgetOuserAmount;
}
/**
* 已完成工作量-来自计划中实际完成工作量
@@ -350,14 +371,14 @@ public class XmBranchState implements java.io.Serializable {
/**
* 项目总内部人力成本金额
**/
- public void setTotalCostInnerUserAmount(BigDecimal totalCostInnerUserAmount) {
- this.totalCostInnerUserAmount = totalCostInnerUserAmount;
+ public void setTotalCostIuserAmount(BigDecimal totalCostIuserAmount) {
+ this.totalCostIuserAmount = totalCostIuserAmount;
}
/**
* 项目总外购人力成本金额
**/
- public void setTotalCostOutUserAmount(BigDecimal totalCostOutUserAmount) {
- this.totalCostOutUserAmount = totalCostOutUserAmount;
+ public void setTotalCostOuserAmount(BigDecimal totalCostOuserAmount) {
+ this.totalCostOuserAmount = totalCostOuserAmount;
}
/**
* 项目进度0~100之间，来自任务表
@@ -440,14 +461,14 @@ public class XmBranchState implements java.io.Serializable {
/**
* 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
**/
- public void setTotalPlanInnerUserWorkload(BigDecimal totalPlanInnerUserWorkload) {
- this.totalPlanInnerUserWorkload = totalPlanInnerUserWorkload;
+ public void setTotalPlanIuserWorkload(BigDecimal totalPlanIuserWorkload) {
+ this.totalPlanIuserWorkload = totalPlanIuserWorkload;
}
/**
* 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
**/
- public void setTotalPlanOutUserWorkload(BigDecimal totalPlanOutUserWorkload) {
- this.totalPlanOutUserWorkload = totalPlanOutUserWorkload;
+ public void setTotalPlanOuserWorkload(BigDecimal totalPlanOuserWorkload) {
+ this.totalPlanOuserWorkload = totalPlanOuserWorkload;
}
/**
* 测试案例总数
@@ -497,6 +518,48 @@ public class XmBranchState implements java.io.Serializable {
public void setProjectCnt(Integer projectCnt) {
this.projectCnt = projectCnt;
}
+ /**
+ * 产品总工时
+ **/
+ public void setProductBudgetWorkload(BigDecimal productBudgetWorkload) {
+ this.productBudgetWorkload = productBudgetWorkload;
+ }
+ /**
+ * 产品实际完成总工作量
+ **/
+ public void setProductActWorkload(BigDecimal productActWorkload) {
+ this.productActWorkload = productActWorkload;
+ }
+ /**
+ * 预估完成工作量
+ **/
+ public void setEstimateWorkload(BigDecimal estimateWorkload) {
+ this.estimateWorkload = estimateWorkload;
+ }
+ /**
+ * 执行中任务数=任务表开始日期小于当前日期，进度<100的任务
+ **/
+ public void setExecTaskCnt(Integer execTaskCnt) {
+ this.execTaskCnt = execTaskCnt;
+ }
+ /**
+ * 待开始的任务数=任务表中开始日期大于当前日期的任务数
+ **/
+ public void setToStartTaskCnt(Integer toStartTaskCnt) {
+ this.toStartTaskCnt = toStartTaskCnt;
+ }
+ /**
+ * 执行中需求=需求表中开始日期小于小于当前日期，进度<100的需求
+ **/
+ public void setExecMenuCnt(Integer execMenuCnt) {
+ this.execMenuCnt = execMenuCnt;
+ }
+ /**
+ * 待开始需求数=需求表中开始日期大于当前日期的需求数
+ **/
+ public void setToStartMenuCnt(Integer toStartMenuCnt) {
+ this.toStartMenuCnt = toStartMenuCnt;
+ }
/**
* 统计日期yyyy-mm-dd类型
@@ -615,8 +678,8 @@ public class XmBranchState implements java.io.Serializable {
/**
* 项目总内部人力预算-来自项目表
**/
- public BigDecimal getTotalBudgetInnerUserAmount() {
- return this.totalBudgetInnerUserAmount;
+ public BigDecimal getTotalBudgetIuserAmount() {
+ return this.totalBudgetIuserAmount;
}
/**
* 项目总预算工作量-来自项目表
@@ -651,8 +714,8 @@ public class XmBranchState implements java.io.Serializable {
/**
* 项目总外购人力预算-来自项目表
**/
- public BigDecimal getTotalBudgetOutUserAmount() {
- return this.totalBudgetOutUserAmount;
+ public BigDecimal getTotalBudgetOuserAmount() {
+ return this.totalBudgetOuserAmount;
}
/**
* 已完成工作量-来自计划中实际完成工作量
@@ -663,14 +726,14 @@ public class XmBranchState implements java.io.Serializable {
/**
* 项目总内部人力成本金额
**/
- public BigDecimal getTotalCostInnerUserAmount() {
- return this.totalCostInnerUserAmount;
+ public BigDecimal getTotalCostIuserAmount() {
+ return this.totalCostIuserAmount;
}
/**
* 项目总外购人力成本金额
**/
- public BigDecimal getTotalCostOutUserAmount() {
- return this.totalCostOutUserAmount;
+ public BigDecimal getTotalCostOuserAmount() {
+ return this.totalCostOuserAmount;
}
/**
* 项目进度0~100之间，来自任务表
@@ -753,14 +816,14 @@ public class XmBranchState implements java.io.Serializable {
/**
* 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
**/
- public BigDecimal getTotalPlanInnerUserWorkload() {
- return this.totalPlanInnerUserWorkload;
+ public BigDecimal getTotalPlanIuserWorkload() {
+ return this.totalPlanIuserWorkload;
}
/**
* 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
**/
- public BigDecimal getTotalPlanOutUserWorkload() {
- return this.totalPlanOutUserWorkload;
+ public BigDecimal getTotalPlanOuserWorkload() {
+ return this.totalPlanOuserWorkload;
}
/**
* 测试案例总数
@@ -810,5 +873,47 @@ public class XmBranchState implements java.io.Serializable {
public Integer getProjectCnt() {
return this.projectCnt;
}
+ /**
+ * 产品总工时
+ **/
+ public BigDecimal getProductBudgetWorkload() {
+ return this.productBudgetWorkload;
+ }
+ /**
+ * 产品实际完成总工作量
+ **/
+ public BigDecimal getProductActWorkload() {
+ return this.productActWorkload;
+ }
+ /**
+ * 预估完成工作量
+ **/
+ public BigDecimal getEstimateWorkload() {
+ return this.estimateWorkload;
+ }
+ /**
+ * 执行中任务数=任务表开始日期小于当前日期，进度<100的任务
+ **/
+ public Integer getExecTaskCnt() {
+ return this.execTaskCnt;
+ }
+ /**
+ * 待开始的任务数=任务表中开始日期大于当前日期的任务数
+ **/
+ public Integer getToStartTaskCnt() {
+ return this.toStartTaskCnt;
+ }
+ /**
+ * 执行中需求=需求表中开始日期小于小于当前日期，进度<100的需求
+ **/
+ public Integer getExecMenuCnt() {
+ return this.execMenuCnt;
+ }
+ /**
+ * 待开始需求数=需求表中开始日期大于当前日期的需求数
+ **/
+ public Integer getToStartMenuCnt() {
+ return this.toStartMenuCnt;
+ }
}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java b/xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java
index feb59841..aef1a18d 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java
@@ -1,16 +1,15 @@
-package com.xm.core.entity;
+package com.xm.core.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-
import java.math.BigDecimal;
import java.util.Date;
/**
- * 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
+ * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmBranchTaskTypeState所有属性名:
* taskType,planWorkload,planAmount,actWorkload,actAmount,branchId,bizDate,calcTime,planOutUserAt,planInnerUserAt,actOutUserAt,actInnerUserAt,planOutUserWorkload,planInnerUserWorkload,actOutUserWorkload,actInnerUserWorkload,planNouserAt,actNouserAt,id,branchName;
- * 表 XM.xm_branch_task_type_state 按机构编号任务类型汇总的所有字段名:
+ * 表 xm_branch_task_type_state 按机构编号任务类型汇总的所有字段名:
* task_type,plan_workload,plan_amount,act_workload,act_amount,branch_id,biz_date,calc_time,plan_out_user_at,plan_inner_user_at,act_out_user_at,act_inner_user_at,plan_out_user_workload,plan_inner_user_workload,act_out_user_workload,act_inner_user_workload,plan_nouser_at,act_nouser_at,id,branch_name;
* 当前主键(包括多主键):
* id;
@@ -159,7 +158,7 @@ public class XmBranchTaskTypeState implements java.io.Serializable {
/**
* 实际内购成本
**/
- public void setActIuserAt(BigDecimal actInnerUserAt) {
+ public void setActInnerUserAt(BigDecimal actInnerUserAt) {
this.actInnerUserAt = actInnerUserAt;
}
/**
@@ -183,7 +182,7 @@ public class XmBranchTaskTypeState implements java.io.Serializable {
/**
* 实际内购工作量
**/
- public void setActIuserWorkload(BigDecimal actInnerUserWorkload) {
+ public void setActInnerUserWorkload(BigDecimal actInnerUserWorkload) {
this.actInnerUserWorkload = actInnerUserWorkload;
}
/**
@@ -280,7 +279,7 @@ public class XmBranchTaskTypeState implements java.io.Serializable {
/**
* 实际内购成本
**/
- public BigDecimal getActIuserAt() {
+ public BigDecimal getActInnerUserAt() {
return this.actInnerUserAt;
}
/**
@@ -304,7 +303,7 @@ public class XmBranchTaskTypeState implements java.io.Serializable {
/**
* 实际内购工作量
**/
- public BigDecimal getActIuserWorkload() {
+ public BigDecimal getActInnerUserWorkload() {
return this.actInnerUserWorkload;
}
/**
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmMenu.java b/xm-core/src/main/java/com/xm/core/entity/XmMenu.java
index 1d94d2be..7312635f 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmMenu.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmMenu.java
@@ -8,9 +8,9 @@ import java.math.BigDecimal;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmMenu所有属性名:
- * menuId,menuName,pmenuId,productId,remark,status,online,demandUrl,codeUrl,designUrl,docUrl,helpUrl,operDocUrl,seqNo,mmUserid,mmUsername,ctime,ntype,sinceVersion,childrenCnt,ltime,tagIds,tagNames,pidPaths,lvl,isTpl,budgetHours,budgetStaffNu,budgetWorkload,budgetAmount,phaseId,iterationId,calcType;
+ * menuId,menuName,pmenuId,productId,remark,status,online,demandUrl,codeUrl,designUrl,docUrl,helpUrl,operDocUrl,seqNo,mmUserid,mmUsername,ctime,ntype,sinceVersion,childrenCnt,ltime,tagIds,tagNames,pidPaths,lvl,isTpl,budgetHours,budgetStaffNu,budgetWorkload,budgetAmount,phaseId,iterationId,calcType,mactWorkload,mactAmount,mactRate;
* 表 xm_menu 功能表的所有字段名:
- * menu_id,menu_name,pmenu_id,product_id,remark,status,online,demand_url,code_url,design_url,doc_url,help_url,oper_doc_url,seq_no,mm_userid,mm_username,ctime,ntype,since_version,children_cnt,ltime,tag_ids,tag_names,pid_paths,lvl,is_tpl,budget_hours,budget_staff_nu,budget_workload,budget_amount,phase_id,iteration_id,calc_type;
+ * menu_id,menu_name,pmenu_id,product_id,remark,status,online,demand_url,code_url,design_url,doc_url,help_url,oper_doc_url,seq_no,mm_userid,mm_username,ctime,ntype,since_version,children_cnt,ltime,tag_ids,tag_names,pid_paths,lvl,is_tpl,budget_hours,budget_staff_nu,budget_workload,budget_amount,phase_id,iteration_id,calc_type,mact_workload,mact_amount,mact_rate;
* 当前主键(包括多主键):
* menu_id;
*/
@@ -118,6 +118,15 @@ public class XmMenu implements java.io.Serializable {
@ApiModelProperty(notes="叶子节点数据收集方式0-不计算，1-由任务汇总，2-手工填报",allowEmptyValue=true,example="",allowableValues="")
String calcType;
+
+ @ApiModelProperty(notes="手工填报的情况下填报的工作量，其余为下级往上汇总数据",allowEmptyValue=true,example="",allowableValues="")
+ BigDecimal mactWorkload;
+
+ @ApiModelProperty(notes="手工填报情况下填报的费用总额，其余为下级往上汇总数据",allowEmptyValue=true,example="",allowableValues="")
+ String mactAmount;
+
+ @ApiModelProperty(notes="手工填报下的进度",allowEmptyValue=true,example="",allowableValues="")
+ Integer mactRate;
/**功能编号**/
public XmMenu(String menuId) {
@@ -326,6 +335,24 @@ public class XmMenu implements java.io.Serializable {
public void setCalcType(String calcType) {
this.calcType = calcType;
}
+ /**
+ * 手工填报的情况下填报的工作量，其余为下级往上汇总数据
+ **/
+ public void setMactWorkload(BigDecimal mactWorkload) {
+ this.mactWorkload = mactWorkload;
+ }
+ /**
+ * 手工填报情况下填报的费用总额，其余为下级往上汇总数据
+ **/
+ public void setMactAmount(String mactAmount) {
+ this.mactAmount = mactAmount;
+ }
+ /**
+ * 手工填报下的进度
+ **/
+ public void setMactRate(Integer mactRate) {
+ this.mactRate = mactRate;
+ }
/**
* 功能编号
@@ -525,5 +552,23 @@ public class XmMenu implements java.io.Serializable {
public String getCalcType() {
return this.calcType;
}
+ /**
+ * 手工填报的情况下填报的工作量，其余为下级往上汇总数据
+ **/
+ public BigDecimal getMactWorkload() {
+ return this.mactWorkload;
+ }
+ /**
+ * 手工填报情况下填报的费用总额，其余为下级往上汇总数据
+ **/
+ public String getMactAmount() {
+ return this.mactAmount;
+ }
+ /**
+ * 手工填报下的进度
+ **/
+ public Integer getMactRate() {
+ return this.mactRate;
+ }
}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProject.java b/xm-core/src/main/java/com/xm/core/entity/XmProject.java
index a0e4aab4..ccd01e27 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProject.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProject.java
@@ -8,9 +8,9 @@ import java.math.BigDecimal;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmProject所有属性名:
- * id,code,name,xmType,startTime,endTime,urgent,priority,description,createUserid,createUsername,createTime,assess,assessRemarks,status,branchId,planTotalCost,bizProcInstId,bizFlowState,planNouserAt,planInnerUserAt,planOutUserAt,locked,baseTime,baseRemark,baselineId,planWorkload,totalReceivables,budgetMarginRate,contractAmt,planInnerUserPrice,planOutUserPrice,planOutUserCnt,planInnerUserCnt,planWorkingHours,taxRate,planInnerUserWorkload,planOutUserWorkload,fromTplId,budgetCtrl,deptid,showOut,isTpl,pmUserid,pmUsername,assUserid,assUsername,admUserid,admUsername,phaseBudgetCtrl,phaseActCtrl,del,ltime;
+ * 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;
* 表 xm_project xm_project的所有字段名:
- * 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_inner_user_at,plan_out_user_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_inner_user_price,plan_out_user_price,plan_out_user_cnt,plan_inner_user_cnt,plan_working_hours,tax_rate,plan_inner_user_workload,plan_out_user_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;
+ * 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;
* 当前主键(包括多主键):
* id;
*/
@@ -81,10 +81,10 @@ public class XmProject implements java.io.Serializable {
BigDecimal planNouserAt;
@ApiModelProperty(notes="内部人力成本总预算-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal planInnerUserAt;
+ BigDecimal planIuserAt;
@ApiModelProperty(notes="外购人力成本总预算-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal planOutUserAt;
+ BigDecimal planOuserAt;
@ApiModelProperty(notes="是否锁定整个项目不允许变化0否1是",allowEmptyValue=true,example="",allowableValues="")
String locked;
@@ -111,16 +111,16 @@ public class XmProject implements java.io.Serializable {
BigDecimal contractAmt;
@ApiModelProperty(notes="内部人力成本单价元/人时",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal planInnerUserPrice;
+ BigDecimal planIuserPrice;
@ApiModelProperty(notes="外购人力成本单价元/人时",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal planOutUserPrice;
+ BigDecimal planOuserPrice;
@ApiModelProperty(notes="外购人数",allowEmptyValue=true,example="",allowableValues="")
- Integer planOutUserCnt;
+ Integer planOuserCnt;
@ApiModelProperty(notes="内部人数",allowEmptyValue=true,example="",allowableValues="")
- Integer planInnerUserCnt;
+ Integer planIuserCnt;
@ApiModelProperty(notes="预计工作小时数目",allowEmptyValue=true,example="",allowableValues="")
Integer planWorkingHours;
@@ -129,10 +129,10 @@ public class XmProject implements java.io.Serializable {
BigDecimal taxRate;
@ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal planInnerUserWorkload;
+ BigDecimal planIuserWorkload;
@ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal planOutUserWorkload;
+ BigDecimal planOuserWorkload;
@ApiModelProperty(notes="关联模板编号",allowEmptyValue=true,example="",allowableValues="")
String fromTplId;
@@ -311,14 +311,14 @@ public class XmProject implements java.io.Serializable {
/**
* 内部人力成本总预算-应该大于或等于阶段计划内部人力总成本
**/
- public void setPlanInnerUserAt(BigDecimal planInnerUserAt) {
- this.planInnerUserAt = planInnerUserAt;
+ public void setPlanIuserAt(BigDecimal planIuserAt) {
+ this.planIuserAt = planIuserAt;
}
/**
* 外购人力成本总预算-应该大于或等于阶段计划外购人力总成本
**/
- public void setPlanOutUserAt(BigDecimal planOutUserAt) {
- this.planOutUserAt = planOutUserAt;
+ public void setPlanOuserAt(BigDecimal planOuserAt) {
+ this.planOuserAt = planOuserAt;
}
/**
* 是否锁定整个项目不允许变化0否1是
@@ -371,26 +371,26 @@ public class XmProject implements java.io.Serializable {
/**
* 内部人力成本单价元/人时
**/
- public void setPlanInnerUserPrice(BigDecimal planInnerUserPrice) {
- this.planInnerUserPrice = planInnerUserPrice;
+ public void setPlanIuserPrice(BigDecimal planIuserPrice) {
+ this.planIuserPrice = planIuserPrice;
}
/**
* 外购人力成本单价元/人时
**/
- public void setPlanOutUserPrice(BigDecimal planOutUserPrice) {
- this.planOutUserPrice = planOutUserPrice;
+ public void setPlanOuserPrice(BigDecimal planOuserPrice) {
+ this.planOuserPrice = planOuserPrice;
}
/**
* 外购人数
**/
- public void setPlanOutUserCnt(Integer planOutUserCnt) {
- this.planOutUserCnt = planOutUserCnt;
+ public void setPlanOuserCnt(Integer planOuserCnt) {
+ this.planOuserCnt = planOuserCnt;
}
/**
* 内部人数
**/
- public void setPlanInnerUserCnt(Integer planInnerUserCnt) {
- this.planInnerUserCnt = planInnerUserCnt;
+ public void setPlanIuserCnt(Integer planIuserCnt) {
+ this.planIuserCnt = planIuserCnt;
}
/**
* 预计工作小时数目
@@ -407,14 +407,14 @@ public class XmProject implements java.io.Serializable {
/**
* 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
**/
- public void setPlanInnerUserWorkload(BigDecimal planInnerUserWorkload) {
- this.planInnerUserWorkload = planInnerUserWorkload;
+ public void setPlanIuserWorkload(BigDecimal planIuserWorkload) {
+ this.planIuserWorkload = planIuserWorkload;
}
/**
* 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
**/
- public void setPlanOutUserWorkload(BigDecimal planOutUserWorkload) {
- this.planOutUserWorkload = planOutUserWorkload;
+ public void setPlanOuserWorkload(BigDecimal planOuserWorkload) {
+ this.planOuserWorkload = planOuserWorkload;
}
/**
* 关联模板编号
@@ -630,14 +630,14 @@ public class XmProject implements java.io.Serializable {
/**
* 内部人力成本总预算-应该大于或等于阶段计划内部人力总成本
**/
- public BigDecimal getPlanInnerUserAt() {
- return this.planInnerUserAt;
+ public BigDecimal getPlanIuserAt() {
+ return this.planIuserAt;
}
/**
* 外购人力成本总预算-应该大于或等于阶段计划外购人力总成本
**/
- public BigDecimal getPlanOutUserAt() {
- return this.planOutUserAt;
+ public BigDecimal getPlanOuserAt() {
+ return this.planOuserAt;
}
/**
* 是否锁定整个项目不允许变化0否1是
@@ -690,26 +690,26 @@ public class XmProject implements java.io.Serializable {
/**
* 内部人力成本单价元/人时
**/
- public BigDecimal getPlanInnerUserPrice() {
- return this.planInnerUserPrice;
+ public BigDecimal getPlanIuserPrice() {
+ return this.planIuserPrice;
}
/**
* 外购人力成本单价元/人时
**/
- public BigDecimal getPlanOutUserPrice() {
- return this.planOutUserPrice;
+ public BigDecimal getPlanOuserPrice() {
+ return this.planOuserPrice;
}
/**
* 外购人数
**/
- public Integer getPlanOutUserCnt() {
- return this.planOutUserCnt;
+ public Integer getPlanOuserCnt() {
+ return this.planOuserCnt;
}
/**
* 内部人数
**/
- public Integer getPlanInnerUserCnt() {
- return this.planInnerUserCnt;
+ public Integer getPlanIuserCnt() {
+ return this.planIuserCnt;
}
/**
* 预计工作小时数目
@@ -726,14 +726,14 @@ public class XmProject implements java.io.Serializable {
/**
* 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
**/
- public BigDecimal getPlanInnerUserWorkload() {
- return this.planInnerUserWorkload;
+ public BigDecimal getPlanIuserWorkload() {
+ return this.planIuserWorkload;
}
/**
* 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
**/
- public BigDecimal getPlanOutUserWorkload() {
- return this.planOutUserWorkload;
+ public BigDecimal getPlanOuserWorkload() {
+ return this.planOuserWorkload;
}
/**
* 关联模板编号
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostNouser.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostNouser.java
index 40e4cef6..1870922f 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostNouser.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostNouser.java
@@ -1,21 +1,20 @@
-package com.xm.core.entity;
+package com.xm.core.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-
import java.math.BigDecimal;
import java.util.Date;
/**
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
+ * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmProjectMBudgetCostNouser所有属性名:
- * projectId,budgetCost,id,remark,subjectId,bizzStartDate,bizzEndDate,bizProcInstId,bizFlowState,projectPhaseId,costType,bizzMonth;
- * 表 XM.xm_project_m_budget_cost_nouser xm_project_m_budget_cost_nouser的所有字段名:
- * project_id,budget_cost,id,remark,subject_id,bizz_start_date,bizz_end_date,biz_proc_inst_id,biz_flow_state,project_phase_id,cost_type,bizz_month;
+ * projectId,budgetCost,id,remark,subjectId,bizzStartDate,bizzEndDate,bizProcInstId,bizFlowState,phaseId,costType,bizzMonth,subjectName;
+ * 表 xm_project_m_budget_cost_nouser 项目人力成本预算的所有字段名:
+ * project_id,budget_cost,id,remark,subject_id,bizz_start_date,bizz_end_date,biz_proc_inst_id,biz_flow_state,phase_id,cost_type,bizz_month,subject_name;
* 当前主键(包括多主键):
* id;
*/
-@ApiModel(description="xm_project_m_budget_cost_nouser")
+@ApiModel(description="项目人力成本预算")
public class XmProjectMBudgetCostNouser implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -48,21 +47,24 @@ public class XmProjectMBudgetCostNouser implements java.io.Serializable {
@ApiModelProperty(notes="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",allowEmptyValue=true,example="",allowableValues="")
String bizFlowState;
- @ApiModelProperty(notes="计划",allowEmptyValue=true,example="",allowableValues="")
- String projectPhaseId;
+ @ApiModelProperty(notes="阶段计划编号",allowEmptyValue=true,example="",allowableValues="")
+ String phaseId;
@ApiModelProperty(notes="成本类型0非人力1内部人力2外购人力",allowEmptyValue=true,example="",allowableValues="")
String costType;
@ApiModelProperty(notes="费用归属月份yyyy-mm",allowEmptyValue=true,example="",allowableValues="")
String bizzMonth;
+
+ @ApiModelProperty(notes="科目名称",allowEmptyValue=true,example="",allowableValues="")
+ String subjectName;
/**主键**/
public XmProjectMBudgetCostNouser(String id) {
this.id = id;
}
- /**xm_project_m_budget_cost_nouser**/
+ /**项目人力成本预算**/
public XmProjectMBudgetCostNouser() {
}
@@ -121,10 +123,10 @@ public class XmProjectMBudgetCostNouser implements java.io.Serializable {
this.bizFlowState = bizFlowState;
}
/**
- * 计划
+ * 阶段计划编号
**/
- public void setPhaseId(String projectPhaseId) {
- this.projectPhaseId = projectPhaseId;
+ public void setPhaseId(String phaseId) {
+ this.phaseId = phaseId;
}
/**
* 成本类型0非人力1内部人力2外购人力
@@ -138,6 +140,12 @@ public class XmProjectMBudgetCostNouser implements java.io.Serializable {
public void setBizzMonth(String bizzMonth) {
this.bizzMonth = bizzMonth;
}
+ /**
+ * 科目名称
+ **/
+ public void setSubjectName(String subjectName) {
+ this.subjectName = subjectName;
+ }
/**
* 项目编号
@@ -194,10 +202,10 @@ public class XmProjectMBudgetCostNouser implements java.io.Serializable {
return this.bizFlowState;
}
/**
- * 计划
+ * 阶段计划编号
**/
public String getPhaseId() {
- return this.projectPhaseId;
+ return this.phaseId;
}
/**
* 成本类型0非人力1内部人力2外购人力
@@ -211,5 +219,11 @@ public class XmProjectMBudgetCostNouser implements java.io.Serializable {
public String getBizzMonth() {
return this.bizzMonth;
}
+ /**
+ * 科目名称
+ **/
+ public String getSubjectName() {
+ return this.subjectName;
+ }
}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostUser.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostUser.java
index 1b63ead2..40983021 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostUser.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostUser.java
@@ -1,21 +1,20 @@
-package com.xm.core.entity;
+package com.xm.core.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-
import java.math.BigDecimal;
import java.util.Date;
/**
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
+ * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmProjectMBudgetCostUser所有属性名:
- * projectId,userid,budgetCost,id,remark,username,subjectId,bizzStartDate,bizzEndDate,bizzMonth,bizProcInstId,bizFlowState,projectPhaseId,costType;
- * 表 XM.xm_project_m_budget_cost_user xm_project_m_budget_cost_user的所有字段名:
- * project_id,userid,budget_cost,id,remark,username,subject_id,bizz_start_date,bizz_end_date,bizz_month,biz_proc_inst_id,biz_flow_state,project_phase_id,cost_type;
+ * projectId,userid,budgetCost,id,remark,username,subjectId,bizzStartDate,bizzEndDate,bizzMonth,bizProcInstId,bizFlowState,phaseId,costType,subjectName;
+ * 表 xm_project_m_budget_cost_user 项目人力成本预算的所有字段名:
+ * project_id,userid,budget_cost,id,remark,username,subject_id,bizz_start_date,bizz_end_date,bizz_month,biz_proc_inst_id,biz_flow_state,phase_id,cost_type,subject_name;
* 当前主键(包括多主键):
* id;
*/
-@ApiModel(description="xm_project_m_budget_cost_user")
+@ApiModel(description="项目人力成本预算")
public class XmProjectMBudgetCostUser implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -57,18 +56,21 @@ public class XmProjectMBudgetCostUser implements java.io.Serializable {
@ApiModelProperty(notes="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",allowEmptyValue=true,example="",allowableValues="")
String bizFlowState;
- @ApiModelProperty(notes="项目计划",allowEmptyValue=true,example="",allowableValues="")
- String projectPhaseId;
+ @ApiModelProperty(notes="项目阶段",allowEmptyValue=true,example="",allowableValues="")
+ String phaseId;
@ApiModelProperty(notes="成本类型0非人力1内部人力2外购人力",allowEmptyValue=true,example="",allowableValues="")
String costType;
+
+ @ApiModelProperty(notes="科目名称",allowEmptyValue=true,example="",allowableValues="")
+ String subjectName;
/**主键**/
public XmProjectMBudgetCostUser(String id) {
this.id = id;
}
- /**xm_project_m_budget_cost_user**/
+ /**项目人力成本预算**/
public XmProjectMBudgetCostUser() {
}
@@ -145,10 +147,10 @@ public class XmProjectMBudgetCostUser implements java.io.Serializable {
this.bizFlowState = bizFlowState;
}
/**
- * 项目计划
+ * 项目阶段
**/
- public void setPhaseId(String projectPhaseId) {
- this.projectPhaseId = projectPhaseId;
+ public void setPhaseId(String phaseId) {
+ this.phaseId = phaseId;
}
/**
* 成本类型0非人力1内部人力2外购人力
@@ -156,6 +158,12 @@ public class XmProjectMBudgetCostUser implements java.io.Serializable {
public void setCostType(String costType) {
this.costType = costType;
}
+ /**
+ * 科目名称
+ **/
+ public void setSubjectName(String subjectName) {
+ this.subjectName = subjectName;
+ }
/**
* 项目编号
@@ -230,10 +238,10 @@ public class XmProjectMBudgetCostUser implements java.io.Serializable {
return this.bizFlowState;
}
/**
- * 项目计划
+ * 项目阶段
**/
public String getPhaseId() {
- return this.projectPhaseId;
+ return this.phaseId;
}
/**
* 成本类型0非人力1内部人力2外购人力
@@ -241,5 +249,11 @@ public class XmProjectMBudgetCostUser implements java.io.Serializable {
public String getCostType() {
return this.costType;
}
+ /**
+ * 科目名称
+ **/
+ public String getSubjectName() {
+ return this.subjectName;
+ }
}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostNouser.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostNouser.java
index 5b7f749f..5f9837d0 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostNouser.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostNouser.java
@@ -1,21 +1,20 @@
-package com.xm.core.entity;
+package com.xm.core.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
import java.util.Date;
+import java.math.BigDecimal;
/**
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
+ * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmProjectMCostNouser所有属性名:
- * projectId,userid,createTime,sendCostTime,username,projectName,remark,id,taskId,taskName,subjectId,bizzStartDate,bizzEndDate,bizProcInstId,bizFlowState,projectPhaseId,actCostAmount,costType,bizMonth,bizDate,subjectName,projectName;
- * 表 XM.xm_project_m_cost_nouser xm_project_m_cost_nouser的所有字段名:
- * project_id,userid,create_time,send_cost_time,username,project_name,remark,id,task_id,task_name,subject_id,bizz_start_date,bizz_end_date,biz_proc_inst_id,biz_flow_state,project_phase_id,act_cost_amount,cost_type,biz_month,biz_date,subject_name,project_phase_name;
+ * projectId,userid,createTime,sendCostTime,username,projectName,remark,id,taskId,taskName,subjectId,bizzStartDate,bizzEndDate,bizProcInstId,bizFlowState,phaseId,actCostAmount,costType,bizMonth,bizDate,subjectName,phaseName;
+ * 表 xm_project_m_cost_nouser 项目实际人工成本费用的所有字段名:
+ * project_id,userid,create_time,send_cost_time,username,project_name,remark,id,task_id,task_name,subject_id,bizz_start_date,bizz_end_date,biz_proc_inst_id,biz_flow_state,phase_id,act_cost_amount,cost_type,biz_month,biz_date,subject_name,phase_name;
* 当前主键(包括多主键):
* id;
*/
-@ApiModel(description="xm_project_m_cost_nouser")
+@ApiModel(description="项目实际人工成本费用")
public class XmProjectMCostNouser implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -66,8 +65,8 @@ public class XmProjectMCostNouser implements java.io.Serializable {
@ApiModelProperty(notes="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",allowEmptyValue=true,example="",allowableValues="")
String bizFlowState;
- @ApiModelProperty(notes="项目计划计划编号",allowEmptyValue=true,example="",allowableValues="")
- String projectPhaseId;
+ @ApiModelProperty(notes="项目计划阶段编号",allowEmptyValue=true,example="",allowableValues="")
+ String phaseId;
@ApiModelProperty(notes="实际成本金额",allowEmptyValue=true,example="",allowableValues="")
BigDecimal actCostAmount;
@@ -84,15 +83,15 @@ public class XmProjectMCostNouser implements java.io.Serializable {
@ApiModelProperty(notes="科目名称",allowEmptyValue=true,example="",allowableValues="")
String subjectName;
- @ApiModelProperty(notes="计划名称",allowEmptyValue=true,example="",allowableValues="")
- String projectName;
+ @ApiModelProperty(notes="阶段名称",allowEmptyValue=true,example="",allowableValues="")
+ String phaseName;
/**主键**/
public XmProjectMCostNouser(String id) {
this.id = id;
}
- /**xm_project_m_cost_nouser**/
+ /**项目实际人工成本费用**/
public XmProjectMCostNouser() {
}
@@ -187,10 +186,10 @@ public class XmProjectMCostNouser implements java.io.Serializable {
this.bizFlowState = bizFlowState;
}
/**
- * 项目计划计划编号
+ * 项目计划阶段编号
**/
- public void setPhaseId(String projectPhaseId) {
- this.projectPhaseId = projectPhaseId;
+ public void setPhaseId(String phaseId) {
+ this.phaseId = phaseId;
}
/**
* 实际成本金额
@@ -223,10 +222,10 @@ public class XmProjectMCostNouser implements java.io.Serializable {
this.subjectName = subjectName;
}
/**
- * 计划名称
+ * 阶段名称
**/
- public void setProjectName(String projectName) {
- this.projectName = projectName;
+ public void setPhaseName(String phaseName) {
+ this.phaseName = phaseName;
}
/**
@@ -320,10 +319,10 @@ public class XmProjectMCostNouser implements java.io.Serializable {
return this.bizFlowState;
}
/**
- * 项目计划计划编号
+ * 项目计划阶段编号
**/
public String getPhaseId() {
- return this.projectPhaseId;
+ return this.phaseId;
}
/**
* 实际成本金额
@@ -356,10 +355,10 @@ public class XmProjectMCostNouser implements java.io.Serializable {
return this.subjectName;
}
/**
- * 计划名称
+ * 阶段名称
**/
- public String getProjectName() {
- return this.projectName;
+ public String getPhaseName() {
+ return this.phaseName;
}
}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostUser.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostUser.java
index 5e3a5676..827fa3a1 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostUser.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostUser.java
@@ -1,17 +1,16 @@
-package com.xm.core.entity;
+package com.xm.core.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
import java.util.Date;
+import java.math.BigDecimal;
/**
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
+ * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmProjectMCostUser所有属性名:
- * subjectId,projectId,userid,createTime,sendCostTime,username,projectName,remark,id,taskId,taskName,actWorkload,bizzStartDate,bizzEndDate,bizProcInstId,bizFlowState,projectPhaseId,actCostAmount,costType,bizMonth,bizDate,subjectName,projectName,execuserProcInstId,execuserStatus,payStatus,payOpUserid,payOpUsername;
- * 表 XM.xm_project_m_cost_user 项目实际人工成本费用的所有字段名:
- * subject_id,project_id,userid,create_time,send_cost_time,username,project_name,remark,id,task_id,task_name,act_workload,bizz_start_date,bizz_end_date,biz_proc_inst_id,biz_flow_state,project_phase_id,act_cost_amount,cost_type,biz_month,biz_date,subject_name,project_phase_name,execuser_proc_inst_id,execuser_status,pay_status,pay_op_userid,pay_op_username;
+ * subjectId,projectId,userid,createTime,sendCostTime,username,projectName,remark,id,taskId,taskName,actWorkload,bizzStartDate,bizzEndDate,bizProcInstId,bizFlowState,phaseId,actCostAmount,costType,bizMonth,bizDate,subjectName,phaseName,execuserProcInstId,execuserStatus,payStatus,payOpUserid,payOpUsername;
+ * 表 xm_project_m_cost_user 项目实际人工成本费用的所有字段名:
+ * subject_id,project_id,userid,create_time,send_cost_time,username,project_name,remark,id,task_id,task_name,act_workload,bizz_start_date,bizz_end_date,biz_proc_inst_id,biz_flow_state,phase_id,act_cost_amount,cost_type,biz_month,biz_date,subject_name,phase_name,execuser_proc_inst_id,execuser_status,pay_status,pay_op_userid,pay_op_username;
* 当前主键(包括多主键):
* id;
*/
@@ -69,8 +68,8 @@ public class XmProjectMCostUser implements java.io.Serializable {
@ApiModelProperty(notes="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",allowEmptyValue=true,example="",allowableValues="")
String bizFlowState;
- @ApiModelProperty(notes="项目计划计划编号",allowEmptyValue=true,example="",allowableValues="")
- String projectPhaseId;
+ @ApiModelProperty(notes="项目计划阶段编号",allowEmptyValue=true,example="",allowableValues="")
+ String phaseId;
@ApiModelProperty(notes="金额",allowEmptyValue=true,example="",allowableValues="")
BigDecimal actCostAmount;
@@ -87,8 +86,8 @@ public class XmProjectMCostUser implements java.io.Serializable {
@ApiModelProperty(notes="科目名称",allowEmptyValue=true,example="",allowableValues="")
String subjectName;
- @ApiModelProperty(notes="计划名称",allowEmptyValue=true,example="",allowableValues="")
- String projectName;
+ @ApiModelProperty(notes="阶段名称",allowEmptyValue=true,example="",allowableValues="")
+ String phaseName;
@ApiModelProperty(notes="执行人申请结算时的流程编号",allowEmptyValue=true,example="",allowableValues="")
String execuserProcInstId;
@@ -211,10 +210,10 @@ public class XmProjectMCostUser implements java.io.Serializable {
this.bizFlowState = bizFlowState;
}
/**
- * 项目计划计划编号
+ * 项目计划阶段编号
**/
- public void setPhaseId(String projectPhaseId) {
- this.projectPhaseId = projectPhaseId;
+ public void setPhaseId(String phaseId) {
+ this.phaseId = phaseId;
}
/**
* 金额
@@ -247,10 +246,10 @@ public class XmProjectMCostUser implements java.io.Serializable {
this.subjectName = subjectName;
}
/**
- * 计划名称
+ * 阶段名称
**/
- public void setProjectName(String projectName) {
- this.projectName = projectName;
+ public void setPhaseName(String phaseName) {
+ this.phaseName = phaseName;
}
/**
* 执行人申请结算时的流程编号
@@ -380,10 +379,10 @@ public class XmProjectMCostUser implements java.io.Serializable {
return this.bizFlowState;
}
/**
- * 项目计划计划编号
+ * 项目计划阶段编号
**/
public String getPhaseId() {
- return this.projectPhaseId;
+ return this.phaseId;
}
/**
* 金额
@@ -416,10 +415,10 @@ public class XmProjectMCostUser implements java.io.Serializable {
return this.subjectName;
}
/**
- * 计划名称
+ * 阶段名称
**/
- public String getProjectName() {
- return this.projectName;
+ public String getPhaseName() {
+ return this.phaseName;
}
/**
* 执行人申请结算时的流程编号
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectState.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectState.java
index 39c58f78..f80cadd1 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProjectState.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectState.java
@@ -8,9 +8,9 @@ import java.util.Date;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmProjectState所有属性名:
- * projectId,bizDate,totalFileCnt,totalBugCnt,totalTaskCnt,totalBudgetNouserAmount,projectName,totalStaffCnt,calcTime,calcStatus,totalCostNouserAmount,totalClosedBugCnt,totalResolvedBugCnt,totalCompleteTaskCnt,totalPhaseCnt,totalCompletePhaseCnt,totalNeedPayAmount,totalFinishPayAmount,totalNeedColAmount,totalFinishColAmount,totalCostUserAmount,totalBudgetInnerUserAmount,totalPlanWorkload,totalRiskCnt,totalCompleteRiskCnt,branchId,branchName,totalBudgetOutUserAmount,totalCompleteWorkload,totalCostInnerUserAmount,totalCostOutUserAmount,totalProgress,totalActiveBugCnt,totalConfirmedBugCnt,projectStatus,totalActWorkload,totalActOutWorkload,totalActInnerWorkload,totalTaskBudgetCostAt,totalTaskOutCnt,totalNeedPayCnt,totalFinishPayCnt,totalFinishPayUserCnt,totalNeedPayUserCnt,totalPlanInnerUserWorkload,totalPlanOutUserWorkload,testCases,execCases,designCases,finishCases,iterationCnt,productCnt,menuCnt;
+ * projectId,bizDate,totalFileCnt,totalBugCnt,totalTaskCnt,totalBudgetNouserAmount,projectName,totalStaffCnt,calcTime,calcStatus,totalCostNouserAmount,totalClosedBugCnt,totalResolvedBugCnt,totalCompleteTaskCnt,totalPhaseCnt,totalCompletePhaseCnt,totalNeedPayAmount,totalFinishPayAmount,totalNeedColAmount,totalFinishColAmount,totalCostUserAmount,totalBudgetIuserAmount,totalPlanWorkload,totalRiskCnt,totalCompleteRiskCnt,branchId,branchName,totalBudgetOuserAmount,totalCompleteWorkload,totalCostIuserAmount,totalCostOuserAmount,totalProgress,totalActiveBugCnt,totalConfirmedBugCnt,projectStatus,totalActWorkload,totalActOutWorkload,totalActInnerWorkload,totalTaskBudgetCostAt,totalTaskOutCnt,totalNeedPayCnt,totalFinishPayCnt,totalFinishPayUserCnt,totalNeedPayUserCnt,totalPlanIuserWorkload,totalPlanOuserWorkload,testCases,execCases,designCases,finishCases,iterationCnt,productCnt,menuCnt,finishMenuCnt,estimateWorkload,execTaskCnt,toStartTaskCnt,execMenuCnt,toStartMenuCnt;
* 表 xm_project_state 项目指标日统计表的所有字段名:
- * project_id,biz_date,total_file_cnt,total_bug_cnt,total_task_cnt,total_budget_nouser_amount,project_name,total_staff_cnt,calc_time,calc_status,total_cost_nouser_amount,total_closed_bug_cnt,total_resolved_bug_cnt,total_complete_task_cnt,total_phase_cnt,total_complete_phase_cnt,total_need_pay_amount,total_finish_pay_amount,total_need_col_amount,total_finish_col_amount,total_cost_user_amount,total_budget_inner_user_amount,total_plan_workload,total_risk_cnt,total_complete_risk_cnt,branch_id,branch_name,total_budget_out_user_amount,total_complete_workload,total_cost_inner_user_amount,total_cost_out_user_amount,total_progress,total_active_bug_cnt,total_confirmed_bug_cnt,project_status,total_act_workload,total_act_out_workload,total_act_inner_workload,total_task_budget_cost_at,total_task_out_cnt,total_need_pay_cnt,total_finish_pay_cnt,total_finish_pay_user_cnt,total_need_pay_user_cnt,total_plan_inner_user_workload,total_plan_out_user_workload,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,menu_cnt;
+ * project_id,biz_date,total_file_cnt,total_bug_cnt,total_task_cnt,total_budget_nouser_amount,project_name,total_staff_cnt,calc_time,calc_status,total_cost_nouser_amount,total_closed_bug_cnt,total_resolved_bug_cnt,total_complete_task_cnt,total_phase_cnt,total_complete_phase_cnt,total_need_pay_amount,total_finish_pay_amount,total_need_col_amount,total_finish_col_amount,total_cost_user_amount,total_budget_iuser_amount,total_plan_workload,total_risk_cnt,total_complete_risk_cnt,branch_id,branch_name,total_budget_ouser_amount,total_complete_workload,total_cost_iuser_amount,total_cost_ouser_amount,total_progress,total_active_bug_cnt,total_confirmed_bug_cnt,project_status,total_act_workload,total_act_out_workload,total_act_inner_workload,total_task_budget_cost_at,total_task_out_cnt,total_need_pay_cnt,total_finish_pay_cnt,total_finish_pay_user_cnt,total_need_pay_user_cnt,total_plan_iuser_workload,total_plan_ouser_workload,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,menu_cnt,finish_menu_cnt,estimate_workload,exec_task_cnt,to_start_task_cnt,exec_menu_cnt,to_start_menu_cnt;
* 当前主键(包括多主键):
* project_id;
*/
@@ -84,7 +84,7 @@ public class XmProjectState implements java.io.Serializable {
BigDecimal totalCostUserAmount;
@ApiModelProperty(notes="项目总内部人力预算-来自项目表",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal totalBudgetInnerUserAmount;
+ BigDecimal totalBudgetIuserAmount;
@ApiModelProperty(notes="项目总预算工作量-来自项目表",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalPlanWorkload;
@@ -102,16 +102,16 @@ public class XmProjectState implements java.io.Serializable {
String branchName;
@ApiModelProperty(notes="项目总外购人力预算-来自项目表",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal totalBudgetOutUserAmount;
+ BigDecimal totalBudgetOuserAmount;
@ApiModelProperty(notes="已完成工作量-来自计划中实际完成工作量",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalCompleteWorkload;
@ApiModelProperty(notes="项目总内部人力成本金额",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal totalCostInnerUserAmount;
+ BigDecimal totalCostIuserAmount;
@ApiModelProperty(notes="项目总外购人力成本金额",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal totalCostOutUserAmount;
+ BigDecimal totalCostOuserAmount;
@ApiModelProperty(notes="项目进度0~100之间，来自任务表",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalProgress;
@@ -122,7 +122,7 @@ public class XmProjectState implements java.io.Serializable {
@ApiModelProperty(notes="已解决bug总数",allowEmptyValue=true,example="",allowableValues="")
Integer totalConfirmedBugCnt;
- @ApiModelProperty(notes="项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停",allowEmptyValue=true,example="",allowableValues="")
+ @ApiModelProperty(notes="0|初始",allowEmptyValue=true,example="",allowableValues="")
String projectStatus;
@ApiModelProperty(notes="实际总工作量，来自任务表",allowEmptyValue=true,example="",allowableValues="")
@@ -153,10 +153,10 @@ public class XmProjectState implements java.io.Serializable {
BigDecimal totalNeedPayUserCnt;
@ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal totalPlanInnerUserWorkload;
+ BigDecimal totalPlanIuserWorkload;
@ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
- BigDecimal totalPlanOutUserWorkload;
+ BigDecimal totalPlanOuserWorkload;
@ApiModelProperty(notes="测试案例总数",allowEmptyValue=true,example="",allowableValues="")
Integer testCases;
@@ -178,6 +178,24 @@ public class XmProjectState implements java.io.Serializable {
@ApiModelProperty(notes="故事数",allowEmptyValue=true,example="",allowableValues="")
Integer menuCnt;
+
+ @ApiModelProperty(notes="完成的故事数",allowEmptyValue=true,example="",allowableValues="")
+ Integer finishMenuCnt;
+
+ @ApiModelProperty(notes="预估工时=计划结束时间在计算当日前完成的任务的预算工时总和",allowEmptyValue=true,example="",allowableValues="")
+ BigDecimal estimateWorkload;
+
+ @ApiModelProperty(notes="执行中任务数=任务表开始日期小于=当前日期，进度<100的任务",allowEmptyValue=true,example="",allowableValues="")
+ Integer execTaskCnt;
+
+ @ApiModelProperty(notes="待开始的任务数=任务表中开始日期=当前日期+1的任务数",allowEmptyValue=true,example="",allowableValues="")
+ Integer toStartTaskCnt;
+
+ @ApiModelProperty(notes="执行中需求=需求表中开始日期小于小于等于当前日期，进度<100的需求",allowEmptyValue=true,example="",allowableValues="")
+ Integer execMenuCnt;
+
+ @ApiModelProperty(notes="待开始需求数=需求表中开始日期=当前日期+1的需求数",allowEmptyValue=true,example="",allowableValues="")
+ Integer toStartMenuCnt;
/**项目编号**/
public XmProjectState(String projectId) {
@@ -317,8 +335,8 @@ public class XmProjectState implements java.io.Serializable {
/**
* 项目总内部人力预算-来自项目表
**/
- public void setTotalBudgetInnerUserAmount(BigDecimal totalBudgetInnerUserAmount) {
- this.totalBudgetInnerUserAmount = totalBudgetInnerUserAmount;
+ public void setTotalBudgetIuserAmount(BigDecimal totalBudgetIuserAmount) {
+ this.totalBudgetIuserAmount = totalBudgetIuserAmount;
}
/**
* 项目总预算工作量-来自项目表
@@ -353,8 +371,8 @@ public class XmProjectState implements java.io.Serializable {
/**
* 项目总外购人力预算-来自项目表
**/
- public void setTotalBudgetOutUserAmount(BigDecimal totalBudgetOutUserAmount) {
- this.totalBudgetOutUserAmount = totalBudgetOutUserAmount;
+ public void setTotalBudgetOuserAmount(BigDecimal totalBudgetOuserAmount) {
+ this.totalBudgetOuserAmount = totalBudgetOuserAmount;
}
/**
* 已完成工作量-来自计划中实际完成工作量
@@ -365,14 +383,14 @@ public class XmProjectState implements java.io.Serializable {
/**
* 项目总内部人力成本金额
**/
- public void setTotalCostInnerUserAmount(BigDecimal totalCostInnerUserAmount) {
- this.totalCostInnerUserAmount = totalCostInnerUserAmount;
+ public void setTotalCostIuserAmount(BigDecimal totalCostIuserAmount) {
+ this.totalCostIuserAmount = totalCostIuserAmount;
}
/**
* 项目总外购人力成本金额
**/
- public void setTotalCostOutUserAmount(BigDecimal totalCostOutUserAmount) {
- this.totalCostOutUserAmount = totalCostOutUserAmount;
+ public void setTotalCostOuserAmount(BigDecimal totalCostOuserAmount) {
+ this.totalCostOuserAmount = totalCostOuserAmount;
}
/**
* 项目进度0~100之间，来自任务表
@@ -393,7 +411,7 @@ public class XmProjectState implements java.io.Serializable {
this.totalConfirmedBugCnt = totalConfirmedBugCnt;
}
/**
- * 项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停
+ * 0|初始
**/
public void setProjectStatus(String projectStatus) {
this.projectStatus = projectStatus;
@@ -455,14 +473,14 @@ public class XmProjectState implements java.io.Serializable {
/**
* 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
**/
- public void setTotalPlanInnerUserWorkload(BigDecimal totalPlanInnerUserWorkload) {
- this.totalPlanInnerUserWorkload = totalPlanInnerUserWorkload;
+ public void setTotalPlanIuserWorkload(BigDecimal totalPlanIuserWorkload) {
+ this.totalPlanIuserWorkload = totalPlanIuserWorkload;
}
/**
* 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
**/
- public void setTotalPlanOutUserWorkload(BigDecimal totalPlanOutUserWorkload) {
- this.totalPlanOutUserWorkload = totalPlanOutUserWorkload;
+ public void setTotalPlanOuserWorkload(BigDecimal totalPlanOuserWorkload) {
+ this.totalPlanOuserWorkload = totalPlanOuserWorkload;
}
/**
* 测试案例总数
@@ -506,6 +524,42 @@ public class XmProjectState implements java.io.Serializable {
public void setMenuCnt(Integer menuCnt) {
this.menuCnt = menuCnt;
}
+ /**
+ * 完成的故事数
+ **/
+ public void setFinishMenuCnt(Integer finishMenuCnt) {
+ this.finishMenuCnt = finishMenuCnt;
+ }
+ /**
+ * 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
+ **/
+ public void setEstimateWorkload(BigDecimal estimateWorkload) {
+ this.estimateWorkload = estimateWorkload;
+ }
+ /**
+ * 执行中任务数=任务表开始日期小于=当前日期，进度<100的任务
+ **/
+ public void setExecTaskCnt(Integer execTaskCnt) {
+ this.execTaskCnt = execTaskCnt;
+ }
+ /**
+ * 待开始的任务数=任务表中开始日期=当前日期+1的任务数
+ **/
+ public void setToStartTaskCnt(Integer toStartTaskCnt) {
+ this.toStartTaskCnt = toStartTaskCnt;
+ }
+ /**
+ * 执行中需求=需求表中开始日期小于小于等于当前日期，进度<100的需求
+ **/
+ public void setExecMenuCnt(Integer execMenuCnt) {
+ this.execMenuCnt = execMenuCnt;
+ }
+ /**
+ * 待开始需求数=需求表中开始日期=当前日期+1的需求数
+ **/
+ public void setToStartMenuCnt(Integer toStartMenuCnt) {
+ this.toStartMenuCnt = toStartMenuCnt;
+ }
/**
* 项目编号
@@ -636,8 +690,8 @@ public class XmProjectState implements java.io.Serializable {
/**
* 项目总内部人力预算-来自项目表
**/
- public BigDecimal getTotalBudgetInnerUserAmount() {
- return this.totalBudgetInnerUserAmount;
+ public BigDecimal getTotalBudgetIuserAmount() {
+ return this.totalBudgetIuserAmount;
}
/**
* 项目总预算工作量-来自项目表
@@ -672,8 +726,8 @@ public class XmProjectState implements java.io.Serializable {
/**
* 项目总外购人力预算-来自项目表
**/
- public BigDecimal getTotalBudgetOutUserAmount() {
- return this.totalBudgetOutUserAmount;
+ public BigDecimal getTotalBudgetOuserAmount() {
+ return this.totalBudgetOuserAmount;
}
/**
* 已完成工作量-来自计划中实际完成工作量
@@ -684,14 +738,14 @@ public class XmProjectState implements java.io.Serializable {
/**
* 项目总内部人力成本金额
**/
- public BigDecimal getTotalCostInnerUserAmount() {
- return this.totalCostInnerUserAmount;
+ public BigDecimal getTotalCostIuserAmount() {
+ return this.totalCostIuserAmount;
}
/**
* 项目总外购人力成本金额
**/
- public BigDecimal getTotalCostOutUserAmount() {
- return this.totalCostOutUserAmount;
+ public BigDecimal getTotalCostOuserAmount() {
+ return this.totalCostOuserAmount;
}
/**
* 项目进度0~100之间，来自任务表
@@ -712,7 +766,7 @@ public class XmProjectState implements java.io.Serializable {
return this.totalConfirmedBugCnt;
}
/**
- * 项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停
+ * 0|初始
**/
public String getProjectStatus() {
return this.projectStatus;
@@ -774,14 +828,14 @@ public class XmProjectState implements java.io.Serializable {
/**
* 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
**/
- public BigDecimal getTotalPlanInnerUserWorkload() {
- return this.totalPlanInnerUserWorkload;
+ public BigDecimal getTotalPlanIuserWorkload() {
+ return this.totalPlanIuserWorkload;
}
/**
* 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
**/
- public BigDecimal getTotalPlanOutUserWorkload() {
- return this.totalPlanOutUserWorkload;
+ public BigDecimal getTotalPlanOuserWorkload() {
+ return this.totalPlanOuserWorkload;
}
/**
* 测试案例总数
@@ -825,5 +879,41 @@ public class XmProjectState implements java.io.Serializable {
public Integer getMenuCnt() {
return this.menuCnt;
}
+ /**
+ * 完成的故事数
+ **/
+ public Integer getFinishMenuCnt() {
+ return this.finishMenuCnt;
+ }
+ /**
+ * 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
+ **/
+ public BigDecimal getEstimateWorkload() {
+ return this.estimateWorkload;
+ }
+ /**
+ * 执行中任务数=任务表开始日期小于=当前日期，进度<100的任务
+ **/
+ public Integer getExecTaskCnt() {
+ return this.execTaskCnt;
+ }
+ /**
+ * 待开始的任务数=任务表中开始日期=当前日期+1的任务数
+ **/
+ public Integer getToStartTaskCnt() {
+ return this.toStartTaskCnt;
+ }
+ /**
+ * 执行中需求=需求表中开始日期小于小于等于当前日期，进度<100的需求
+ **/
+ public Integer getExecMenuCnt() {
+ return this.execMenuCnt;
+ }
+ /**
+ * 待开始需求数=需求表中开始日期=当前日期+1的需求数
+ **/
+ public Integer getToStartMenuCnt() {
+ return this.toStartMenuCnt;
+ }
}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java b/xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java
index c877ac96..aa5a886b 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java
@@ -8,9 +8,9 @@ import java.math.BigDecimal;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmTaskExecuser所有属性名:
- * createTime,id,taskId,userid,startTime,endTime,status,remarks,settleAmount,settleWorkload,settleStatus,settleTime,createUserid,createUsername,username,matchScore,quoteWeekday,quoteAmount,quoteTime,bizProcInstId,bizFlowState,projectId,projectPhaseId,skillRemark,quoteWorkload,quoteStartTime,quoteEndTime,branchId,projectName,taskName,isLeader,distUserid,distUsername;
- * 表 XM.xm_task_execuser xm_task_execuser的所有字段名:
- * create_time,id,task_id,userid,start_time,end_time,status,remarks,settle_amount,settle_workload,settle_status,settle_time,create_userid,create_username,username,match_score,quote_weekday,quote_amount,quote_time,biz_proc_inst_id,biz_flow_state,project_id,project_phase_id,skill_remark,quote_workload,quote_start_time,quote_end_time,branch_id,project_phase_name,task_name,is_leader,dist_userid,dist_username;
+ * createTime,id,taskId,userid,startTime,endTime,status,remarks,settleAmount,settleWorkload,settleStatus,settleTime,createUserid,createUsername,username,matchScore,quoteWeekday,quoteAmount,quoteTime,bizProcInstId,bizFlowState,projectId,phaseId,skillRemark,quoteWorkload,quoteStartTime,quoteEndTime,branchId,phaseName,taskName,isLeader,distUserid,distUsername,execUserBranchid,shareKey;
+ * 表 xm_task_execuser xm_task_execuser的所有字段名:
+ * create_time,id,task_id,userid,start_time,end_time,status,remarks,settle_amount,settle_workload,settle_status,settle_time,create_userid,create_username,username,match_score,quote_weekday,quote_amount,quote_time,biz_proc_inst_id,biz_flow_state,project_id,phase_id,skill_remark,quote_workload,quote_start_time,quote_end_time,branch_id,phase_name,task_name,is_leader,dist_userid,dist_username,exec_user_branchid,share_key;
* 当前主键(包括多主键):
* id;
*/
@@ -50,7 +50,7 @@ public class XmTaskExecuser implements java.io.Serializable {
@ApiModelProperty(notes="已结算工作量",allowEmptyValue=true,example="",allowableValues="")
BigDecimal settleWorkload;
- @ApiModelProperty(notes="结算状态0未结算1已部分结算2无需结算4已申请结算5结算失败6已全部结算",allowEmptyValue=true,example="",allowableValues="")
+ @ApiModelProperty(notes="结算状态0未结算4已申请结算5结算失败6已全部结算",allowEmptyValue=true,example="",allowableValues="")
String settleStatus;
@ApiModelProperty(notes="上次结算时间",allowEmptyValue=true,example="",allowableValues="")
@@ -86,8 +86,8 @@ public class XmTaskExecuser implements java.io.Serializable {
@ApiModelProperty(notes="项目编号",allowEmptyValue=true,example="",allowableValues="")
String projectId;
- @ApiModelProperty(notes="计划编号",allowEmptyValue=true,example="",allowableValues="")
- String projectPhaseId;
+ @ApiModelProperty(notes="阶段计划编号",allowEmptyValue=true,example="",allowableValues="")
+ String phaseId;
@ApiModelProperty(notes="技能说明",allowEmptyValue=true,example="",allowableValues="")
String skillRemark;
@@ -104,8 +104,8 @@ public class XmTaskExecuser implements java.io.Serializable {
@ApiModelProperty(notes="项目所属机构",allowEmptyValue=true,example="",allowableValues="")
String branchId;
- @ApiModelProperty(notes="计划名称",allowEmptyValue=true,example="",allowableValues="")
- String projectName;
+ @ApiModelProperty(notes="阶段计划名称",allowEmptyValue=true,example="",allowableValues="")
+ String phaseName;
@ApiModelProperty(notes="任务名称",allowEmptyValue=true,example="",allowableValues="")
String taskName;
@@ -118,6 +118,12 @@ public class XmTaskExecuser implements java.io.Serializable {
@ApiModelProperty(notes="推荐人姓名",allowEmptyValue=true,example="",allowableValues="")
String distUsername;
+
+ @ApiModelProperty(notes="执行人归属公司",allowEmptyValue=true,example="",allowableValues="")
+ String execUserBranchid;
+
+ @ApiModelProperty(notes="分享码",allowEmptyValue=true,example="",allowableValues="")
+ String shareKey;
/**编号**/
public XmTaskExecuser(String id) {
@@ -189,7 +195,7 @@ public class XmTaskExecuser implements java.io.Serializable {
this.settleWorkload = settleWorkload;
}
/**
- * 结算状态0未结算1已部分结算2无需结算4已申请结算5结算失败6已全部结算
+ * 结算状态0未结算4已申请结算5结算失败6已全部结算
**/
public void setSettleStatus(String settleStatus) {
this.settleStatus = settleStatus;
@@ -261,10 +267,10 @@ public class XmTaskExecuser implements java.io.Serializable {
this.projectId = projectId;
}
/**
- * 计划编号
+ * 阶段计划编号
**/
- public void setPhaseId(String projectPhaseId) {
- this.projectPhaseId = projectPhaseId;
+ public void setPhaseId(String phaseId) {
+ this.phaseId = phaseId;
}
/**
* 技能说明
@@ -297,10 +303,10 @@ public class XmTaskExecuser implements java.io.Serializable {
this.branchId = branchId;
}
/**
- * 计划名称
+ * 阶段计划名称
**/
- public void setProjectName(String projectName) {
- this.projectName = projectName;
+ public void setPhaseName(String phaseName) {
+ this.phaseName = phaseName;
}
/**
* 任务名称
@@ -326,6 +332,18 @@ public class XmTaskExecuser implements java.io.Serializable {
public void setDistUsername(String distUsername) {
this.distUsername = distUsername;
}
+ /**
+ * 执行人归属公司
+ **/
+ public void setExecUserBranchid(String execUserBranchid) {
+ this.execUserBranchid = execUserBranchid;
+ }
+ /**
+ * 分享码
+ **/
+ public void setShareKey(String shareKey) {
+ this.shareKey = shareKey;
+ }
/**
* 创建时间
@@ -388,7 +406,7 @@ public class XmTaskExecuser implements java.io.Serializable {
return this.settleWorkload;
}
/**
- * 结算状态0未结算1已部分结算2无需结算4已申请结算5结算失败6已全部结算
+ * 结算状态0未结算4已申请结算5结算失败6已全部结算
**/
public String getSettleStatus() {
return this.settleStatus;
@@ -460,10 +478,10 @@ public class XmTaskExecuser implements java.io.Serializable {
return this.projectId;
}
/**
- * 计划编号
+ * 阶段计划编号
**/
public String getPhaseId() {
- return this.projectPhaseId;
+ return this.phaseId;
}
/**
* 技能说明
@@ -496,10 +514,10 @@ public class XmTaskExecuser implements java.io.Serializable {
return this.branchId;
}
/**
- * 计划名称
+ * 阶段计划名称
**/
- public String getProjectName() {
- return this.projectName;
+ public String getPhaseName() {
+ return this.phaseName;
}
/**
* 任务名称
@@ -525,5 +543,17 @@ public class XmTaskExecuser implements java.io.Serializable {
public String getDistUsername() {
return this.distUsername;
}
+ /**
+ * 执行人归属公司
+ **/
+ public String getExecUserBranchid() {
+ return this.execUserBranchid;
+ }
+ /**
+ * 分享码
+ **/
+ public String getShareKey() {
+ return this.shareKey;
+ }
}
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml
index 461acb4e..87b4f11d 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml
@@ -101,7 +101,13 @@
where
res.branch_id = #{branchId}
-
+
-
+
-
+
insert into xm_branch_task_type_state(
) values (
@@ -77,13 +85,13 @@
- delete from xm_branch_task_type_state
+ delete from xm_branch_task_type_state
where id = #{id}
- update xm_branch_task_type_state
+ update xm_branch_task_type_state
@@ -92,7 +100,7 @@
- update xm_branch_task_type_state
+ update xm_branch_task_type_state
@@ -107,7 +115,7 @@
- update xm_branch_task_type_state
+ update xm_branch_task_type_state
set
where id = #{item.id}
@@ -115,11 +123,12 @@
- delete from xm_branch_task_type_state
- where id in
-
- #{item.id }
-
+ delete from xm_branch_task_type_state
+ where
+ (id) in
+
+ ( #{item.id} )
+
@@ -127,7 +136,7 @@
task_type,plan_workload,plan_amount,act_workload,act_amount,branch_id,biz_date,calc_time,plan_out_user_at,plan_inner_user_at,act_out_user_at,act_inner_user_at,plan_out_user_workload,plan_inner_user_workload,act_out_user_workload,act_inner_user_workload,plan_nouser_at,act_nouser_at,id,branch_name
-
+
and res.task_type = #{taskType}
@@ -137,7 +146,7 @@
and res.act_amount = #{actAmount}
and res.branch_id = #{branchId}
and res.biz_date = #{bizDate}
- and TO_CHAR(res.calc_time,'YYYY-MM-DD') = TO_CHAR(#{calcTime},'YYYY-MM-DD')
+ and date_format(res.calc_time,'%Y-%m-%d') = date_format(#{calcTime},'%Y-%m-%d')
and res.plan_out_user_at = #{planOutUserAt}
and res.plan_inner_user_at = #{planInnerUserAt}
and res.act_out_user_at = #{actOutUserAt}
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationStateMapper.xml
index 38e681de..da875195 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationStateMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationStateMapper.xml
@@ -45,7 +45,13 @@
where
res.iteration_id = #{iterationId}
-
+
-
+
@@ -257,7 +263,7 @@
- menu_id,menu_name,pmenu_id,product_id,remark,status,online,demand_url,code_url,design_url,doc_url,help_url,oper_doc_url,seq_no,mm_userid,mm_username,ctime,ntype,since_version,children_cnt,ltime,tag_ids,tag_names,pid_paths,lvl,is_tpl,budget_hours,budget_staff_nu,budget_workload,budget_amount,phase_id,iteration_id,calc_type
+ menu_id,menu_name,pmenu_id,product_id,remark,status,online,demand_url,code_url,design_url,doc_url,help_url,oper_doc_url,seq_no,mm_userid,mm_username,ctime,ntype,since_version,children_cnt,ltime,tag_ids,tag_names,pid_paths,lvl,is_tpl,budget_hours,budget_staff_nu,budget_workload,budget_amount,phase_id,iteration_id,calc_type,mact_workload,mact_amount,mact_rate
@@ -295,6 +301,9 @@
and res.phase_id = #{phaseId}
and res.iteration_id = #{iterationId}
and res.calc_type = #{calcType}
+ and res.mact_workload = #{mactWorkload}
+ and res.mact_amount = #{mactAmount}
+ and res.mact_rate = #{mactRate}
@@ -329,7 +338,10 @@
budget_amount = #{budgetAmount},
phase_id = #{phaseId},
iteration_id = #{iterationId},
- calc_type = #{calcType}
+ calc_type = #{calcType},
+ mact_workload = #{mactWorkload},
+ mact_amount = #{mactAmount},
+ mact_rate = #{mactRate}
menu_name = #{menuName},
@@ -364,6 +376,9 @@
phase_id = #{phaseId},
iteration_id = #{iterationId},
calc_type = #{calcType},
+ mact_workload = #{mactWorkload},
+ mact_amount = #{mactAmount},
+ mact_rate = #{mactRate},
@@ -398,6 +413,9 @@
budget_amount = #{item.budgetAmount},
phase_id = #{item.phaseId},
iteration_id = #{item.iterationId},
- calc_type = #{item.calcType}
+ calc_type = #{item.calcType},
+ mact_workload = #{item.mactWorkload},
+ mact_amount = #{item.mactAmount},
+ mact_rate = #{item.mactRate}
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuStateMapper.xml
index cec634e6..4958f565 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuStateMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuStateMapper.xml
@@ -155,7 +155,13 @@
where
res.menu_id = #{menuId}
-
+
-
+
-
+
-
+
insert into xm_project_m_budget_cost_nouser(
) values (
- #{projectId},#{budgetCost},#{id},#{remark},#{subjectId},#{bizzStartDate},#{bizzEndDate},#{bizProcInstId},#{bizFlowState},#{projectPhaseId},#{costType},#{bizzMonth}
+ #{projectId},#{budgetCost},#{id},#{remark},#{subjectId},#{bizzStartDate},#{bizzEndDate},#{bizProcInstId},#{bizFlowState},#{phaseId},#{costType},#{bizzMonth},#{subjectName}
)
@@ -156,13 +162,13 @@
- delete from xm_project_m_budget_cost_nouser
+ delete from xm_project_m_budget_cost_nouser
where id = #{id}
- update xm_project_m_budget_cost_nouser
+ update xm_project_m_budget_cost_nouser
@@ -171,7 +177,7 @@
- update xm_project_m_budget_cost_nouser
+ update xm_project_m_budget_cost_nouser
@@ -186,7 +192,7 @@
- update xm_project_m_budget_cost_nouser
+ update xm_project_m_budget_cost_nouser
set
where id = #{item.id}
@@ -194,19 +200,20 @@
- delete from xm_project_m_budget_cost_nouser
- where id in
-
- #{item.id }
-
+ delete from xm_project_m_budget_cost_nouser
+ where
+ (id) in
+
+ ( #{item.id} )
+
- project_id,budget_cost,id,remark,subject_id,bizz_start_date,bizz_end_date,biz_proc_inst_id,biz_flow_state,project_phase_id,cost_type,bizz_month
+ project_id,budget_cost,id,remark,subject_id,bizz_start_date,bizz_end_date,biz_proc_inst_id,biz_flow_state,phase_id,cost_type,bizz_month,subject_name
-
+
and res.project_id = #{projectId}
@@ -214,13 +221,14 @@
and res.id = #{id}
and res.remark = #{remark}
and res.subject_id = #{subjectId}
- and TO_CHAR(res.bizz_start_date,'YYYY-MM-DD') = TO_CHAR(#{bizzStartDate},'YYYY-MM-DD')
- and TO_CHAR(res.bizz_end_date,'YYYY-MM-DD') = TO_CHAR(#{bizzEndDate},'YYYY-MM-DD')
+ and date_format(res.bizz_start_date,'%Y-%m-%d') = date_format(#{bizzStartDate},'%Y-%m-%d')
+ and date_format(res.bizz_end_date,'%Y-%m-%d') = date_format(#{bizzEndDate},'%Y-%m-%d')
and res.biz_proc_inst_id = #{bizProcInstId}
and res.biz_flow_state = #{bizFlowState}
- and res.project_phase_id = #{projectPhaseId}
+ and res.phase_id = #{phaseId}
and res.cost_type = #{costType}
and res.bizz_month = #{bizzMonth}
+ and res.subject_name = #{subjectName}
@@ -232,9 +240,10 @@
bizz_end_date = #{bizzEndDate},
biz_proc_inst_id = #{bizProcInstId},
biz_flow_state = #{bizFlowState},
- project_phase_id = #{projectPhaseId},
+ phase_id = #{phaseId},
cost_type = #{costType},
- bizz_month = #{bizzMonth}
+ bizz_month = #{bizzMonth},
+ subject_name = #{subjectName}
project_id = #{projectId},
@@ -245,9 +254,10 @@
bizz_end_date = #{bizzEndDate},
biz_proc_inst_id = #{bizProcInstId},
biz_flow_state = #{bizFlowState},
- project_phase_id = #{projectPhaseId},
+ phase_id = #{phaseId},
cost_type = #{costType},
bizz_month = #{bizzMonth},
+ subject_name = #{subjectName},
@@ -259,8 +269,9 @@
bizz_end_date = #{item.bizzEndDate},
biz_proc_inst_id = #{item.bizProcInstId},
biz_flow_state = #{item.bizFlowState},
- project_phase_id = #{item.projectPhaseId},
+ phase_id = #{item.phaseId},
cost_type = #{item.costType},
- bizz_month = #{item.bizzMonth}
+ bizz_month = #{item.bizzMonth},
+ subject_name = #{item.subjectName}
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostUserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostUserMapper.xml
index f0fda5c9..32cbf3f4 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostUserMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostUserMapper.xml
@@ -3,114 +3,116 @@
-
-
-
-
+
+
+
+ and (res.id) in
+
+ ( #{item})
+
+
+
+
+
+ parameterType="HashMap"
+ useGeneratedKeys="false" keyProperty="id">
insert into xm_project_m_budget_cost_user_process_approva (
- id,budget_id,project_id,flow_branch_id,agree,act_id,task_name,proc_inst_id,main_title,comment_msg,flow_last_time,event_name,biz_key,model_key,assignee,start_userid,proc_def_id
+ id,budget_id,project_id,flow_branch_id,agree,act_id,task_name,proc_inst_id,main_title,comment_msg,flow_last_time,event_name,biz_key,model_key,assignee,start_userid,proc_def_id
) values (
- #{id},#{budgetId},#{projectId},#{flowBranchId},#{agree},#{actId},#{taskName},#{procInstId},#{mainTitle},#{commentMsg},#{flowLastTime},#{eventName},#{bizKey},#{modelKey},#{assignee},#{startUserid},#{procDefId}
+ #{id},#{budgetId},#{projectId},#{flowBranchId},#{agree},#{actId},#{taskName},#{procInstId},#{mainTitle},#{commentMsg},#{flowLastTime},#{eventName},#{bizKey},#{modelKey},#{assignee},#{startUserid},#{procDefId}
)
-
-
+
+
+ parameterType="HashMap">
update xm_project_m_budget_cost_user b ,XM.xm_project_m_budget_cost_user_process_approva pa
-
- pa.agree = #{agree},
- pa.act_id = #{actId},
- pa.assignee = #{assignee},
- pa.assignee_name = #{assigneeName},
- pa.task_name = #{taskName},
- pa.comment_msg = #{commentMsg},
- pa.flow_last_time = now(),
- pa.event_name = #{eventName},
- pa.flow_state=#{flowState},
- b.biz_flow_state=#{bizFlowState},
- b.biz_proc_inst_id=#{bizProcInstId},
-
+
+ pa.agree = #{agree},
+ pa.act_id = #{actId},
+ pa.assignee = #{assignee},
+ pa.assignee_name = #{assigneeName},
+ pa.task_name = #{taskName},
+ pa.comment_msg = #{commentMsg},
+ pa.flow_last_time = now(),
+ pa.event_name = #{eventName},
+ pa.flow_state=#{flowState},
+ b.biz_flow_state=#{bizFlowState},
+ b.biz_proc_inst_id=#{bizProcInstId},
+
where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
- and b.id=pa.budget_id
-
-
+ and b.id=pa.budget_id
+
+
+ parameterType="HashMap">
update xm_project_m_budget_cost_user_process_approva pa set pa.flow_state='2'
where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
-
-
+
+
delete from xm_project_m_budget_cost_user
- where biz_proc_inst_id=#{procInstId}
+ where biz_proc_inst_id=#{procInstId}
-
+
-
-
+
+
-
+
+
-
+
-
+
insert into xm_project_m_budget_cost_user(
) values (
- #{projectId},#{userid},#{budgetCost},#{id},#{remark},#{username},#{subjectId},#{bizzStartDate},#{bizzEndDate},#{bizzMonth},#{bizProcInstId},#{bizFlowState},#{projectPhaseId},#{costType}
+ #{projectId},#{userid},#{budgetCost},#{id},#{remark},#{username},#{subjectId},#{bizzStartDate},#{bizzEndDate},#{bizzMonth},#{bizProcInstId},#{bizFlowState},#{phaseId},#{costType},#{subjectName}
)
@@ -158,13 +166,13 @@
- delete from xm_project_m_budget_cost_user
+ delete from xm_project_m_budget_cost_user
where id = #{id}
- update xm_project_m_budget_cost_user
+ update xm_project_m_budget_cost_user
@@ -173,7 +181,7 @@
- update xm_project_m_budget_cost_user
+ update xm_project_m_budget_cost_user
@@ -188,7 +196,7 @@
- update xm_project_m_budget_cost_user
+ update xm_project_m_budget_cost_user
set
where id = #{item.id}
@@ -196,19 +204,20 @@
- delete from xm_project_m_budget_cost_user
- where id in
-
- #{item.id }
-
+ delete from xm_project_m_budget_cost_user
+ where
+ (id) in
+
+ ( #{item.id} )
+
- project_id,userid,budget_cost,id,remark,username,subject_id,bizz_start_date,bizz_end_date,bizz_month,biz_proc_inst_id,biz_flow_state,project_phase_id,cost_type
+ project_id,userid,budget_cost,id,remark,username,subject_id,bizz_start_date,bizz_end_date,bizz_month,biz_proc_inst_id,biz_flow_state,phase_id,cost_type,subject_name
-
+
and res.project_id = #{projectId}
@@ -218,13 +227,14 @@
and res.remark = #{remark}
and res.username = #{username}
and res.subject_id = #{subjectId}
- and TO_CHAR(res.bizz_start_date,'YYYY-MM-DD') = TO_CHAR(#{bizzStartDate},'YYYY-MM-DD')
- and TO_CHAR(res.bizz_end_date,'YYYY-MM-DD') = TO_CHAR(#{bizzEndDate},'YYYY-MM-DD')
+ and date_format(res.bizz_start_date,'%Y-%m-%d') = date_format(#{bizzStartDate},'%Y-%m-%d')
+ and date_format(res.bizz_end_date,'%Y-%m-%d') = date_format(#{bizzEndDate},'%Y-%m-%d')
and res.bizz_month = #{bizzMonth}
and res.biz_proc_inst_id = #{bizProcInstId}
and res.biz_flow_state = #{bizFlowState}
- and res.project_phase_id = #{projectPhaseId}
+ and res.phase_id = #{phaseId}
and res.cost_type = #{costType}
+ and res.subject_name = #{subjectName}
@@ -239,8 +249,9 @@
bizz_month = #{bizzMonth},
biz_proc_inst_id = #{bizProcInstId},
biz_flow_state = #{bizFlowState},
- project_phase_id = #{projectPhaseId},
- cost_type = #{costType}
+ phase_id = #{phaseId},
+ cost_type = #{costType},
+ subject_name = #{subjectName}
project_id = #{projectId},
@@ -254,8 +265,9 @@
bizz_month = #{bizzMonth},
biz_proc_inst_id = #{bizProcInstId},
biz_flow_state = #{bizFlowState},
- project_phase_id = #{projectPhaseId},
+ phase_id = #{phaseId},
cost_type = #{costType},
+ subject_name = #{subjectName},
@@ -270,7 +282,8 @@
bizz_month = #{item.bizzMonth},
biz_proc_inst_id = #{item.bizProcInstId},
biz_flow_state = #{item.bizFlowState},
- project_phase_id = #{item.projectPhaseId},
- cost_type = #{item.costType}
+ phase_id = #{item.phaseId},
+ cost_type = #{item.costType},
+ subject_name = #{item.subjectName}
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostNouserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostNouserMapper.xml
index 2db1af75..baa5ec22 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostNouserMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostNouserMapper.xml
@@ -3,109 +3,108 @@
-
-
-
+
+
+
+ and (res.id) in
+
+ ( #{item})
+
+
+
+
-
+ parameterType="HashMap"
+ useGeneratedKeys="false" keyProperty="id">
insert into xm_project_m_cost_nouser_process_approva (
- id,cost_id,project_id,flow_branch_id,agree,act_id,task_name,proc_inst_id,main_title,comment_msg,flow_last_time,event_name,biz_key,model_key,assignee,start_userid,proc_def_id
+ id,cost_id,project_id,flow_branch_id,agree,act_id,task_name,proc_inst_id,main_title,comment_msg,flow_last_time,event_name,biz_key,model_key,assignee,start_userid,proc_def_id
) values (
- #{id},#{costId},#{projectId},#{flowBranchId},#{agree},#{actId},#{taskName},#{procInstId},#{mainTitle},#{commentMsg},#{flowLastTime},#{eventName},#{bizKey},#{modelKey},#{assignee},#{startUserid},#{procDefId}
+ #{id},#{costId},#{projectId},#{flowBranchId},#{agree},#{actId},#{taskName},#{procInstId},#{mainTitle},#{commentMsg},#{flowLastTime},#{eventName},#{bizKey},#{modelKey},#{assignee},#{startUserid},#{procDefId}
)
-
-
+
+
+ parameterType="HashMap">
update xm_project_m_cost_nouser b ,XM.xm_project_m_cost_nouser_process_approva pa
-
- pa.agree = #{agree},
- pa.act_id = #{actId},
- pa.assignee = #{assignee},
- pa.assignee_name = #{assigneeName},
- pa.task_name = #{taskName},
- pa.comment_msg = #{commentMsg},
- pa.flow_last_time = now(),
- pa.event_name = #{eventName},
- pa.flow_state=#{flowState},
- b.biz_flow_state=#{bizFlowState},
- b.biz_proc_inst_id=#{bizProcInstId},
-
+
+ pa.agree = #{agree},
+ pa.act_id = #{actId},
+ pa.assignee = #{assignee},
+ pa.assignee_name = #{assigneeName},
+ pa.task_name = #{taskName},
+ pa.comment_msg = #{commentMsg},
+ pa.flow_last_time = now(),
+ pa.event_name = #{eventName},
+ pa.flow_state=#{flowState},
+ b.biz_flow_state=#{bizFlowState},
+ b.biz_proc_inst_id=#{bizProcInstId},
+
where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
- and b.id=pa.cost_id
-
-
+ and b.id=pa.cost_id
+
+
+ parameterType="HashMap">
update xm_project_m_cost_nouser_process_approva pa set pa.flow_state='2'
where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
-
-
+
+
delete from xm_project_m_cost_nouser
- where biz_proc_inst_id=#{procInstId}
+ where biz_proc_inst_id=#{procInstId}
-
+
-
+
-
+
@@ -123,7 +122,13 @@
where
res.id = #{id}
-
+
-
+
insert into xm_project_m_cost_nouser(
) values (
- #{projectId},#{userid},#{createTime},#{sendCostTime},#{username},#{projectName},#{remark},#{id},#{taskId},#{taskName},#{subjectId},#{bizzStartDate},#{bizzEndDate},#{bizProcInstId},#{bizFlowState},#{projectPhaseId},#{actCostAmount},#{costType},#{bizMonth},#{bizDate},#{subjectName},#{projectName}
+ #{projectId},#{userid},#{createTime},#{sendCostTime},#{username},#{projectName},#{remark},#{id},#{taskId},#{taskName},#{subjectId},#{bizzStartDate},#{bizzEndDate},#{bizProcInstId},#{bizFlowState},#{phaseId},#{actCostAmount},#{costType},#{bizMonth},#{bizDate},#{subjectName},#{phaseName}
)
@@ -156,13 +161,13 @@
- delete from xm_project_m_cost_nouser
+ delete from xm_project_m_cost_nouser
where id = #{id}
- update xm_project_m_cost_nouser
+ update xm_project_m_cost_nouser
@@ -171,7 +176,7 @@
- update xm_project_m_cost_nouser
+ update xm_project_m_cost_nouser
@@ -186,7 +191,7 @@
- update xm_project_m_cost_nouser
+ update xm_project_m_cost_nouser
set
where id = #{item.id}
@@ -194,25 +199,26 @@
- delete from xm_project_m_cost_nouser
- where id in
-
- #{item.id }
-
+ delete from xm_project_m_cost_nouser
+ where
+ (id) in
+
+ ( #{item.id} )
+
- project_id,userid,create_time,send_cost_time,username,project_name,remark,id,task_id,task_name,subject_id,bizz_start_date,bizz_end_date,biz_proc_inst_id,biz_flow_state,project_phase_id,act_cost_amount,cost_type,biz_month,biz_date,subject_name,project_phase_name
+ project_id,userid,create_time,send_cost_time,username,project_name,remark,id,task_id,task_name,subject_id,bizz_start_date,bizz_end_date,biz_proc_inst_id,biz_flow_state,phase_id,act_cost_amount,cost_type,biz_month,biz_date,subject_name,phase_name
-
+
and res.project_id = #{projectId}
and res.userid = #{userid}
- and TO_CHAR(res.create_time,'YYYY-MM-DD') = TO_CHAR(#{createTime},'YYYY-MM-DD')
- and TO_CHAR(res.send_cost_time,'YYYY-MM-DD') = TO_CHAR(#{sendCostTime},'YYYY-MM-DD')
+ and date_format(res.create_time,'%Y-%m-%d') = date_format(#{createTime},'%Y-%m-%d')
+ and date_format(res.send_cost_time,'%Y-%m-%d') = date_format(#{sendCostTime},'%Y-%m-%d')
and res.username = #{username}
and res.project_name = #{projectName}
and res.remark = #{remark}
@@ -220,17 +226,17 @@
and res.task_id = #{taskId}
and res.task_name = #{taskName}
and res.subject_id = #{subjectId}
- and TO_CHAR(res.bizz_start_date,'YYYY-MM-DD') = TO_CHAR(#{bizzStartDate},'YYYY-MM-DD')
- and TO_CHAR(res.bizz_end_date,'YYYY-MM-DD') = TO_CHAR(#{bizzEndDate},'YYYY-MM-DD')
+ and date_format(res.bizz_start_date,'%Y-%m-%d') = date_format(#{bizzStartDate},'%Y-%m-%d')
+ and date_format(res.bizz_end_date,'%Y-%m-%d') = date_format(#{bizzEndDate},'%Y-%m-%d')
and res.biz_proc_inst_id = #{bizProcInstId}
and res.biz_flow_state = #{bizFlowState}
- and res.project_phase_id = #{projectPhaseId}
+ and res.phase_id = #{phaseId}
and res.act_cost_amount = #{actCostAmount}
and res.cost_type = #{costType}
and res.biz_month = #{bizMonth}
and res.biz_date = #{bizDate}
and res.subject_name = #{subjectName}
- and res.project_phase_name = #{projectName}
+ and res.phase_name = #{phaseName}
@@ -248,13 +254,13 @@
bizz_end_date = #{bizzEndDate},
biz_proc_inst_id = #{bizProcInstId},
biz_flow_state = #{bizFlowState},
- project_phase_id = #{projectPhaseId},
+ phase_id = #{phaseId},
act_cost_amount = #{actCostAmount},
cost_type = #{costType},
biz_month = #{bizMonth},
biz_date = #{bizDate},
subject_name = #{subjectName},
- project_phase_name = #{projectName}
+ phase_name = #{phaseName}
project_id = #{projectId},
@@ -271,13 +277,13 @@
bizz_end_date = #{bizzEndDate},
biz_proc_inst_id = #{bizProcInstId},
biz_flow_state = #{bizFlowState},
- project_phase_id = #{projectPhaseId},
+ phase_id = #{phaseId},
act_cost_amount = #{actCostAmount},
cost_type = #{costType},
biz_month = #{bizMonth},
biz_date = #{bizDate},
subject_name = #{subjectName},
- project_phase_name = #{projectName},
+ phase_name = #{phaseName},
@@ -295,12 +301,12 @@
bizz_end_date = #{item.bizzEndDate},
biz_proc_inst_id = #{item.bizProcInstId},
biz_flow_state = #{item.bizFlowState},
- project_phase_id = #{item.projectPhaseId},
+ phase_id = #{item.phaseId},
act_cost_amount = #{item.actCostAmount},
cost_type = #{item.costType},
biz_month = #{item.bizMonth},
biz_date = #{item.bizDate},
subject_name = #{item.subjectName},
- project_phase_name = #{item.projectName}
+ phase_name = #{item.phaseName}
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostUserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostUserMapper.xml
index 1e65d75d..923eb5c4 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostUserMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostUserMapper.xml
@@ -3,150 +3,149 @@
-
-
-
+
+
+
+ and (res.id) in
+
+ ( #{item})
+
+
+
+
-
+ parameterType="HashMap"
+ useGeneratedKeys="false" keyProperty="id">
insert into xm_project_m_cost_user_process_approva (
- id,cost_id,project_id,flow_branch_id,agree,act_id,task_name,proc_inst_id,main_title,comment_msg,flow_last_time,event_name,biz_key,model_key,assignee,start_userid,proc_def_id
+ id,cost_id,project_id,flow_branch_id,agree,act_id,task_name,proc_inst_id,main_title,comment_msg,flow_last_time,event_name,biz_key,model_key,assignee,start_userid,proc_def_id
) values (
- #{id},#{costId},#{projectId},#{flowBranchId},#{agree},#{actId},#{taskName},#{procInstId},#{mainTitle},#{commentMsg},#{flowLastTime},#{eventName},#{bizKey},#{modelKey},#{assignee},#{startUserid},#{procDefId}
+ #{id},#{costId},#{projectId},#{flowBranchId},#{agree},#{actId},#{taskName},#{procInstId},#{mainTitle},#{commentMsg},#{flowLastTime},#{eventName},#{bizKey},#{modelKey},#{assignee},#{startUserid},#{procDefId}
)
-
-
+
+
+ parameterType="HashMap">
update xm_project_m_cost_user b ,XM.xm_project_m_cost_user_process_approva pa
-
- pa.agree = #{agree},
- pa.act_id = #{actId},
- pa.assignee = #{assignee},
- pa.assignee_name = #{assigneeName},
- pa.task_name = #{taskName},
- pa.comment_msg = #{commentMsg},
- pa.flow_last_time = now(),
- pa.event_name = #{eventName},
- pa.flow_state=#{flowState},
- b.biz_flow_state=#{bizFlowState},
- b.biz_proc_inst_id=#{bizProcInstId},
-
+
+ pa.agree = #{agree},
+ pa.act_id = #{actId},
+ pa.assignee = #{assignee},
+ pa.assignee_name = #{assigneeName},
+ pa.task_name = #{taskName},
+ pa.comment_msg = #{commentMsg},
+ pa.flow_last_time = now(),
+ pa.event_name = #{eventName},
+ pa.flow_state=#{flowState},
+ b.biz_flow_state=#{bizFlowState},
+ b.biz_proc_inst_id=#{bizProcInstId},
+
where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
- and b.id=pa.cost_id
-
-
+ and b.id=pa.cost_id
+
+
+ parameterType="HashMap">
update xm_project_m_cost_user_process_approva pa set pa.flow_state='2'
where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
-
-
+
+
delete from xm_project_m_cost_user
- where biz_proc_inst_id=#{procInstId}
+ where biz_proc_inst_id=#{procInstId}
-
+
+ parameterType="HashMap">
update xm_project_m_cost_user pa set pa.execuser_status=#{execuserStatus}
- where pa.execuser_proc_inst_id = #{execuserProcInstId}
-
-
+ where pa.execuser_proc_inst_id = #{execuserProcInstId}
+
+
delete from xm_project_m_cost_user
- where execuser_proc_inst_id=#{execuserProcInstId}
+ where execuser_proc_inst_id=#{execuserProcInstId}
-
+
-
-
+
+
-
+
+
-
+
-
+
insert into xm_project_m_cost_user(
) values (
- #{subjectId},#{projectId},#{userid},#{createTime},#{sendCostTime},#{username},#{projectName},#{remark},#{id},#{taskId},#{taskName},#{actWorkload},#{bizzStartDate},#{bizzEndDate},#{bizProcInstId},#{bizFlowState},#{projectPhaseId},#{actCostAmount},#{costType},#{bizMonth},#{bizDate},#{subjectName},#{projectName},#{execuserProcInstId},#{execuserStatus},#{payStatus},#{payOpUserid},#{payOpUsername}
+ #{subjectId},#{projectId},#{userid},#{createTime},#{sendCostTime},#{username},#{projectName},#{remark},#{id},#{taskId},#{taskName},#{actWorkload},#{bizzStartDate},#{bizzEndDate},#{bizProcInstId},#{bizFlowState},#{phaseId},#{actCostAmount},#{costType},#{bizMonth},#{bizDate},#{subjectName},#{phaseName},#{execuserProcInstId},#{execuserStatus},#{payStatus},#{payOpUserid},#{payOpUsername}
)
@@ -195,13 +200,13 @@
- delete from xm_project_m_cost_user
+ delete from xm_project_m_cost_user
where id = #{id}
- update xm_project_m_cost_user
+ update xm_project_m_cost_user
@@ -210,7 +215,7 @@
- update xm_project_m_cost_user
+ update xm_project_m_cost_user
@@ -225,7 +230,7 @@
- update xm_project_m_cost_user
+ update xm_project_m_cost_user
set
where id = #{item.id}
@@ -233,26 +238,27 @@
- delete from xm_project_m_cost_user
- where id in
-
- #{item.id }
-
+ delete from xm_project_m_cost_user
+ where
+ (id) in
+
+ ( #{item.id} )
+
- subject_id,project_id,userid,create_time,send_cost_time,username,project_name,remark,id,task_id,task_name,act_workload,bizz_start_date,bizz_end_date,biz_proc_inst_id,biz_flow_state,project_phase_id,act_cost_amount,cost_type,biz_month,biz_date,subject_name,project_phase_name,execuser_proc_inst_id,execuser_status,pay_status,pay_op_userid,pay_op_username
+ subject_id,project_id,userid,create_time,send_cost_time,username,project_name,remark,id,task_id,task_name,act_workload,bizz_start_date,bizz_end_date,biz_proc_inst_id,biz_flow_state,phase_id,act_cost_amount,cost_type,biz_month,biz_date,subject_name,phase_name,execuser_proc_inst_id,execuser_status,pay_status,pay_op_userid,pay_op_username
-
+
and res.subject_id = #{subjectId}
and res.project_id = #{projectId}
and res.userid = #{userid}
- and TO_CHAR(res.create_time,'YYYY-MM-DD') = TO_CHAR(#{createTime},'YYYY-MM-DD')
- and TO_CHAR(res.send_cost_time,'YYYY-MM-DD') = TO_CHAR(#{sendCostTime},'YYYY-MM-DD')
+ and date_format(res.create_time,'%Y-%m-%d') = date_format(#{createTime},'%Y-%m-%d')
+ and date_format(res.send_cost_time,'%Y-%m-%d') = date_format(#{sendCostTime},'%Y-%m-%d')
and res.username = #{username}
and res.project_name = #{projectName}
and res.remark = #{remark}
@@ -260,17 +266,17 @@
and res.task_id = #{taskId}
and res.task_name = #{taskName}
and res.act_workload = #{actWorkload}
- and TO_CHAR(res.bizz_start_date,'YYYY-MM-DD') = TO_CHAR(#{bizzStartDate},'YYYY-MM-DD')
- and TO_CHAR(res.bizz_end_date,'YYYY-MM-DD') = TO_CHAR(#{bizzEndDate},'YYYY-MM-DD')
+ and date_format(res.bizz_start_date,'%Y-%m-%d') = date_format(#{bizzStartDate},'%Y-%m-%d')
+ and date_format(res.bizz_end_date,'%Y-%m-%d') = date_format(#{bizzEndDate},'%Y-%m-%d')
and res.biz_proc_inst_id = #{bizProcInstId}
and res.biz_flow_state = #{bizFlowState}
- and res.project_phase_id = #{projectPhaseId}
+ and res.phase_id = #{phaseId}
and res.act_cost_amount = #{actCostAmount}
and res.cost_type = #{costType}
and res.biz_month = #{bizMonth}
and res.biz_date = #{bizDate}
and res.subject_name = #{subjectName}
- and res.project_phase_name = #{projectName}
+ and res.phase_name = #{phaseName}
and res.execuser_proc_inst_id = #{execuserProcInstId}
and res.execuser_status = #{execuserStatus}
and res.pay_status = #{payStatus}
@@ -294,13 +300,13 @@
bizz_end_date = #{bizzEndDate},
biz_proc_inst_id = #{bizProcInstId},
biz_flow_state = #{bizFlowState},
- project_phase_id = #{projectPhaseId},
+ phase_id = #{phaseId},
act_cost_amount = #{actCostAmount},
cost_type = #{costType},
biz_month = #{bizMonth},
biz_date = #{bizDate},
subject_name = #{subjectName},
- project_phase_name = #{projectName},
+ phase_name = #{phaseName},
execuser_proc_inst_id = #{execuserProcInstId},
execuser_status = #{execuserStatus},
pay_status = #{payStatus},
@@ -323,13 +329,13 @@
bizz_end_date = #{bizzEndDate},
biz_proc_inst_id = #{bizProcInstId},
biz_flow_state = #{bizFlowState},
- project_phase_id = #{projectPhaseId},
+ phase_id = #{phaseId},
act_cost_amount = #{actCostAmount},
cost_type = #{costType},
biz_month = #{bizMonth},
biz_date = #{bizDate},
subject_name = #{subjectName},
- project_phase_name = #{projectName},
+ phase_name = #{phaseName},
execuser_proc_inst_id = #{execuserProcInstId},
execuser_status = #{execuserStatus},
pay_status = #{payStatus},
@@ -353,13 +359,13 @@
bizz_end_date = #{item.bizzEndDate},
biz_proc_inst_id = #{item.bizProcInstId},
biz_flow_state = #{item.bizFlowState},
- project_phase_id = #{item.projectPhaseId},
+ phase_id = #{item.phaseId},
act_cost_amount = #{item.actCostAmount},
cost_type = #{item.costType},
biz_month = #{item.bizMonth},
biz_date = #{item.bizDate},
subject_name = #{item.subjectName},
- project_phase_name = #{item.projectName},
+ phase_name = #{item.phaseName},
execuser_proc_inst_id = #{item.execuserProcInstId},
execuser_status = #{item.execuserStatus},
pay_status = #{item.payStatus},
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
index 171dfc7d..2673b6ab 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
@@ -172,7 +172,7 @@
insert into xm_project(
) values (
- #{id},#{code},#{name},#{xmType},#{startTime},#{endTime},#{urgent},#{priority},#{description},#{createUserid},#{createUsername},#{createTime},#{assess},#{assessRemarks},#{status},#{branchId},#{planTotalCost},#{bizProcInstId},#{bizFlowState},#{planNouserAt},#{planInnerUserAt},#{planOutUserAt},#{locked},#{baseTime},#{baseRemark},#{baselineId},#{planWorkload},#{totalReceivables},#{budgetMarginRate},#{contractAmt},#{planInnerUserPrice},#{planOutUserPrice},#{planOutUserCnt},#{planInnerUserCnt},#{planWorkingHours},#{taxRate},#{planInnerUserWorkload},#{planOutUserWorkload},#{fromTplId},#{budgetCtrl},#{deptid},#{showOut},#{isTpl},#{pmUserid},#{pmUsername},#{assUserid},#{assUsername},#{admUserid},#{admUsername},#{phaseBudgetCtrl},#{phaseActCtrl},#{del},#{ltime}
+ #{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}
)
@@ -235,7 +235,7 @@
- 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_inner_user_at,plan_out_user_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_inner_user_price,plan_out_user_price,plan_out_user_cnt,plan_inner_user_cnt,plan_working_hours,tax_rate,plan_inner_user_workload,plan_out_user_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
+ 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
@@ -260,8 +260,8 @@
and res.biz_proc_inst_id = #{bizProcInstId}
and res.biz_flow_state = #{bizFlowState}
and res.plan_nouser_at = #{planNouserAt}
- and res.plan_inner_user_at = #{planInnerUserAt}
- and res.plan_out_user_at = #{planOutUserAt}
+ and res.plan_iuser_at = #{planIuserAt}
+ and res.plan_ouser_at = #{planOuserAt}
and res.locked = #{locked}
and date_format(res.base_time,'%Y-%m-%d') = date_format(#{baseTime},'%Y-%m-%d')
and res.base_remark = #{baseRemark}
@@ -270,14 +270,14 @@
and res.total_receivables = #{totalReceivables}
and res.budget_margin_rate = #{budgetMarginRate}
and res.contract_amt = #{contractAmt}
- and res.plan_inner_user_price = #{planInnerUserPrice}
- and res.plan_out_user_price = #{planOutUserPrice}
- and res.plan_out_user_cnt = #{planOutUserCnt}
- and res.plan_inner_user_cnt = #{planInnerUserCnt}
+ and res.plan_iuser_price = #{planIuserPrice}
+ and res.plan_ouser_price = #{planOuserPrice}
+ and res.plan_ouser_cnt = #{planOuserCnt}
+ and res.plan_iuser_cnt = #{planIuserCnt}
and res.plan_working_hours = #{planWorkingHours}
and res.tax_rate = #{taxRate}
- and res.plan_inner_user_workload = #{planInnerUserWorkload}
- and res.plan_out_user_workload = #{planOutUserWorkload}
+ and res.plan_iuser_workload = #{planIuserWorkload}
+ and res.plan_ouser_workload = #{planOuserWorkload}
and res.from_tpl_id = #{fromTplId}
and res.budget_ctrl = #{budgetCtrl}
and res.deptid = #{deptid}
@@ -315,8 +315,8 @@
biz_proc_inst_id = #{bizProcInstId},
biz_flow_state = #{bizFlowState},
plan_nouser_at = #{planNouserAt},
- plan_inner_user_at = #{planInnerUserAt},
- plan_out_user_at = #{planOutUserAt},
+ plan_iuser_at = #{planIuserAt},
+ plan_ouser_at = #{planOuserAt},
locked = #{locked},
base_time = #{baseTime},
base_remark = #{baseRemark},
@@ -325,14 +325,14 @@
total_receivables = #{totalReceivables},
budget_margin_rate = #{budgetMarginRate},
contract_amt = #{contractAmt},
- plan_inner_user_price = #{planInnerUserPrice},
- plan_out_user_price = #{planOutUserPrice},
- plan_out_user_cnt = #{planOutUserCnt},
- plan_inner_user_cnt = #{planInnerUserCnt},
+ plan_iuser_price = #{planIuserPrice},
+ plan_ouser_price = #{planOuserPrice},
+ plan_ouser_cnt = #{planOuserCnt},
+ plan_iuser_cnt = #{planIuserCnt},
plan_working_hours = #{planWorkingHours},
tax_rate = #{taxRate},
- plan_inner_user_workload = #{planInnerUserWorkload},
- plan_out_user_workload = #{planOutUserWorkload},
+ plan_iuser_workload = #{planIuserWorkload},
+ plan_ouser_workload = #{planOuserWorkload},
from_tpl_id = #{fromTplId},
budget_ctrl = #{budgetCtrl},
deptid = #{deptid},
@@ -369,8 +369,8 @@
biz_proc_inst_id = #{bizProcInstId},
biz_flow_state = #{bizFlowState},
plan_nouser_at = #{planNouserAt},
- plan_inner_user_at = #{planInnerUserAt},
- plan_out_user_at = #{planOutUserAt},
+ plan_iuser_at = #{planIuserAt},
+ plan_ouser_at = #{planOuserAt},
locked = #{locked},
base_time = #{baseTime},
base_remark = #{baseRemark},
@@ -379,14 +379,14 @@
total_receivables = #{totalReceivables},
budget_margin_rate = #{budgetMarginRate},
contract_amt = #{contractAmt},
- plan_inner_user_price = #{planInnerUserPrice},
- plan_out_user_price = #{planOutUserPrice},
- plan_out_user_cnt = #{planOutUserCnt},
- plan_inner_user_cnt = #{planInnerUserCnt},
+ plan_iuser_price = #{planIuserPrice},
+ plan_ouser_price = #{planOuserPrice},
+ plan_ouser_cnt = #{planOuserCnt},
+ plan_iuser_cnt = #{planIuserCnt},
plan_working_hours = #{planWorkingHours},
tax_rate = #{taxRate},
- plan_inner_user_workload = #{planInnerUserWorkload},
- plan_out_user_workload = #{planOutUserWorkload},
+ plan_iuser_workload = #{planIuserWorkload},
+ plan_ouser_workload = #{planOuserWorkload},
from_tpl_id = #{fromTplId},
budget_ctrl = #{budgetCtrl},
deptid = #{deptid},
@@ -424,8 +424,8 @@
biz_proc_inst_id = #{item.bizProcInstId},
biz_flow_state = #{item.bizFlowState},
plan_nouser_at = #{item.planNouserAt},
- plan_inner_user_at = #{item.planInnerUserAt},
- plan_out_user_at = #{item.planOutUserAt},
+ plan_iuser_at = #{item.planIuserAt},
+ plan_ouser_at = #{item.planOuserAt},
locked = #{item.locked},
base_time = #{item.baseTime},
base_remark = #{item.baseRemark},
@@ -434,14 +434,14 @@
total_receivables = #{item.totalReceivables},
budget_margin_rate = #{item.budgetMarginRate},
contract_amt = #{item.contractAmt},
- plan_inner_user_price = #{item.planInnerUserPrice},
- plan_out_user_price = #{item.planOutUserPrice},
- plan_out_user_cnt = #{item.planOutUserCnt},
- plan_inner_user_cnt = #{item.planInnerUserCnt},
+ plan_iuser_price = #{item.planIuserPrice},
+ plan_ouser_price = #{item.planOuserPrice},
+ plan_ouser_cnt = #{item.planOuserCnt},
+ plan_iuser_cnt = #{item.planIuserCnt},
plan_working_hours = #{item.planWorkingHours},
tax_rate = #{item.taxRate},
- plan_inner_user_workload = #{item.planInnerUserWorkload},
- plan_out_user_workload = #{item.planOutUserWorkload},
+ plan_iuser_workload = #{item.planIuserWorkload},
+ plan_ouser_workload = #{item.planOuserWorkload},
from_tpl_id = #{item.fromTplId},
budget_ctrl = #{item.budgetCtrl},
deptid = #{item.deptid},
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateMapper.xml
index 0d1591eb..8a7c4bde 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateMapper.xml
@@ -48,7 +48,13 @@
where
res.project_id = #{projectId}
-
+
@@ -130,7 +136,7 @@
- project_id,biz_date,total_file_cnt,total_bug_cnt,total_task_cnt,total_budget_nouser_amount,project_name,total_staff_cnt,calc_time,calc_status,total_cost_nouser_amount,total_closed_bug_cnt,total_resolved_bug_cnt,total_complete_task_cnt,total_phase_cnt,total_complete_phase_cnt,total_need_pay_amount,total_finish_pay_amount,total_need_col_amount,total_finish_col_amount,total_cost_user_amount,total_budget_inner_user_amount,total_plan_workload,total_risk_cnt,total_complete_risk_cnt,branch_id,branch_name,total_budget_out_user_amount,total_complete_workload,total_cost_inner_user_amount,total_cost_out_user_amount,total_progress,total_active_bug_cnt,total_confirmed_bug_cnt,project_status,total_act_workload,total_act_out_workload,total_act_inner_workload,total_task_budget_cost_at,total_task_out_cnt,total_need_pay_cnt,total_finish_pay_cnt,total_finish_pay_user_cnt,total_need_pay_user_cnt,total_plan_inner_user_workload,total_plan_out_user_workload,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,menu_cnt
+ project_id,biz_date,total_file_cnt,total_bug_cnt,total_task_cnt,total_budget_nouser_amount,project_name,total_staff_cnt,calc_time,calc_status,total_cost_nouser_amount,total_closed_bug_cnt,total_resolved_bug_cnt,total_complete_task_cnt,total_phase_cnt,total_complete_phase_cnt,total_need_pay_amount,total_finish_pay_amount,total_need_col_amount,total_finish_col_amount,total_cost_user_amount,total_budget_iuser_amount,total_plan_workload,total_risk_cnt,total_complete_risk_cnt,branch_id,branch_name,total_budget_ouser_amount,total_complete_workload,total_cost_iuser_amount,total_cost_ouser_amount,total_progress,total_active_bug_cnt,total_confirmed_bug_cnt,project_status,total_act_workload,total_act_out_workload,total_act_inner_workload,total_task_budget_cost_at,total_task_out_cnt,total_need_pay_cnt,total_finish_pay_cnt,total_finish_pay_user_cnt,total_need_pay_user_cnt,total_plan_iuser_workload,total_plan_ouser_workload,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,menu_cnt,finish_menu_cnt,estimate_workload,exec_task_cnt,to_start_task_cnt,exec_menu_cnt,to_start_menu_cnt
@@ -156,16 +162,16 @@
and res.total_need_col_amount = #{totalNeedColAmount}
and res.total_finish_col_amount = #{totalFinishColAmount}
and res.total_cost_user_amount = #{totalCostUserAmount}
- and res.total_budget_inner_user_amount = #{totalBudgetInnerUserAmount}
+ and res.total_budget_iuser_amount = #{totalBudgetIuserAmount}
and res.total_plan_workload = #{totalPlanWorkload}
and res.total_risk_cnt = #{totalRiskCnt}
and res.total_complete_risk_cnt = #{totalCompleteRiskCnt}
and res.branch_id = #{branchId}
and res.branch_name = #{branchName}
- and res.total_budget_out_user_amount = #{totalBudgetOutUserAmount}
+ and res.total_budget_ouser_amount = #{totalBudgetOuserAmount}
and res.total_complete_workload = #{totalCompleteWorkload}
- and res.total_cost_inner_user_amount = #{totalCostInnerUserAmount}
- and res.total_cost_out_user_amount = #{totalCostOutUserAmount}
+ and res.total_cost_iuser_amount = #{totalCostIuserAmount}
+ and res.total_cost_ouser_amount = #{totalCostOuserAmount}
and res.total_progress = #{totalProgress}
and res.total_active_bug_cnt = #{totalActiveBugCnt}
and res.total_confirmed_bug_cnt = #{totalConfirmedBugCnt}
@@ -179,8 +185,8 @@
and res.total_finish_pay_cnt = #{totalFinishPayCnt}
and res.total_finish_pay_user_cnt = #{totalFinishPayUserCnt}
and res.total_need_pay_user_cnt = #{totalNeedPayUserCnt}
- and res.total_plan_inner_user_workload = #{totalPlanInnerUserWorkload}
- and res.total_plan_out_user_workload = #{totalPlanOutUserWorkload}
+ and res.total_plan_iuser_workload = #{totalPlanIuserWorkload}
+ and res.total_plan_ouser_workload = #{totalPlanOuserWorkload}
and res.test_cases = #{testCases}
and res.exec_cases = #{execCases}
and res.design_cases = #{designCases}
@@ -188,6 +194,12 @@
and res.iteration_cnt = #{iterationCnt}
and res.product_cnt = #{productCnt}
and res.menu_cnt = #{menuCnt}
+ and res.finish_menu_cnt = #{finishMenuCnt}
+ and res.estimate_workload = #{estimateWorkload}
+ and res.exec_task_cnt = #{execTaskCnt}
+ and res.to_start_task_cnt = #{toStartTaskCnt}
+ and res.exec_menu_cnt = #{execMenuCnt}
+ and res.to_start_menu_cnt = #{toStartMenuCnt}
@@ -211,16 +223,16 @@
total_need_col_amount = #{totalNeedColAmount},
total_finish_col_amount = #{totalFinishColAmount},
total_cost_user_amount = #{totalCostUserAmount},
- total_budget_inner_user_amount = #{totalBudgetInnerUserAmount},
+ total_budget_iuser_amount = #{totalBudgetIuserAmount},
total_plan_workload = #{totalPlanWorkload},
total_risk_cnt = #{totalRiskCnt},
total_complete_risk_cnt = #{totalCompleteRiskCnt},
branch_id = #{branchId},
branch_name = #{branchName},
- total_budget_out_user_amount = #{totalBudgetOutUserAmount},
+ total_budget_ouser_amount = #{totalBudgetOuserAmount},
total_complete_workload = #{totalCompleteWorkload},
- total_cost_inner_user_amount = #{totalCostInnerUserAmount},
- total_cost_out_user_amount = #{totalCostOutUserAmount},
+ total_cost_iuser_amount = #{totalCostIuserAmount},
+ total_cost_ouser_amount = #{totalCostOuserAmount},
total_progress = #{totalProgress},
total_active_bug_cnt = #{totalActiveBugCnt},
total_confirmed_bug_cnt = #{totalConfirmedBugCnt},
@@ -234,15 +246,21 @@
total_finish_pay_cnt = #{totalFinishPayCnt},
total_finish_pay_user_cnt = #{totalFinishPayUserCnt},
total_need_pay_user_cnt = #{totalNeedPayUserCnt},
- total_plan_inner_user_workload = #{totalPlanInnerUserWorkload},
- total_plan_out_user_workload = #{totalPlanOutUserWorkload},
+ total_plan_iuser_workload = #{totalPlanIuserWorkload},
+ total_plan_ouser_workload = #{totalPlanOuserWorkload},
test_cases = #{testCases},
exec_cases = #{execCases},
design_cases = #{designCases},
finish_cases = #{finishCases},
iteration_cnt = #{iterationCnt},
product_cnt = #{productCnt},
- menu_cnt = #{menuCnt}
+ menu_cnt = #{menuCnt},
+ finish_menu_cnt = #{finishMenuCnt},
+ estimate_workload = #{estimateWorkload},
+ exec_task_cnt = #{execTaskCnt},
+ to_start_task_cnt = #{toStartTaskCnt},
+ exec_menu_cnt = #{execMenuCnt},
+ to_start_menu_cnt = #{toStartMenuCnt}
biz_date = #{bizDate},
@@ -265,16 +283,16 @@
total_need_col_amount = #{totalNeedColAmount},
total_finish_col_amount = #{totalFinishColAmount},
total_cost_user_amount = #{totalCostUserAmount},
- total_budget_inner_user_amount = #{totalBudgetInnerUserAmount},
+ total_budget_iuser_amount = #{totalBudgetIuserAmount},
total_plan_workload = #{totalPlanWorkload},
total_risk_cnt = #{totalRiskCnt},
total_complete_risk_cnt = #{totalCompleteRiskCnt},
branch_id = #{branchId},
branch_name = #{branchName},
- total_budget_out_user_amount = #{totalBudgetOutUserAmount},
+ total_budget_ouser_amount = #{totalBudgetOuserAmount},
total_complete_workload = #{totalCompleteWorkload},
- total_cost_inner_user_amount = #{totalCostInnerUserAmount},
- total_cost_out_user_amount = #{totalCostOutUserAmount},
+ total_cost_iuser_amount = #{totalCostIuserAmount},
+ total_cost_ouser_amount = #{totalCostOuserAmount},
total_progress = #{totalProgress},
total_active_bug_cnt = #{totalActiveBugCnt},
total_confirmed_bug_cnt = #{totalConfirmedBugCnt},
@@ -288,8 +306,8 @@
total_finish_pay_cnt = #{totalFinishPayCnt},
total_finish_pay_user_cnt = #{totalFinishPayUserCnt},
total_need_pay_user_cnt = #{totalNeedPayUserCnt},
- total_plan_inner_user_workload = #{totalPlanInnerUserWorkload},
- total_plan_out_user_workload = #{totalPlanOutUserWorkload},
+ total_plan_iuser_workload = #{totalPlanIuserWorkload},
+ total_plan_ouser_workload = #{totalPlanOuserWorkload},
test_cases = #{testCases},
exec_cases = #{execCases},
design_cases = #{designCases},
@@ -297,6 +315,12 @@
iteration_cnt = #{iterationCnt},
product_cnt = #{productCnt},
menu_cnt = #{menuCnt},
+ finish_menu_cnt = #{finishMenuCnt},
+ estimate_workload = #{estimateWorkload},
+ exec_task_cnt = #{execTaskCnt},
+ to_start_task_cnt = #{toStartTaskCnt},
+ exec_menu_cnt = #{execMenuCnt},
+ to_start_menu_cnt = #{toStartMenuCnt},
@@ -320,16 +344,16 @@
total_need_col_amount = #{item.totalNeedColAmount},
total_finish_col_amount = #{item.totalFinishColAmount},
total_cost_user_amount = #{item.totalCostUserAmount},
- total_budget_inner_user_amount = #{item.totalBudgetInnerUserAmount},
+ total_budget_iuser_amount = #{item.totalBudgetIuserAmount},
total_plan_workload = #{item.totalPlanWorkload},
total_risk_cnt = #{item.totalRiskCnt},
total_complete_risk_cnt = #{item.totalCompleteRiskCnt},
branch_id = #{item.branchId},
branch_name = #{item.branchName},
- total_budget_out_user_amount = #{item.totalBudgetOutUserAmount},
+ total_budget_ouser_amount = #{item.totalBudgetOuserAmount},
total_complete_workload = #{item.totalCompleteWorkload},
- total_cost_inner_user_amount = #{item.totalCostInnerUserAmount},
- total_cost_out_user_amount = #{item.totalCostOutUserAmount},
+ total_cost_iuser_amount = #{item.totalCostIuserAmount},
+ total_cost_ouser_amount = #{item.totalCostOuserAmount},
total_progress = #{item.totalProgress},
total_active_bug_cnt = #{item.totalActiveBugCnt},
total_confirmed_bug_cnt = #{item.totalConfirmedBugCnt},
@@ -343,14 +367,20 @@
total_finish_pay_cnt = #{item.totalFinishPayCnt},
total_finish_pay_user_cnt = #{item.totalFinishPayUserCnt},
total_need_pay_user_cnt = #{item.totalNeedPayUserCnt},
- total_plan_inner_user_workload = #{item.totalPlanInnerUserWorkload},
- total_plan_out_user_workload = #{item.totalPlanOutUserWorkload},
+ total_plan_iuser_workload = #{item.totalPlanIuserWorkload},
+ total_plan_ouser_workload = #{item.totalPlanOuserWorkload},
test_cases = #{item.testCases},
exec_cases = #{item.execCases},
design_cases = #{item.designCases},
finish_cases = #{item.finishCases},
iteration_cnt = #{item.iterationCnt},
product_cnt = #{item.productCnt},
- menu_cnt = #{item.menuCnt}
+ menu_cnt = #{item.menuCnt},
+ finish_menu_cnt = #{item.finishMenuCnt},
+ estimate_workload = #{item.estimateWorkload},
+ exec_task_cnt = #{item.execTaskCnt},
+ to_start_task_cnt = #{item.toStartTaskCnt},
+ exec_menu_cnt = #{item.execMenuCnt},
+ to_start_menu_cnt = #{item.toStartMenuCnt}
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml
index 1a7e71e0..009aed43 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml
@@ -3,47 +3,51 @@
-
-
-
-
+
-
+
+ and (res.id) in
+
+ ( #{item})
+
+
+
+
+ parameterType="HashMap"
+ useGeneratedKeys="false" keyProperty="id">
insert into xm_task_execuser_process_approva (
- id,execuser_id,project_id,flow_branch_id,agree,act_id,task_name,proc_inst_id,main_title,comment_msg,flow_last_time,event_name,biz_key,model_key,assignee,start_userid,proc_def_id
+ id,execuser_id,project_id,flow_branch_id,agree,act_id,task_name,proc_inst_id,main_title,comment_msg,flow_last_time,event_name,biz_key,model_key,assignee,start_userid,proc_def_id
) values (
- #{id},#{execuserId},#{projectId},#{flowBranchId},#{agree},#{actId},#{taskName},#{procInstId},#{mainTitle},#{commentMsg},#{flowLastTime},#{eventName},#{bizKey},#{modelKey},#{assignee},#{startUserid},#{procDefId}
+ #{id},#{execuserId},#{projectId},#{flowBranchId},#{agree},#{actId},#{taskName},#{procInstId},#{mainTitle},#{commentMsg},#{flowLastTime},#{eventName},#{bizKey},#{modelKey},#{assignee},#{startUserid},#{procDefId}
)
-
+
+ parameterType="HashMap">
update xm_task_execuser b ,XM.xm_task_execuser_process_approva pa
-
- pa.agree = #{agree},
- pa.act_id = #{actId},
- pa.assignee = #{assignee},
- pa.assignee_name = #{assigneeName},
- pa.task_name = #{taskName},
- pa.comment_msg = #{commentMsg},
- pa.flow_last_time = now(),
- pa.event_name = #{eventName},
- pa.flow_state=#{flowState},
- b.biz_flow_state=#{bizFlowState},
- b.biz_proc_inst_id=#{bizProcInstId},
- b.settle_status=#{settleStatus},
+
+ pa.agree = #{agree},
+ pa.act_id = #{actId},
+ pa.assignee = #{assignee},
+ pa.assignee_name = #{assigneeName},
+ pa.task_name = #{taskName},
+ pa.comment_msg = #{commentMsg},
+ pa.flow_last_time = now(),
+ pa.event_name = #{eventName},
+ pa.flow_state=#{flowState},
+ b.biz_flow_state=#{bizFlowState},
+ b.biz_proc_inst_id=#{bizProcInstId},
+ b.settle_status=#{settleStatus},
-
+
where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
- and b.id=pa.execuser_id
+ and b.id=pa.execuser_id
+ parameterType="HashMap">
update xm_task_execuser_process_approva pa set pa.flow_state='2'
where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
@@ -51,73 +55,74 @@
delete from xm_task_execuser
- where biz_proc_inst_id=#{procInstId}
+ where biz_proc_inst_id=#{procInstId}
+ parameterType="String">
UPDATE xm_task t
- left join
- (
- SELECT
- task_id,
- max(
- CASE
+ left join
+ (
+ SELECT
+ task_id,
+ max(
+ CASE
- WHEN e.STATUS != '7'
- AND e.STATUS != '0'
- AND e.STATUS != '8' THEN
- e.userid ELSE NULL
- END
- ) AS executor_userid,
- max(
- CASE
+ WHEN e.STATUS != '7'
+ AND e.STATUS != '0'
+ AND e.STATUS != '8' THEN
+ e.userid ELSE NULL
+ END
+ ) AS executor_userid,
+ max(
+ CASE
- WHEN e.STATUS != '7'
- AND e.STATUS != '0'
- AND e.STATUS != '8' THEN
- e.username ELSE NULL
- END
- ) AS executor_username,
- sum( case when e.status='3' or e.status='6' then e.settle_amount else 0 end ) as act_cost,
- sum( case when e.status='3' or e.status='6' then e.settle_workload else 0 end ) as act_workload,
- group_concat( concat( e.userid, '(', e.STATUS, ')' ) SEPARATOR ',' ) AS exe_userids,
- group_concat(
- concat(
- e.username,
- CASE
+ WHEN e.STATUS != '7'
+ AND e.STATUS != '0'
+ AND e.STATUS != '8' THEN
+ e.username ELSE NULL
+ END
+ ) AS executor_username,
+ sum( case when e.status='3' or e.status='6' then e.settle_amount else 0 end ) as act_cost,
+ sum( case when e.status='3' or e.status='6' then e.settle_workload else 0 end ) as act_workload,
+ group_concat( concat( e.userid, '(', e.STATUS, ')' ) SEPARATOR ',' ) AS exe_userids,
+ group_concat(
+ concat(
+ e.username,
+ CASE
- WHEN e.STATUS = '0' THEN
- '(候选)'
- WHEN e.STATUS = '1' THEN
- '(执行中)'
- WHEN e.STATUS = '2' THEN
- '(已提交)'
- WHEN e.STATUS = '3' THEN
- '(已验收)'
- WHEN e.STATUS = '4' THEN
- '(验收不过)'
- WHEN e.STATUS = '6' THEN
- '(已付款)'
- WHEN e.STATUS = '7' THEN
- '(放弃任务)'
- WHEN e.STATUS = '8' THEN
- '(黑名单)' ELSE '(其它)'
- END
- ) SEPARATOR ','
- ) AS exe_usernames
- FROM
- XM.xm_task_execuser e
- WHERE
- e.task_id = #{taskId} ) e1
- on t.id=e1.task_id
- SET t.exe_userids = e1.exe_userids,
- t.exe_usernames = e1.exe_usernames,
- t.executor_userid = e1.executor_userid,
- t.executor_username = e1.executor_username,
- t.act_cost=e1.act_cost,
- t.act_workload=e1.act_workload
- WHERE t.id = #{taskId}
+ WHEN e.STATUS = '0' THEN
+ '(候选)'
+ WHEN e.STATUS = '1' THEN
+ '(执行中)'
+ WHEN e.STATUS = '2' THEN
+ '(已提交)'
+ WHEN e.STATUS = '3' THEN
+ '(已验收)'
+ WHEN e.STATUS = '4' THEN
+ '(验收不过)'
+ WHEN e.STATUS = '6' THEN
+ '(已付款)'
+ WHEN e.STATUS = '7' THEN
+ '(放弃任务)'
+ WHEN e.STATUS = '8' THEN
+ '(黑名单)' ELSE '(其它)'
+ END
+ ) SEPARATOR ','
+ ) AS exe_usernames
+ FROM
+ XM.xm_task_execuser e
+ WHERE
+ e.task_id = #{taskId} ) e1
+ on t.id=e1.task_id
+ SET t.exe_userids = e1.exe_userids,
+ t.exe_usernames = e1.exe_usernames,
+ t.executor_userid = e1.executor_userid,
+ t.executor_username = e1.executor_username,
+ t.act_cost=e1.act_cost,
+ t.act_workload=e1.act_workload
+ WHERE t.id = #{taskId}
+
@@ -126,16 +131,9 @@
@@ -153,7 +151,13 @@
where
res.id = #{id}
-
+
- delete from xm_task_execuser
+ delete from xm_task_execuser res
- 1=2
+
- delete from xm_task_execuser
+ delete from xm_task_execuser
where id = #{id}
- update xm_task_execuser
+ update xm_task_execuser
@@ -201,7 +205,7 @@
- update xm_task_execuser
+ update xm_task_execuser
@@ -216,7 +220,7 @@
- update xm_task_execuser
+ update xm_task_execuser
set
where id = #{item.id}
@@ -224,20 +228,18 @@
- delete from xm_task_execuser
+ delete from xm_task_execuser
where
- (id)
- in
+ (id) in
- ( #{item.id}
- )
+ ( #{item.id} )
- create_time,id,task_id,userid,start_time,end_time,status,remarks,settle_amount,settle_workload,settle_status,settle_time,create_userid,create_username,username,match_score,quote_weekday,quote_amount,quote_time,biz_proc_inst_id,biz_flow_state,project_id,project_phase_id,skill_remark,quote_workload,quote_start_time,quote_end_time,branch_id,project_phase_name,task_name,is_leader,dist_userid,dist_username
+ create_time,id,task_id,userid,start_time,end_time,status,remarks,settle_amount,settle_workload,settle_status,settle_time,create_userid,create_username,username,match_score,quote_weekday,quote_amount,quote_time,biz_proc_inst_id,biz_flow_state,project_id,phase_id,skill_remark,quote_workload,quote_start_time,quote_end_time,branch_id,phase_name,task_name,is_leader,dist_userid,dist_username,exec_user_branchid,share_key
@@ -264,17 +266,19 @@
and res.biz_proc_inst_id = #{bizProcInstId}
and res.biz_flow_state = #{bizFlowState}
and res.project_id = #{projectId}
- and res.project_phase_id = #{projectPhaseId}
+ and res.phase_id = #{phaseId}
and res.skill_remark = #{skillRemark}
and res.quote_workload = #{quoteWorkload}
and date_format(res.quote_start_time,'%Y-%m-%d') = date_format(#{quoteStartTime},'%Y-%m-%d')
and date_format(res.quote_end_time,'%Y-%m-%d') = date_format(#{quoteEndTime},'%Y-%m-%d')
and res.branch_id = #{branchId}
- and res.project_phase_name = #{projectName}
+ and res.phase_name = #{phaseName}
and res.task_name = #{taskName}
and res.is_leader = #{isLeader}
and res.dist_userid = #{distUserid}
and res.dist_username = #{distUsername}
+ and res.exec_user_branchid = #{execUserBranchid}
+ and res.share_key = #{shareKey}
@@ -299,17 +303,19 @@
biz_proc_inst_id = #{bizProcInstId},
biz_flow_state = #{bizFlowState},
project_id = #{projectId},
- project_phase_id = #{projectPhaseId},
+ phase_id = #{phaseId},
skill_remark = #{skillRemark},
quote_workload = #{quoteWorkload},
quote_start_time = #{quoteStartTime},
quote_end_time = #{quoteEndTime},
branch_id = #{branchId},
- project_phase_name = #{projectName},
+ phase_name = #{phaseName},
task_name = #{taskName},
is_leader = #{isLeader},
dist_userid = #{distUserid},
- dist_username = #{distUsername}
+ dist_username = #{distUsername},
+ exec_user_branchid = #{execUserBranchid},
+ share_key = #{shareKey}
create_time = #{createTime},
@@ -333,17 +339,19 @@
biz_proc_inst_id = #{bizProcInstId},
biz_flow_state = #{bizFlowState},
project_id = #{projectId},
- project_phase_id = #{projectPhaseId},
+ phase_id = #{phaseId},
skill_remark = #{skillRemark},
quote_workload = #{quoteWorkload},
quote_start_time = #{quoteStartTime},
quote_end_time = #{quoteEndTime},
branch_id = #{branchId},
- project_phase_name = #{projectName},
+ phase_name = #{phaseName},
task_name = #{taskName},
is_leader = #{isLeader},
dist_userid = #{distUserid},
dist_username = #{distUsername},
+ exec_user_branchid = #{execUserBranchid},
+ share_key = #{shareKey},
@@ -368,16 +376,18 @@
biz_proc_inst_id = #{item.bizProcInstId},
biz_flow_state = #{item.bizFlowState},
project_id = #{item.projectId},
- project_phase_id = #{item.projectPhaseId},
+ phase_id = #{item.phaseId},
skill_remark = #{item.skillRemark},
quote_workload = #{item.quoteWorkload},
quote_start_time = #{item.quoteStartTime},
quote_end_time = #{item.quoteEndTime},
branch_id = #{item.branchId},
- project_phase_name = #{item.projectName},
+ phase_name = #{item.phaseName},
task_name = #{item.taskName},
is_leader = #{item.isLeader},
dist_userid = #{item.distUserid},
- dist_username = #{item.distUsername}
+ dist_username = #{item.distUsername},
+ exec_user_branchid = #{item.execUserBranchid},
+ share_key = #{item.shareKey}
\ No newline at end of file