Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
commit
e5c8a4cd45
  1. 169
      xm-core/src/main/java/com/xm/core/entity/XmBranchState.java
  2. 15
      xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java
  3. 49
      xm-core/src/main/java/com/xm/core/entity/XmMenu.java
  4. 84
      xm-core/src/main/java/com/xm/core/entity/XmProject.java
  5. 44
      xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostNouser.java
  6. 44
      xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostUser.java
  7. 47
      xm-core/src/main/java/com/xm/core/entity/XmProjectMCostNouser.java
  8. 43
      xm-core/src/main/java/com/xm/core/entity/XmProjectMCostUser.java
  9. 160
      xm-core/src/main/java/com/xm/core/entity/XmProjectState.java
  10. 72
      xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java
  11. 92
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml
  12. 63
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchTaskTypeStateMapper.xml
  13. 8
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationStateMapper.xml
  14. 28
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
  15. 8
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuStateMapper.xml
  16. 11
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductStateMapper.xml
  17. 199
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostNouserMapper.xml
  18. 203
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostUserMapper.xml
  19. 200
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostNouserMapper.xml
  20. 252
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostUserMapper.xml
  21. 68
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
  22. 88
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateMapper.xml
  23. 250
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml

169
xm-core/src/main/java/com/xm/core/entity/XmBranchState.java

@ -8,9 +8,9 @@ import java.util.Date;
/** /**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br> * 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmBranchState所有属性名: <br> * 实体 XmBranchState所有属性名: <br>
* 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;<br>
* 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;<br>
* xm_branch_state 机构内所有项目指标汇总的所有字段名: <br> * xm_branch_state 机构内所有项目指标汇总的所有字段名: <br>
* 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;<br>
* 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;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* branch_id;<br> * branch_id;<br>
*/ */
@ -81,7 +81,7 @@ public class XmBranchState implements java.io.Serializable {
BigDecimal totalCostUserAmount; BigDecimal totalCostUserAmount;
@ApiModelProperty(notes="项目总内部人力预算-来自项目表",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="项目总内部人力预算-来自项目表",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalBudgetInnerUserAmount;
BigDecimal totalBudgetIuserAmount;
@ApiModelProperty(notes="项目总预算工作量-来自项目表",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="项目总预算工作量-来自项目表",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalPlanWorkload; BigDecimal totalPlanWorkload;
@ -96,16 +96,16 @@ public class XmBranchState implements java.io.Serializable {
String branchName; String branchName;
@ApiModelProperty(notes="项目总外购人力预算-来自项目表",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="项目总外购人力预算-来自项目表",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalBudgetOutUserAmount;
BigDecimal totalBudgetOuserAmount;
@ApiModelProperty(notes="已完成工作量-来自计划中实际完成工作量",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="已完成工作量-来自计划中实际完成工作量",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalCompleteWorkload; BigDecimal totalCompleteWorkload;
@ApiModelProperty(notes="项目总内部人力成本金额",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="项目总内部人力成本金额",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalCostInnerUserAmount;
BigDecimal totalCostIuserAmount;
@ApiModelProperty(notes="项目总外购人力成本金额",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="项目总外购人力成本金额",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalCostOutUserAmount;
BigDecimal totalCostOuserAmount;
@ApiModelProperty(notes="项目进度0~100之间,来自任务表",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="项目进度0~100之间,来自任务表",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalProgress; BigDecimal totalProgress;
@ -147,10 +147,10 @@ public class XmBranchState implements java.io.Serializable {
BigDecimal totalNeedPayUserCnt; BigDecimal totalNeedPayUserCnt;
@ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalPlanInnerUserWorkload;
BigDecimal totalPlanIuserWorkload;
@ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalPlanOutUserWorkload;
BigDecimal totalPlanOuserWorkload;
@ApiModelProperty(notes="测试案例总数",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="测试案例总数",allowEmptyValue=true,example="",allowableValues="")
Integer testCases; Integer testCases;
@ -175,6 +175,27 @@ public class XmBranchState implements java.io.Serializable {
@ApiModelProperty(notes="项目数量",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="项目数量",allowEmptyValue=true,example="",allowableValues="")
Integer projectCnt; 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) { 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之间来自任务表 * 项目进度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) { public void setProjectCnt(Integer projectCnt) {
this.projectCnt = 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类型 * 统计日期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之间来自任务表 * 项目进度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() { public Integer getProjectCnt() {
return this.projectCnt; 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;
}
} }

15
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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/** /**
* 组织 com.qqkj 顶级模块 xm 大模块 core 小模块 <br>
* 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmBranchTaskTypeState所有属性名: <br> * 实体 XmBranchTaskTypeState所有属性名: <br>
* taskType,planWorkload,planAmount,actWorkload,actAmount,branchId,bizDate,calcTime,planOutUserAt,planInnerUserAt,actOutUserAt,actInnerUserAt,planOutUserWorkload,planInnerUserWorkload,actOutUserWorkload,actInnerUserWorkload,planNouserAt,actNouserAt,id,branchName;<br> * taskType,planWorkload,planAmount,actWorkload,actAmount,branchId,bizDate,calcTime,planOutUserAt,planInnerUserAt,actOutUserAt,actInnerUserAt,planOutUserWorkload,planInnerUserWorkload,actOutUserWorkload,actInnerUserWorkload,planNouserAt,actNouserAt,id,branchName;<br>
* XM.xm_branch_task_type_state 按机构编号任务类型汇总的所有字段名: <br>
* xm_branch_task_type_state 按机构编号任务类型汇总的所有字段名: <br>
* 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;<br> * 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;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br> * id;<br>
@ -159,7 +158,7 @@ public class XmBranchTaskTypeState implements java.io.Serializable {
/** /**
* 实际内购成本 * 实际内购成本
**/ **/
public void setActIuserAt(BigDecimal actInnerUserAt) {
public void setActInnerUserAt(BigDecimal actInnerUserAt) {
this.actInnerUserAt = 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; this.actInnerUserWorkload = actInnerUserWorkload;
} }
/** /**
@ -280,7 +279,7 @@ public class XmBranchTaskTypeState implements java.io.Serializable {
/** /**
* 实际内购成本 * 实际内购成本
**/ **/
public BigDecimal getActIuserAt() {
public BigDecimal getActInnerUserAt() {
return this.actInnerUserAt; return this.actInnerUserAt;
} }
/** /**
@ -304,7 +303,7 @@ public class XmBranchTaskTypeState implements java.io.Serializable {
/** /**
* 实际内购工作量 * 实际内购工作量
**/ **/
public BigDecimal getActIuserWorkload() {
public BigDecimal getActInnerUserWorkload() {
return this.actInnerUserWorkload; return this.actInnerUserWorkload;
} }
/** /**

49
xm-core/src/main/java/com/xm/core/entity/XmMenu.java

@ -8,9 +8,9 @@ import java.math.BigDecimal;
/** /**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br> * 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmMenu所有属性名: <br> * 实体 XmMenu所有属性名: <br>
* 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;<br>
* 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;<br>
* xm_menu 功能表的所有字段名: <br> * xm_menu 功能表的所有字段名: <br>
* 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;<br>
* 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;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* menu_id;<br> * menu_id;<br>
*/ */
@ -118,6 +118,15 @@ public class XmMenu implements java.io.Serializable {
@ApiModelProperty(notes="叶子节点数据收集方式0-不计算,1-由任务汇总,2-手工填报",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="叶子节点数据收集方式0-不计算,1-由任务汇总,2-手工填报",allowEmptyValue=true,example="",allowableValues="")
String calcType; 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) { public XmMenu(String menuId) {
@ -326,6 +335,24 @@ public class XmMenu implements java.io.Serializable {
public void setCalcType(String calcType) { public void setCalcType(String calcType) {
this.calcType = 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() { public String getCalcType() {
return this.calcType; return this.calcType;
} }
/**
* 手工填报的情况下填报的工作量其余为下级往上汇总数据
**/
public BigDecimal getMactWorkload() {
return this.mactWorkload;
}
/**
* 手工填报情况下填报的费用总额其余为下级往上汇总数据
**/
public String getMactAmount() {
return this.mactAmount;
}
/**
* 手工填报下的进度
**/
public Integer getMactRate() {
return this.mactRate;
}
} }

84
xm-core/src/main/java/com/xm/core/entity/XmProject.java

@ -8,9 +8,9 @@ import java.math.BigDecimal;
/** /**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br> * 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmProject所有属性名: <br> * 实体 XmProject所有属性名: <br>
* id,code,name,xmType,startTime,endTime,urgent,priority,description,createUserid,createUsername,createTime,assess,assessRemarks,status,branchId,planTotalCost,bizProcInstId,bizFlowState,planNouserAt,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;<br>
* id,code,name,xmType,startTime,endTime,urgent,priority,description,createUserid,createUsername,createTime,assess,assessRemarks,status,branchId,planTotalCost,bizProcInstId,bizFlowState,planNouserAt,planIuserAt,planOuserAt,locked,baseTime,baseRemark,baselineId,planWorkload,totalReceivables,budgetMarginRate,contractAmt,planIuserPrice,planOuserPrice,planOuserCnt,planIuserCnt,planWorkingHours,taxRate,planIuserWorkload,planOuserWorkload,fromTplId,budgetCtrl,deptid,showOut,isTpl,pmUserid,pmUsername,assUserid,assUsername,admUserid,admUsername,phaseBudgetCtrl,phaseActCtrl,del,ltime;<br>
* xm_project xm_project的所有字段名: <br> * xm_project xm_project的所有字段名: <br>
* id,code,name,xm_type,start_time,end_time,urgent,priority,description,create_userid,create_username,create_time,assess,assess_remarks,status,branch_id,plan_total_cost,biz_proc_inst_id,biz_flow_state,plan_nouser_at,plan_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;<br>
* id,code,name,xm_type,start_time,end_time,urgent,priority,description,create_userid,create_username,create_time,assess,assess_remarks,status,branch_id,plan_total_cost,biz_proc_inst_id,biz_flow_state,plan_nouser_at,plan_iuser_at,plan_ouser_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_iuser_price,plan_ouser_price,plan_ouser_cnt,plan_iuser_cnt,plan_working_hours,tax_rate,plan_iuser_workload,plan_ouser_workload,from_tpl_id,budget_ctrl,deptid,show_out,is_tpl,pm_userid,pm_username,ass_userid,ass_username,adm_userid,adm_username,phase_budget_ctrl,phase_act_ctrl,del,ltime;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br> * id;<br>
*/ */
@ -81,10 +81,10 @@ public class XmProject implements java.io.Serializable {
BigDecimal planNouserAt; BigDecimal planNouserAt;
@ApiModelProperty(notes="内部人力成本总预算-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="内部人力成本总预算-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
BigDecimal planInnerUserAt;
BigDecimal planIuserAt;
@ApiModelProperty(notes="外购人力成本总预算-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="外购人力成本总预算-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
BigDecimal planOutUserAt;
BigDecimal planOuserAt;
@ApiModelProperty(notes="是否锁定整个项目不允许变化0否1是",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="是否锁定整个项目不允许变化0否1是",allowEmptyValue=true,example="",allowableValues="")
String locked; String locked;
@ -111,16 +111,16 @@ public class XmProject implements java.io.Serializable {
BigDecimal contractAmt; BigDecimal contractAmt;
@ApiModelProperty(notes="内部人力成本单价元/人时",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="内部人力成本单价元/人时",allowEmptyValue=true,example="",allowableValues="")
BigDecimal planInnerUserPrice;
BigDecimal planIuserPrice;
@ApiModelProperty(notes="外购人力成本单价元/人时",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="外购人力成本单价元/人时",allowEmptyValue=true,example="",allowableValues="")
BigDecimal planOutUserPrice;
BigDecimal planOuserPrice;
@ApiModelProperty(notes="外购人数",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="外购人数",allowEmptyValue=true,example="",allowableValues="")
Integer planOutUserCnt;
Integer planOuserCnt;
@ApiModelProperty(notes="内部人数",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="内部人数",allowEmptyValue=true,example="",allowableValues="")
Integer planInnerUserCnt;
Integer planIuserCnt;
@ApiModelProperty(notes="预计工作小时数目",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="预计工作小时数目",allowEmptyValue=true,example="",allowableValues="")
Integer planWorkingHours; Integer planWorkingHours;
@ -129,10 +129,10 @@ public class XmProject implements java.io.Serializable {
BigDecimal taxRate; BigDecimal taxRate;
@ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
BigDecimal planInnerUserWorkload;
BigDecimal planIuserWorkload;
@ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
BigDecimal planOutUserWorkload;
BigDecimal planOuserWorkload;
@ApiModelProperty(notes="关联模板编号",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="关联模板编号",allowEmptyValue=true,example="",allowableValues="")
String fromTplId; 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是 * 是否锁定整个项目不允许变化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是 * 是否锁定整个项目不允许变化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;
} }
/** /**
* 关联模板编号 * 关联模板编号

44
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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/** /**
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块 <br>
* 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmProjectMBudgetCostNouser所有属性名: <br> * 实体 XmProjectMBudgetCostNouser所有属性名: <br>
* projectId,budgetCost,id,remark,subjectId,bizzStartDate,bizzEndDate,bizProcInstId,bizFlowState,projectPhaseId,costType,bizzMonth;<br>
* XM.xm_project_m_budget_cost_nouser xm_project_m_budget_cost_nouser的所有字段名: <br>
* 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;<br>
* projectId,budgetCost,id,remark,subjectId,bizzStartDate,bizzEndDate,bizProcInstId,bizFlowState,phaseId,costType,bizzMonth,subjectName;<br>
* xm_project_m_budget_cost_nouser 项目人力成本预算的所有字段名: <br>
* 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;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br> * id;<br>
*/ */
@ApiModel(description="xm_project_m_budget_cost_nouser")
@ApiModel(description="项目人力成本预算")
public class XmProjectMBudgetCostNouser implements java.io.Serializable { public class XmProjectMBudgetCostNouser implements java.io.Serializable {
private static final long serialVersionUID = 1L; 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="") @ApiModelProperty(notes="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",allowEmptyValue=true,example="",allowableValues="")
String bizFlowState; 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="") @ApiModelProperty(notes="成本类型0非人力1内部人力2外购人力",allowEmptyValue=true,example="",allowableValues="")
String costType; String costType;
@ApiModelProperty(notes="费用归属月份yyyy-mm",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="费用归属月份yyyy-mm",allowEmptyValue=true,example="",allowableValues="")
String bizzMonth; String bizzMonth;
@ApiModelProperty(notes="科目名称",allowEmptyValue=true,example="",allowableValues="")
String subjectName;
/**主键**/ /**主键**/
public XmProjectMBudgetCostNouser(String id) { public XmProjectMBudgetCostNouser(String id) {
this.id = id; this.id = id;
} }
/**xm_project_m_budget_cost_nouser**/
/**项目人力成本预算**/
public XmProjectMBudgetCostNouser() { public XmProjectMBudgetCostNouser() {
} }
@ -121,10 +123,10 @@ public class XmProjectMBudgetCostNouser implements java.io.Serializable {
this.bizFlowState = bizFlowState; this.bizFlowState = bizFlowState;
} }
/** /**
* 计划
* 阶段计划编号
**/ **/
public void setPhaseId(String projectPhaseId) {
this.projectPhaseId = projectPhaseId;
public void setPhaseId(String phaseId) {
this.phaseId = phaseId;
} }
/** /**
* 成本类型0非人力1内部人力2外购人力 * 成本类型0非人力1内部人力2外购人力
@ -138,6 +140,12 @@ public class XmProjectMBudgetCostNouser implements java.io.Serializable {
public void setBizzMonth(String bizzMonth) { public void setBizzMonth(String bizzMonth) {
this.bizzMonth = 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; return this.bizFlowState;
} }
/** /**
* 计划
* 阶段计划编号
**/ **/
public String getPhaseId() { public String getPhaseId() {
return this.projectPhaseId;
return this.phaseId;
} }
/** /**
* 成本类型0非人力1内部人力2外购人力 * 成本类型0非人力1内部人力2外购人力
@ -211,5 +219,11 @@ public class XmProjectMBudgetCostNouser implements java.io.Serializable {
public String getBizzMonth() { public String getBizzMonth() {
return this.bizzMonth; return this.bizzMonth;
} }
/**
* 科目名称
**/
public String getSubjectName() {
return this.subjectName;
}
} }

44
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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/** /**
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块 <br>
* 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmProjectMBudgetCostUser所有属性名: <br> * 实体 XmProjectMBudgetCostUser所有属性名: <br>
* projectId,userid,budgetCost,id,remark,username,subjectId,bizzStartDate,bizzEndDate,bizzMonth,bizProcInstId,bizFlowState,projectPhaseId,costType;<br>
* XM.xm_project_m_budget_cost_user xm_project_m_budget_cost_user的所有字段名: <br>
* 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;<br>
* projectId,userid,budgetCost,id,remark,username,subjectId,bizzStartDate,bizzEndDate,bizzMonth,bizProcInstId,bizFlowState,phaseId,costType,subjectName;<br>
* xm_project_m_budget_cost_user 项目人力成本预算的所有字段名: <br>
* 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;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br> * id;<br>
*/ */
@ApiModel(description="xm_project_m_budget_cost_user")
@ApiModel(description="项目人力成本预算")
public class XmProjectMBudgetCostUser implements java.io.Serializable { public class XmProjectMBudgetCostUser implements java.io.Serializable {
private static final long serialVersionUID = 1L; 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="") @ApiModelProperty(notes="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",allowEmptyValue=true,example="",allowableValues="")
String bizFlowState; 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="") @ApiModelProperty(notes="成本类型0非人力1内部人力2外购人力",allowEmptyValue=true,example="",allowableValues="")
String costType; String costType;
@ApiModelProperty(notes="科目名称",allowEmptyValue=true,example="",allowableValues="")
String subjectName;
/**主键**/ /**主键**/
public XmProjectMBudgetCostUser(String id) { public XmProjectMBudgetCostUser(String id) {
this.id = id; this.id = id;
} }
/**xm_project_m_budget_cost_user**/
/**项目人力成本预算**/
public XmProjectMBudgetCostUser() { public XmProjectMBudgetCostUser() {
} }
@ -145,10 +147,10 @@ public class XmProjectMBudgetCostUser implements java.io.Serializable {
this.bizFlowState = bizFlowState; this.bizFlowState = bizFlowState;
} }
/** /**
* 项目计划
* 项目阶段
**/ **/
public void setPhaseId(String projectPhaseId) {
this.projectPhaseId = projectPhaseId;
public void setPhaseId(String phaseId) {
this.phaseId = phaseId;
} }
/** /**
* 成本类型0非人力1内部人力2外购人力 * 成本类型0非人力1内部人力2外购人力
@ -156,6 +158,12 @@ public class XmProjectMBudgetCostUser implements java.io.Serializable {
public void setCostType(String costType) { public void setCostType(String costType) {
this.costType = 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; return this.bizFlowState;
} }
/** /**
* 项目计划
* 项目阶段
**/ **/
public String getPhaseId() { public String getPhaseId() {
return this.projectPhaseId;
return this.phaseId;
} }
/** /**
* 成本类型0非人力1内部人力2外购人力 * 成本类型0非人力1内部人力2外购人力
@ -241,5 +249,11 @@ public class XmProjectMBudgetCostUser implements java.io.Serializable {
public String getCostType() { public String getCostType() {
return this.costType; return this.costType;
} }
/**
* 科目名称
**/
public String getSubjectName() {
return this.subjectName;
}
} }

47
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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal;
/** /**
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块 <br>
* 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmProjectMCostNouser所有属性名: <br> * 实体 XmProjectMCostNouser所有属性名: <br>
* projectId,userid,createTime,sendCostTime,username,projectName,remark,id,taskId,taskName,subjectId,bizzStartDate,bizzEndDate,bizProcInstId,bizFlowState,projectPhaseId,actCostAmount,costType,bizMonth,bizDate,subjectName,projectName;<br>
* XM.xm_project_m_cost_nouser xm_project_m_cost_nouser的所有字段名: <br>
* 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;<br>
* projectId,userid,createTime,sendCostTime,username,projectName,remark,id,taskId,taskName,subjectId,bizzStartDate,bizzEndDate,bizProcInstId,bizFlowState,phaseId,actCostAmount,costType,bizMonth,bizDate,subjectName,phaseName;<br>
* xm_project_m_cost_nouser 项目实际人工成本费用的所有字段名: <br>
* 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;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br> * id;<br>
*/ */
@ApiModel(description="xm_project_m_cost_nouser")
@ApiModel(description="项目实际人工成本费用")
public class XmProjectMCostNouser implements java.io.Serializable { public class XmProjectMCostNouser implements java.io.Serializable {
private static final long serialVersionUID = 1L; 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="") @ApiModelProperty(notes="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",allowEmptyValue=true,example="",allowableValues="")
String bizFlowState; String bizFlowState;
@ApiModelProperty(notes="项目计划计划编号",allowEmptyValue=true,example="",allowableValues="")
String projectPhaseId;
@ApiModelProperty(notes="项目计划阶段编号",allowEmptyValue=true,example="",allowableValues="")
String phaseId;
@ApiModelProperty(notes="实际成本金额",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="实际成本金额",allowEmptyValue=true,example="",allowableValues="")
BigDecimal actCostAmount; BigDecimal actCostAmount;
@ -84,15 +83,15 @@ public class XmProjectMCostNouser implements java.io.Serializable {
@ApiModelProperty(notes="科目名称",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="科目名称",allowEmptyValue=true,example="",allowableValues="")
String subjectName; String subjectName;
@ApiModelProperty(notes="计划名称",allowEmptyValue=true,example="",allowableValues="")
String projectName;
@ApiModelProperty(notes="阶段名称",allowEmptyValue=true,example="",allowableValues="")
String phaseName;
/**主键**/ /**主键**/
public XmProjectMCostNouser(String id) { public XmProjectMCostNouser(String id) {
this.id = id; this.id = id;
} }
/**xm_project_m_cost_nouser**/
/**项目实际人工成本费用**/
public XmProjectMCostNouser() { public XmProjectMCostNouser() {
} }
@ -187,10 +186,10 @@ public class XmProjectMCostNouser implements java.io.Serializable {
this.bizFlowState = bizFlowState; 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; 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; return this.bizFlowState;
} }
/** /**
* 项目计划计划编号
* 项目计划阶段编号
**/ **/
public String getPhaseId() { public String getPhaseId() {
return this.projectPhaseId;
return this.phaseId;
} }
/** /**
* 实际成本金额 * 实际成本金额
@ -356,10 +355,10 @@ public class XmProjectMCostNouser implements java.io.Serializable {
return this.subjectName; return this.subjectName;
} }
/** /**
* 计划名称
* 阶段名称
**/ **/
public String getProjectName() {
return this.projectName;
public String getPhaseName() {
return this.phaseName;
} }
} }

43
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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal;
/** /**
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块 <br>
* 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmProjectMCostUser所有属性名: <br> * 实体 XmProjectMCostUser所有属性名: <br>
* 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;<br>
* XM.xm_project_m_cost_user 项目实际人工成本费用的所有字段名: <br>
* 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;<br>
* 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;<br>
* xm_project_m_cost_user 项目实际人工成本费用的所有字段名: <br>
* 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;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br> * id;<br>
*/ */
@ -69,8 +68,8 @@ public class XmProjectMCostUser implements java.io.Serializable {
@ApiModelProperty(notes="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",allowEmptyValue=true,example="",allowableValues="")
String bizFlowState; String bizFlowState;
@ApiModelProperty(notes="项目计划计划编号",allowEmptyValue=true,example="",allowableValues="")
String projectPhaseId;
@ApiModelProperty(notes="项目计划阶段编号",allowEmptyValue=true,example="",allowableValues="")
String phaseId;
@ApiModelProperty(notes="金额",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="金额",allowEmptyValue=true,example="",allowableValues="")
BigDecimal actCostAmount; BigDecimal actCostAmount;
@ -87,8 +86,8 @@ public class XmProjectMCostUser implements java.io.Serializable {
@ApiModelProperty(notes="科目名称",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="科目名称",allowEmptyValue=true,example="",allowableValues="")
String subjectName; String subjectName;
@ApiModelProperty(notes="计划名称",allowEmptyValue=true,example="",allowableValues="")
String projectName;
@ApiModelProperty(notes="阶段名称",allowEmptyValue=true,example="",allowableValues="")
String phaseName;
@ApiModelProperty(notes="执行人申请结算时的流程编号",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="执行人申请结算时的流程编号",allowEmptyValue=true,example="",allowableValues="")
String execuserProcInstId; String execuserProcInstId;
@ -211,10 +210,10 @@ public class XmProjectMCostUser implements java.io.Serializable {
this.bizFlowState = bizFlowState; 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; 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; return this.bizFlowState;
} }
/** /**
* 项目计划计划编号
* 项目计划阶段编号
**/ **/
public String getPhaseId() { public String getPhaseId() {
return this.projectPhaseId;
return this.phaseId;
} }
/** /**
* 金额 * 金额
@ -416,10 +415,10 @@ public class XmProjectMCostUser implements java.io.Serializable {
return this.subjectName; return this.subjectName;
} }
/** /**
* 计划名称
* 阶段名称
**/ **/
public String getProjectName() {
return this.projectName;
public String getPhaseName() {
return this.phaseName;
} }
/** /**
* 执行人申请结算时的流程编号 * 执行人申请结算时的流程编号

160
xm-core/src/main/java/com/xm/core/entity/XmProjectState.java

@ -8,9 +8,9 @@ import java.util.Date;
/** /**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br> * 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmProjectState所有属性名: <br> * 实体 XmProjectState所有属性名: <br>
* 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;<br>
* 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;<br>
* xm_project_state 项目指标日统计表的所有字段名: <br> * xm_project_state 项目指标日统计表的所有字段名: <br>
* 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;<br>
* 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;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* project_id;<br> * project_id;<br>
*/ */
@ -84,7 +84,7 @@ public class XmProjectState implements java.io.Serializable {
BigDecimal totalCostUserAmount; BigDecimal totalCostUserAmount;
@ApiModelProperty(notes="项目总内部人力预算-来自项目表",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="项目总内部人力预算-来自项目表",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalBudgetInnerUserAmount;
BigDecimal totalBudgetIuserAmount;
@ApiModelProperty(notes="项目总预算工作量-来自项目表",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="项目总预算工作量-来自项目表",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalPlanWorkload; BigDecimal totalPlanWorkload;
@ -102,16 +102,16 @@ public class XmProjectState implements java.io.Serializable {
String branchName; String branchName;
@ApiModelProperty(notes="项目总外购人力预算-来自项目表",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="项目总外购人力预算-来自项目表",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalBudgetOutUserAmount;
BigDecimal totalBudgetOuserAmount;
@ApiModelProperty(notes="已完成工作量-来自计划中实际完成工作量",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="已完成工作量-来自计划中实际完成工作量",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalCompleteWorkload; BigDecimal totalCompleteWorkload;
@ApiModelProperty(notes="项目总内部人力成本金额",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="项目总内部人力成本金额",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalCostInnerUserAmount;
BigDecimal totalCostIuserAmount;
@ApiModelProperty(notes="项目总外购人力成本金额",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="项目总外购人力成本金额",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalCostOutUserAmount;
BigDecimal totalCostOuserAmount;
@ApiModelProperty(notes="项目进度0~100之间,来自任务表",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="项目进度0~100之间,来自任务表",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalProgress; BigDecimal totalProgress;
@ -122,7 +122,7 @@ public class XmProjectState implements java.io.Serializable {
@ApiModelProperty(notes="已解决bug总数",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="已解决bug总数",allowEmptyValue=true,example="",allowableValues="")
Integer totalConfirmedBugCnt; Integer totalConfirmedBugCnt;
@ApiModelProperty(notes="项目状态,0-初始,1-立项中,2-执行中,3-已结项,4-暂停",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="0|初始",allowEmptyValue=true,example="",allowableValues="")
String projectStatus; String projectStatus;
@ApiModelProperty(notes="实际总工作量,来自任务表",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="实际总工作量,来自任务表",allowEmptyValue=true,example="",allowableValues="")
@ -153,10 +153,10 @@ public class XmProjectState implements java.io.Serializable {
BigDecimal totalNeedPayUserCnt; BigDecimal totalNeedPayUserCnt;
@ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalPlanInnerUserWorkload;
BigDecimal totalPlanIuserWorkload;
@ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalPlanOutUserWorkload;
BigDecimal totalPlanOuserWorkload;
@ApiModelProperty(notes="测试案例总数",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="测试案例总数",allowEmptyValue=true,example="",allowableValues="")
Integer testCases; Integer testCases;
@ -178,6 +178,24 @@ public class XmProjectState implements java.io.Serializable {
@ApiModelProperty(notes="故事数",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="故事数",allowEmptyValue=true,example="",allowableValues="")
Integer menuCnt; 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) { 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之间来自任务表 * 项目进度0~100之间来自任务表
@ -393,7 +411,7 @@ public class XmProjectState implements java.io.Serializable {
this.totalConfirmedBugCnt = totalConfirmedBugCnt; this.totalConfirmedBugCnt = totalConfirmedBugCnt;
} }
/** /**
* 项目状态0-初始1-立项中2-执行中3-已结项4-暂停
* 0|初始
**/ **/
public void setProjectStatus(String projectStatus) { public void setProjectStatus(String projectStatus) {
this.projectStatus = 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) { public void setMenuCnt(Integer menuCnt) {
this.menuCnt = 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之间来自任务表 * 项目进度0~100之间来自任务表
@ -712,7 +766,7 @@ public class XmProjectState implements java.io.Serializable {
return this.totalConfirmedBugCnt; return this.totalConfirmedBugCnt;
} }
/** /**
* 项目状态0-初始1-立项中2-执行中3-已结项4-暂停
* 0|初始
**/ **/
public String getProjectStatus() { public String getProjectStatus() {
return this.projectStatus; 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() { public Integer getMenuCnt() {
return this.menuCnt; 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;
}
} }

72
xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java

@ -8,9 +8,9 @@ import java.math.BigDecimal;
/** /**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br> * 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmTaskExecuser所有属性名: <br> * 实体 XmTaskExecuser所有属性名: <br>
* 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;<br>
* XM.xm_task_execuser xm_task_execuser的所有字段名: <br>
* 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;<br>
* 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;<br>
* xm_task_execuser xm_task_execuser的所有字段名: <br>
* 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;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br> * id;<br>
*/ */
@ -50,7 +50,7 @@ public class XmTaskExecuser implements java.io.Serializable {
@ApiModelProperty(notes="已结算工作量",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="已结算工作量",allowEmptyValue=true,example="",allowableValues="")
BigDecimal settleWorkload; 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; String settleStatus;
@ApiModelProperty(notes="上次结算时间",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="上次结算时间",allowEmptyValue=true,example="",allowableValues="")
@ -86,8 +86,8 @@ public class XmTaskExecuser implements java.io.Serializable {
@ApiModelProperty(notes="项目编号",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="项目编号",allowEmptyValue=true,example="",allowableValues="")
String projectId; String projectId;
@ApiModelProperty(notes="计划编号",allowEmptyValue=true,example="",allowableValues="")
String projectPhaseId;
@ApiModelProperty(notes="阶段计划编号",allowEmptyValue=true,example="",allowableValues="")
String phaseId;
@ApiModelProperty(notes="技能说明",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="技能说明",allowEmptyValue=true,example="",allowableValues="")
String skillRemark; String skillRemark;
@ -104,8 +104,8 @@ public class XmTaskExecuser implements java.io.Serializable {
@ApiModelProperty(notes="项目所属机构",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="项目所属机构",allowEmptyValue=true,example="",allowableValues="")
String branchId; String branchId;
@ApiModelProperty(notes="计划名称",allowEmptyValue=true,example="",allowableValues="")
String projectName;
@ApiModelProperty(notes="阶段计划名称",allowEmptyValue=true,example="",allowableValues="")
String phaseName;
@ApiModelProperty(notes="任务名称",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="任务名称",allowEmptyValue=true,example="",allowableValues="")
String taskName; String taskName;
@ -118,6 +118,12 @@ public class XmTaskExecuser implements java.io.Serializable {
@ApiModelProperty(notes="推荐人姓名",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="推荐人姓名",allowEmptyValue=true,example="",allowableValues="")
String distUsername; String distUsername;
@ApiModelProperty(notes="执行人归属公司",allowEmptyValue=true,example="",allowableValues="")
String execUserBranchid;
@ApiModelProperty(notes="分享码",allowEmptyValue=true,example="",allowableValues="")
String shareKey;
/**编号**/ /**编号**/
public XmTaskExecuser(String id) { public XmTaskExecuser(String id) {
@ -189,7 +195,7 @@ public class XmTaskExecuser implements java.io.Serializable {
this.settleWorkload = settleWorkload; this.settleWorkload = settleWorkload;
} }
/** /**
* 结算状态0未结算1已部分结算2无需结算4已申请结算5结算失败6已全部结算
* 结算状态0未结算4已申请结算5结算失败6已全部结算
**/ **/
public void setSettleStatus(String settleStatus) { public void setSettleStatus(String settleStatus) {
this.settleStatus = settleStatus; this.settleStatus = settleStatus;
@ -261,10 +267,10 @@ public class XmTaskExecuser implements java.io.Serializable {
this.projectId = projectId; 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; 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) { public void setDistUsername(String distUsername) {
this.distUsername = 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; return this.settleWorkload;
} }
/** /**
* 结算状态0未结算1已部分结算2无需结算4已申请结算5结算失败6已全部结算
* 结算状态0未结算4已申请结算5结算失败6已全部结算
**/ **/
public String getSettleStatus() { public String getSettleStatus() {
return this.settleStatus; return this.settleStatus;
@ -460,10 +478,10 @@ public class XmTaskExecuser implements java.io.Serializable {
return this.projectId; return this.projectId;
} }
/** /**
* 计划编号
* 阶段计划编号
**/ **/
public String getPhaseId() { public String getPhaseId() {
return this.projectPhaseId;
return this.phaseId;
} }
/** /**
* 技能说明 * 技能说明
@ -496,10 +514,10 @@ public class XmTaskExecuser implements java.io.Serializable {
return this.branchId; 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() { public String getDistUsername() {
return this.distUsername; return this.distUsername;
} }
/**
* 执行人归属公司
**/
public String getExecUserBranchid() {
return this.execUserBranchid;
}
/**
* 分享码
**/
public String getShareKey() {
return this.shareKey;
}
} }

92
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml

@ -101,7 +101,13 @@
where where
res.branch_id = #{branchId} res.branch_id = #{branchId}
</select> </select>
<select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmBranchState">
select * from xm_branch_state res
where (res.branch_id) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</select>
<!-- 通过主键查询获取数据对象 返回map--> <!-- 通过主键查询获取数据对象 返回map-->
<select id="selectOneMap" parameterType="HashMap" resultType="HashMap"> <select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
select * from xm_branch_state res select * from xm_branch_state res
@ -120,7 +126,7 @@
insert into xm_branch_state( insert into xm_branch_state(
<include refid="columns"/> <include refid="columns"/>
) values ( ) values (
#{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}
) )
</insert> </insert>
@ -183,7 +189,7 @@
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <sql id="columns">
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
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -207,16 +213,16 @@
<if test="totalNeedColAmount != null and totalNeedColAmount != ''"> and res.total_need_col_amount = #{totalNeedColAmount} </if> <if test="totalNeedColAmount != null and totalNeedColAmount != ''"> and res.total_need_col_amount = #{totalNeedColAmount} </if>
<if test="totalFinishColAmount != null and totalFinishColAmount != ''"> and res.total_finish_col_amount = #{totalFinishColAmount} </if> <if test="totalFinishColAmount != null and totalFinishColAmount != ''"> and res.total_finish_col_amount = #{totalFinishColAmount} </if>
<if test="totalCostUserAmount != null and totalCostUserAmount != ''"> and res.total_cost_user_amount = #{totalCostUserAmount} </if> <if test="totalCostUserAmount != null and totalCostUserAmount != ''"> and res.total_cost_user_amount = #{totalCostUserAmount} </if>
<if test="totalBudgetInnerUserAmount != null and totalBudgetInnerUserAmount != ''"> and res.total_budget_inner_user_amount = #{totalBudgetInnerUserAmount} </if>
<if test="totalBudgetIuserAmount != null and totalBudgetIuserAmount != ''"> and res.total_budget_iuser_amount = #{totalBudgetIuserAmount} </if>
<if test="totalPlanWorkload != null and totalPlanWorkload != ''"> and res.total_plan_workload = #{totalPlanWorkload} </if> <if test="totalPlanWorkload != null and totalPlanWorkload != ''"> and res.total_plan_workload = #{totalPlanWorkload} </if>
<if test="totalRiskCnt != null and totalRiskCnt != ''"> and res.total_risk_cnt = #{totalRiskCnt} </if> <if test="totalRiskCnt != null and totalRiskCnt != ''"> and res.total_risk_cnt = #{totalRiskCnt} </if>
<if test="totalCompleteRiskCnt != null and totalCompleteRiskCnt != ''"> and res.total_complete_risk_cnt = #{totalCompleteRiskCnt} </if> <if test="totalCompleteRiskCnt != null and totalCompleteRiskCnt != ''"> and res.total_complete_risk_cnt = #{totalCompleteRiskCnt} </if>
<if test="branchId != null and branchId != ''"> and res.branch_id = #{branchId} </if> <if test="branchId != null and branchId != ''"> and res.branch_id = #{branchId} </if>
<if test="branchName != null and branchName != ''"> and res.branch_name = #{branchName} </if> <if test="branchName != null and branchName != ''"> and res.branch_name = #{branchName} </if>
<if test="totalBudgetOutUserAmount != null and totalBudgetOutUserAmount != ''"> and res.total_budget_out_user_amount = #{totalBudgetOutUserAmount} </if>
<if test="totalBudgetOuserAmount != null and totalBudgetOuserAmount != ''"> and res.total_budget_ouser_amount = #{totalBudgetOuserAmount} </if>
<if test="totalCompleteWorkload != null and totalCompleteWorkload != ''"> and res.total_complete_workload = #{totalCompleteWorkload} </if> <if test="totalCompleteWorkload != null and totalCompleteWorkload != ''"> and res.total_complete_workload = #{totalCompleteWorkload} </if>
<if test="totalCostInnerUserAmount != null and totalCostInnerUserAmount != ''"> and res.total_cost_inner_user_amount = #{totalCostInnerUserAmount} </if>
<if test="totalCostOutUserAmount != null and totalCostOutUserAmount != ''"> and res.total_cost_out_user_amount = #{totalCostOutUserAmount} </if>
<if test="totalCostIuserAmount != null and totalCostIuserAmount != ''"> and res.total_cost_iuser_amount = #{totalCostIuserAmount} </if>
<if test="totalCostOuserAmount != null and totalCostOuserAmount != ''"> and res.total_cost_ouser_amount = #{totalCostOuserAmount} </if>
<if test="totalProgress != null and totalProgress != ''"> and res.total_progress = #{totalProgress} </if> <if test="totalProgress != null and totalProgress != ''"> and res.total_progress = #{totalProgress} </if>
<if test="totalActiveBugCnt != null and totalActiveBugCnt != ''"> and res.total_active_bug_cnt = #{totalActiveBugCnt} </if> <if test="totalActiveBugCnt != null and totalActiveBugCnt != ''"> and res.total_active_bug_cnt = #{totalActiveBugCnt} </if>
<if test="totalConfirmedBugCnt != null and totalConfirmedBugCnt != ''"> and res.total_confirmed_bug_cnt = #{totalConfirmedBugCnt} </if> <if test="totalConfirmedBugCnt != null and totalConfirmedBugCnt != ''"> and res.total_confirmed_bug_cnt = #{totalConfirmedBugCnt} </if>
@ -230,8 +236,8 @@
<if test="totalFinishPayCnt != null and totalFinishPayCnt != ''"> and res.total_finish_pay_cnt = #{totalFinishPayCnt} </if> <if test="totalFinishPayCnt != null and totalFinishPayCnt != ''"> and res.total_finish_pay_cnt = #{totalFinishPayCnt} </if>
<if test="totalFinishPayUserCnt != null and totalFinishPayUserCnt != ''"> and res.total_finish_pay_user_cnt = #{totalFinishPayUserCnt} </if> <if test="totalFinishPayUserCnt != null and totalFinishPayUserCnt != ''"> and res.total_finish_pay_user_cnt = #{totalFinishPayUserCnt} </if>
<if test="totalNeedPayUserCnt != null and totalNeedPayUserCnt != ''"> and res.total_need_pay_user_cnt = #{totalNeedPayUserCnt} </if> <if test="totalNeedPayUserCnt != null and totalNeedPayUserCnt != ''"> and res.total_need_pay_user_cnt = #{totalNeedPayUserCnt} </if>
<if test="totalPlanInnerUserWorkload != null and totalPlanInnerUserWorkload != ''"> and res.total_plan_inner_user_workload = #{totalPlanInnerUserWorkload} </if>
<if test="totalPlanOutUserWorkload != null and totalPlanOutUserWorkload != ''"> and res.total_plan_out_user_workload = #{totalPlanOutUserWorkload} </if>
<if test="totalPlanIuserWorkload != null and totalPlanIuserWorkload != ''"> and res.total_plan_iuser_workload = #{totalPlanIuserWorkload} </if>
<if test="totalPlanOuserWorkload != null and totalPlanOuserWorkload != ''"> and res.total_plan_ouser_workload = #{totalPlanOuserWorkload} </if>
<if test="testCases != null and testCases != ''"> and res.test_cases = #{testCases} </if> <if test="testCases != null and testCases != ''"> and res.test_cases = #{testCases} </if>
<if test="execCases != null and execCases != ''"> and res.exec_cases = #{execCases} </if> <if test="execCases != null and execCases != ''"> and res.exec_cases = #{execCases} </if>
<if test="designCases != null and designCases != ''"> and res.design_cases = #{designCases} </if> <if test="designCases != null and designCases != ''"> and res.design_cases = #{designCases} </if>
@ -240,6 +246,13 @@
<if test="productCnt != null and productCnt != ''"> and res.product_cnt = #{productCnt} </if> <if test="productCnt != null and productCnt != ''"> and res.product_cnt = #{productCnt} </if>
<if test="menuCnt != null and menuCnt != ''"> and res.menu_cnt = #{menuCnt} </if> <if test="menuCnt != null and menuCnt != ''"> and res.menu_cnt = #{menuCnt} </if>
<if test="projectCnt != null and projectCnt != ''"> and res.project_cnt = #{projectCnt} </if> <if test="projectCnt != null and projectCnt != ''"> and res.project_cnt = #{projectCnt} </if>
<if test="productBudgetWorkload != null and productBudgetWorkload != ''"> and res.product_budget_workload = #{productBudgetWorkload} </if>
<if test="productActWorkload != null and productActWorkload != ''"> and res.product_act_workload = #{productActWorkload} </if>
<if test="estimateWorkload != null and estimateWorkload != ''"> and res.estimate_workload = #{estimateWorkload} </if>
<if test="execTaskCnt != null and execTaskCnt != ''"> and res.exec_task_cnt = #{execTaskCnt} </if>
<if test="toStartTaskCnt != null and toStartTaskCnt != ''"> and res.to_start_task_cnt = #{toStartTaskCnt} </if>
<if test="execMenuCnt != null and execMenuCnt != ''"> and res.exec_menu_cnt = #{execMenuCnt} </if>
<if test="toStartMenuCnt != null and toStartMenuCnt != ''"> and res.to_start_menu_cnt = #{toStartMenuCnt} </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -262,15 +275,15 @@
total_need_col_amount = #{totalNeedColAmount}, total_need_col_amount = #{totalNeedColAmount},
total_finish_col_amount = #{totalFinishColAmount}, total_finish_col_amount = #{totalFinishColAmount},
total_cost_user_amount = #{totalCostUserAmount}, total_cost_user_amount = #{totalCostUserAmount},
total_budget_inner_user_amount = #{totalBudgetInnerUserAmount},
total_budget_iuser_amount = #{totalBudgetIuserAmount},
total_plan_workload = #{totalPlanWorkload}, total_plan_workload = #{totalPlanWorkload},
total_risk_cnt = #{totalRiskCnt}, total_risk_cnt = #{totalRiskCnt},
total_complete_risk_cnt = #{totalCompleteRiskCnt}, total_complete_risk_cnt = #{totalCompleteRiskCnt},
branch_name = #{branchName}, branch_name = #{branchName},
total_budget_out_user_amount = #{totalBudgetOutUserAmount},
total_budget_ouser_amount = #{totalBudgetOuserAmount},
total_complete_workload = #{totalCompleteWorkload}, 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_progress = #{totalProgress},
total_active_bug_cnt = #{totalActiveBugCnt}, total_active_bug_cnt = #{totalActiveBugCnt},
total_confirmed_bug_cnt = #{totalConfirmedBugCnt}, total_confirmed_bug_cnt = #{totalConfirmedBugCnt},
@ -284,8 +297,8 @@
total_finish_pay_cnt = #{totalFinishPayCnt}, total_finish_pay_cnt = #{totalFinishPayCnt},
total_finish_pay_user_cnt = #{totalFinishPayUserCnt}, total_finish_pay_user_cnt = #{totalFinishPayUserCnt},
total_need_pay_user_cnt = #{totalNeedPayUserCnt}, 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}, test_cases = #{testCases},
exec_cases = #{execCases}, exec_cases = #{execCases},
design_cases = #{designCases}, design_cases = #{designCases},
@ -293,7 +306,14 @@
iteration_cnt = #{iterationCnt}, iteration_cnt = #{iterationCnt},
product_cnt = #{productCnt}, product_cnt = #{productCnt},
menu_cnt = #{menuCnt}, menu_cnt = #{menuCnt},
project_cnt = #{projectCnt}
project_cnt = #{projectCnt},
product_budget_workload = #{productBudgetWorkload},
product_act_workload = #{productActWorkload},
estimate_workload = #{estimateWorkload},
exec_task_cnt = #{execTaskCnt},
to_start_task_cnt = #{toStartTaskCnt},
exec_menu_cnt = #{execMenuCnt},
to_start_menu_cnt = #{toStartMenuCnt}
</sql> </sql>
<sql id="someFieldSet"> <sql id="someFieldSet">
<if test="bizDate != null and bizDate != ''"> biz_date = #{bizDate}, </if> <if test="bizDate != null and bizDate != ''"> biz_date = #{bizDate}, </if>
@ -315,15 +335,15 @@
<if test="totalNeedColAmount != null and totalNeedColAmount != ''"> total_need_col_amount = #{totalNeedColAmount}, </if> <if test="totalNeedColAmount != null and totalNeedColAmount != ''"> total_need_col_amount = #{totalNeedColAmount}, </if>
<if test="totalFinishColAmount != null and totalFinishColAmount != ''"> total_finish_col_amount = #{totalFinishColAmount}, </if> <if test="totalFinishColAmount != null and totalFinishColAmount != ''"> total_finish_col_amount = #{totalFinishColAmount}, </if>
<if test="totalCostUserAmount != null and totalCostUserAmount != ''"> total_cost_user_amount = #{totalCostUserAmount}, </if> <if test="totalCostUserAmount != null and totalCostUserAmount != ''"> total_cost_user_amount = #{totalCostUserAmount}, </if>
<if test="totalBudgetInnerUserAmount != null and totalBudgetInnerUserAmount != ''"> total_budget_inner_user_amount = #{totalBudgetInnerUserAmount}, </if>
<if test="totalBudgetIuserAmount != null and totalBudgetIuserAmount != ''"> total_budget_iuser_amount = #{totalBudgetIuserAmount}, </if>
<if test="totalPlanWorkload != null and totalPlanWorkload != ''"> total_plan_workload = #{totalPlanWorkload}, </if> <if test="totalPlanWorkload != null and totalPlanWorkload != ''"> total_plan_workload = #{totalPlanWorkload}, </if>
<if test="totalRiskCnt != null and totalRiskCnt != ''"> total_risk_cnt = #{totalRiskCnt}, </if> <if test="totalRiskCnt != null and totalRiskCnt != ''"> total_risk_cnt = #{totalRiskCnt}, </if>
<if test="totalCompleteRiskCnt != null and totalCompleteRiskCnt != ''"> total_complete_risk_cnt = #{totalCompleteRiskCnt}, </if> <if test="totalCompleteRiskCnt != null and totalCompleteRiskCnt != ''"> total_complete_risk_cnt = #{totalCompleteRiskCnt}, </if>
<if test="branchName != null and branchName != ''"> branch_name = #{branchName}, </if> <if test="branchName != null and branchName != ''"> branch_name = #{branchName}, </if>
<if test="totalBudgetOutUserAmount != null and totalBudgetOutUserAmount != ''"> total_budget_out_user_amount = #{totalBudgetOutUserAmount}, </if>
<if test="totalBudgetOuserAmount != null and totalBudgetOuserAmount != ''"> total_budget_ouser_amount = #{totalBudgetOuserAmount}, </if>
<if test="totalCompleteWorkload != null and totalCompleteWorkload != ''"> total_complete_workload = #{totalCompleteWorkload}, </if> <if test="totalCompleteWorkload != null and totalCompleteWorkload != ''"> total_complete_workload = #{totalCompleteWorkload}, </if>
<if test="totalCostInnerUserAmount != null and totalCostInnerUserAmount != ''"> total_cost_inner_user_amount = #{totalCostInnerUserAmount}, </if>
<if test="totalCostOutUserAmount != null and totalCostOutUserAmount != ''"> total_cost_out_user_amount = #{totalCostOutUserAmount}, </if>
<if test="totalCostIuserAmount != null and totalCostIuserAmount != ''"> total_cost_iuser_amount = #{totalCostIuserAmount}, </if>
<if test="totalCostOuserAmount != null and totalCostOuserAmount != ''"> total_cost_ouser_amount = #{totalCostOuserAmount}, </if>
<if test="totalProgress != null and totalProgress != ''"> total_progress = #{totalProgress}, </if> <if test="totalProgress != null and totalProgress != ''"> total_progress = #{totalProgress}, </if>
<if test="totalActiveBugCnt != null and totalActiveBugCnt != ''"> total_active_bug_cnt = #{totalActiveBugCnt}, </if> <if test="totalActiveBugCnt != null and totalActiveBugCnt != ''"> total_active_bug_cnt = #{totalActiveBugCnt}, </if>
<if test="totalConfirmedBugCnt != null and totalConfirmedBugCnt != ''"> total_confirmed_bug_cnt = #{totalConfirmedBugCnt}, </if> <if test="totalConfirmedBugCnt != null and totalConfirmedBugCnt != ''"> total_confirmed_bug_cnt = #{totalConfirmedBugCnt}, </if>
@ -337,8 +357,8 @@
<if test="totalFinishPayCnt != null and totalFinishPayCnt != ''"> total_finish_pay_cnt = #{totalFinishPayCnt}, </if> <if test="totalFinishPayCnt != null and totalFinishPayCnt != ''"> total_finish_pay_cnt = #{totalFinishPayCnt}, </if>
<if test="totalFinishPayUserCnt != null and totalFinishPayUserCnt != ''"> total_finish_pay_user_cnt = #{totalFinishPayUserCnt}, </if> <if test="totalFinishPayUserCnt != null and totalFinishPayUserCnt != ''"> total_finish_pay_user_cnt = #{totalFinishPayUserCnt}, </if>
<if test="totalNeedPayUserCnt != null and totalNeedPayUserCnt != ''"> total_need_pay_user_cnt = #{totalNeedPayUserCnt}, </if> <if test="totalNeedPayUserCnt != null and totalNeedPayUserCnt != ''"> total_need_pay_user_cnt = #{totalNeedPayUserCnt}, </if>
<if test="totalPlanInnerUserWorkload != null and totalPlanInnerUserWorkload != ''"> total_plan_inner_user_workload = #{totalPlanInnerUserWorkload}, </if>
<if test="totalPlanOutUserWorkload != null and totalPlanOutUserWorkload != ''"> total_plan_out_user_workload = #{totalPlanOutUserWorkload}, </if>
<if test="totalPlanIuserWorkload != null and totalPlanIuserWorkload != ''"> total_plan_iuser_workload = #{totalPlanIuserWorkload}, </if>
<if test="totalPlanOuserWorkload != null and totalPlanOuserWorkload != ''"> total_plan_ouser_workload = #{totalPlanOuserWorkload}, </if>
<if test="testCases != null and testCases != ''"> test_cases = #{testCases}, </if> <if test="testCases != null and testCases != ''"> test_cases = #{testCases}, </if>
<if test="execCases != null and execCases != ''"> exec_cases = #{execCases}, </if> <if test="execCases != null and execCases != ''"> exec_cases = #{execCases}, </if>
<if test="designCases != null and designCases != ''"> design_cases = #{designCases}, </if> <if test="designCases != null and designCases != ''"> design_cases = #{designCases}, </if>
@ -347,6 +367,13 @@
<if test="productCnt != null and productCnt != ''"> product_cnt = #{productCnt}, </if> <if test="productCnt != null and productCnt != ''"> product_cnt = #{productCnt}, </if>
<if test="menuCnt != null and menuCnt != ''"> menu_cnt = #{menuCnt}, </if> <if test="menuCnt != null and menuCnt != ''"> menu_cnt = #{menuCnt}, </if>
<if test="projectCnt != null and projectCnt != ''"> project_cnt = #{projectCnt}, </if> <if test="projectCnt != null and projectCnt != ''"> project_cnt = #{projectCnt}, </if>
<if test="productBudgetWorkload != null and productBudgetWorkload != ''"> product_budget_workload = #{productBudgetWorkload}, </if>
<if test="productActWorkload != null and productActWorkload != ''"> product_act_workload = #{productActWorkload}, </if>
<if test="estimateWorkload != null and estimateWorkload != ''"> estimate_workload = #{estimateWorkload}, </if>
<if test="execTaskCnt != null and execTaskCnt != ''"> exec_task_cnt = #{execTaskCnt}, </if>
<if test="toStartTaskCnt != null and toStartTaskCnt != ''"> to_start_task_cnt = #{toStartTaskCnt}, </if>
<if test="execMenuCnt != null and execMenuCnt != ''"> exec_menu_cnt = #{execMenuCnt}, </if>
<if test="toStartMenuCnt != null and toStartMenuCnt != ''"> to_start_menu_cnt = #{toStartMenuCnt}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -369,15 +396,15 @@
total_need_col_amount = #{item.totalNeedColAmount}, total_need_col_amount = #{item.totalNeedColAmount},
total_finish_col_amount = #{item.totalFinishColAmount}, total_finish_col_amount = #{item.totalFinishColAmount},
total_cost_user_amount = #{item.totalCostUserAmount}, 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_plan_workload = #{item.totalPlanWorkload},
total_risk_cnt = #{item.totalRiskCnt}, total_risk_cnt = #{item.totalRiskCnt},
total_complete_risk_cnt = #{item.totalCompleteRiskCnt}, total_complete_risk_cnt = #{item.totalCompleteRiskCnt},
branch_name = #{item.branchName}, branch_name = #{item.branchName},
total_budget_out_user_amount = #{item.totalBudgetOutUserAmount},
total_budget_ouser_amount = #{item.totalBudgetOuserAmount},
total_complete_workload = #{item.totalCompleteWorkload}, 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_progress = #{item.totalProgress},
total_active_bug_cnt = #{item.totalActiveBugCnt}, total_active_bug_cnt = #{item.totalActiveBugCnt},
total_confirmed_bug_cnt = #{item.totalConfirmedBugCnt}, total_confirmed_bug_cnt = #{item.totalConfirmedBugCnt},
@ -391,8 +418,8 @@
total_finish_pay_cnt = #{item.totalFinishPayCnt}, total_finish_pay_cnt = #{item.totalFinishPayCnt},
total_finish_pay_user_cnt = #{item.totalFinishPayUserCnt}, total_finish_pay_user_cnt = #{item.totalFinishPayUserCnt},
total_need_pay_user_cnt = #{item.totalNeedPayUserCnt}, 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}, test_cases = #{item.testCases},
exec_cases = #{item.execCases}, exec_cases = #{item.execCases},
design_cases = #{item.designCases}, design_cases = #{item.designCases},
@ -400,6 +427,13 @@
iteration_cnt = #{item.iterationCnt}, iteration_cnt = #{item.iterationCnt},
product_cnt = #{item.productCnt}, product_cnt = #{item.productCnt},
menu_cnt = #{item.menuCnt}, menu_cnt = #{item.menuCnt},
project_cnt = #{item.projectCnt}
project_cnt = #{item.projectCnt},
product_budget_workload = #{item.productBudgetWorkload},
product_act_workload = #{item.productActWorkload},
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}
</sql> </sql>
</mapper> </mapper>

63
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchTaskTypeStateMapper.xml

@ -3,14 +3,22 @@
<mapper namespace="com.xm.core.entity.XmBranchTaskTypeState"> <mapper namespace="com.xm.core.entity.XmBranchTaskTypeState">
<!--开始 自定sql函数区域 -->
<!--请在此区域添加自定义函数-->
<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动,因为代码随时重新生成 -->
<sql id="whereForMap">
<if test=" ids != null"> and (res.id) in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</if>
<if test="key != null and key !='' "> </if>
</sql>
<update id="loadProjectTaskTypeStateToXmBranchTaskTypeState" parameterType="String" statementType="CALLABLE"> <update id="loadProjectTaskTypeStateToXmBranchTaskTypeState" parameterType="String" statementType="CALLABLE">
{call load_project_task_type_state_to_xm_branch_task_type_state(#{branchId,mode=IN})}
{call load_project_task_type_state_to_xm_branch_task_type_state(#{branchId,mode=IN})}
</update> </update>
<!--结束 自定义sql函数区域--> <!--结束 自定义sql函数区域-->
@ -18,15 +26,9 @@
<!-- 通过条件查询获取数据列表 返回list<map> --> <!-- 通过条件查询获取数据列表 返回list<map> -->
<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap"> <select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
select * from xm_branch_task_type_state res select * from xm_branch_task_type_state res
<where>
<if test="ids != null"> and
id in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</if>
<where>
<include refid="whereForMap"/>
<include refid="where"/> <include refid="where"/>
<if test="key != null and key !='' "> </if>
</where> </where>
</select> </select>
@ -44,7 +46,13 @@
where where
res.id = #{id} res.id = #{id}
</select> </select>
<select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmBranchTaskTypeState">
select * from xm_branch_task_type_state res
where (res.id) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</select>
<!-- 通过主键查询获取数据对象 返回map--> <!-- 通过主键查询获取数据对象 返回map-->
<select id="selectOneMap" parameterType="HashMap" resultType="HashMap"> <select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
select * from xm_branch_task_type_state res select * from xm_branch_task_type_state res
@ -59,7 +67,7 @@
</where> </where>
</select> </select>
<!-- 新增一条记录 主键id,--> <!-- 新增一条记录 主键id,-->
<insert id="insert" parameterType="com.xm.core.entity.XmBranchTaskTypeState" useGeneratedKeys="false" keyProperty="id">
<insert id="insert" parameterType="com.xm.core.entity.XmBranchTaskTypeState" useGeneratedKeys="false" keyProperty="id">
insert into xm_branch_task_type_state( insert into xm_branch_task_type_state(
<include refid="columns"/> <include refid="columns"/>
) values ( ) values (
@ -77,13 +85,13 @@
<!-- 按主键删除一条记录--> <!-- 按主键删除一条记录-->
<delete id="deleteByPk" parameterType="com.xm.core.entity.XmBranchTaskTypeState"> <delete id="deleteByPk" parameterType="com.xm.core.entity.XmBranchTaskTypeState">
delete from xm_branch_task_type_state
delete from xm_branch_task_type_state
where id = #{id} where id = #{id}
</delete> </delete>
<!-- 根据条件修改若干条记录 --> <!-- 根据条件修改若干条记录 -->
<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmBranchTaskTypeState"> <update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmBranchTaskTypeState">
update xm_branch_task_type_state
update xm_branch_task_type_state
<set> <set>
<include refid="someFieldSet"/> <include refid="someFieldSet"/>
</set> </set>
@ -92,7 +100,7 @@
<!-- 根据主键修改一条记录 --> <!-- 根据主键修改一条记录 -->
<update id="updateByPk" parameterType="com.xm.core.entity.XmBranchTaskTypeState"> <update id="updateByPk" parameterType="com.xm.core.entity.XmBranchTaskTypeState">
update xm_branch_task_type_state
update xm_branch_task_type_state
<set> <set>
<include refid="set"/> <include refid="set"/>
</set> </set>
@ -107,7 +115,7 @@
<!-- 批量更新 --> <!-- 批量更新 -->
<update id="batchUpdate" parameterType="List"> <update id="batchUpdate" parameterType="List">
<foreach collection="list" item="item" index="index" separator=";" > <foreach collection="list" item="item" index="index" separator=";" >
update xm_branch_task_type_state
update xm_branch_task_type_state
set set
<include refid="batchSet"/> <include refid="batchSet"/>
where id = #{item.id} where id = #{item.id}
@ -115,11 +123,12 @@
</update> </update>
<!-- 批量删除 --> <!-- 批量删除 -->
<delete id="batchDelete" parameterType="List"> <delete id="batchDelete" parameterType="List">
delete from xm_branch_task_type_state
where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
#{item.id }
</foreach>
delete from xm_branch_task_type_state
where
(id) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item.id} )
</foreach>
</delete> </delete>
@ -127,7 +136,7 @@
<sql id="columns"> <sql id="columns">
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 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
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
<sql id="where"> <sql id="where">
<if test="taskType != null and taskType != ''"> and res.task_type = #{taskType} </if> <if test="taskType != null and taskType != ''"> and res.task_type = #{taskType} </if>
@ -137,7 +146,7 @@
<if test="actAmount != null and actAmount != ''"> and res.act_amount = #{actAmount} </if> <if test="actAmount != null and actAmount != ''"> and res.act_amount = #{actAmount} </if>
<if test="branchId != null and branchId != ''"> and res.branch_id = #{branchId} </if> <if test="branchId != null and branchId != ''"> and res.branch_id = #{branchId} </if>
<if test="bizDate != null and bizDate != ''"> and res.biz_date = #{bizDate} </if> <if test="bizDate != null and bizDate != ''"> and res.biz_date = #{bizDate} </if>
<if test="calcTime != null"> and TO_CHAR(res.calc_time,'YYYY-MM-DD') = TO_CHAR(#{calcTime},'YYYY-MM-DD') </if>
<if test="calcTime != null"> and date_format(res.calc_time,'%Y-%m-%d') = date_format(#{calcTime},'%Y-%m-%d') </if>
<if test="planOutUserAt != null and planOutUserAt != ''"> and res.plan_out_user_at = #{planOutUserAt} </if> <if test="planOutUserAt != null and planOutUserAt != ''"> and res.plan_out_user_at = #{planOutUserAt} </if>
<if test="planInnerUserAt != null and planInnerUserAt != ''"> and res.plan_inner_user_at = #{planInnerUserAt} </if> <if test="planInnerUserAt != null and planInnerUserAt != ''"> and res.plan_inner_user_at = #{planInnerUserAt} </if>
<if test="actOutUserAt != null and actOutUserAt != ''"> and res.act_out_user_at = #{actOutUserAt} </if> <if test="actOutUserAt != null and actOutUserAt != ''"> and res.act_out_user_at = #{actOutUserAt} </if>

8
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationStateMapper.xml

@ -45,7 +45,13 @@
where where
res.iteration_id = #{iterationId} res.iteration_id = #{iterationId}
</select> </select>
<select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmIterationState">
select * from xm_iteration_state res
where (res.iteration_id) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</select>
<!-- 通过主键查询获取数据对象 返回map--> <!-- 通过主键查询获取数据对象 返回map-->
<select id="selectOneMap" parameterType="HashMap" resultType="HashMap"> <select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
select * from xm_iteration_state res select * from xm_iteration_state res

28
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml

@ -175,7 +175,13 @@
where where
res.menu_id = #{menuId} res.menu_id = #{menuId}
</select> </select>
<select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmMenu">
select * from xm_menu res
where (res.menu_id) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</select>
<!-- 通过主键查询获取数据对象 返回map--> <!-- 通过主键查询获取数据对象 返回map-->
<select id="selectOneMap" parameterType="HashMap" resultType="HashMap"> <select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
select * from xm_menu res select * from xm_menu res
@ -194,7 +200,7 @@
insert into xm_menu( insert into xm_menu(
<include refid="columns"/> <include refid="columns"/>
) values ( ) values (
#{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}
) )
</insert> </insert>
@ -257,7 +263,7 @@
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <sql id="columns">
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
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -295,6 +301,9 @@
<if test="phaseId != null and phaseId != ''"> and res.phase_id = #{phaseId} </if> <if test="phaseId != null and phaseId != ''"> and res.phase_id = #{phaseId} </if>
<if test="iterationId != null and iterationId != ''"> and res.iteration_id = #{iterationId} </if> <if test="iterationId != null and iterationId != ''"> and res.iteration_id = #{iterationId} </if>
<if test="calcType != null and calcType != ''"> and res.calc_type = #{calcType} </if> <if test="calcType != null and calcType != ''"> and res.calc_type = #{calcType} </if>
<if test="mactWorkload != null and mactWorkload != ''"> and res.mact_workload = #{mactWorkload} </if>
<if test="mactAmount != null and mactAmount != ''"> and res.mact_amount = #{mactAmount} </if>
<if test="mactRate != null and mactRate != ''"> and res.mact_rate = #{mactRate} </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -329,7 +338,10 @@
budget_amount = #{budgetAmount}, budget_amount = #{budgetAmount},
phase_id = #{phaseId}, phase_id = #{phaseId},
iteration_id = #{iterationId}, iteration_id = #{iterationId},
calc_type = #{calcType}
calc_type = #{calcType},
mact_workload = #{mactWorkload},
mact_amount = #{mactAmount},
mact_rate = #{mactRate}
</sql> </sql>
<sql id="someFieldSet"> <sql id="someFieldSet">
<if test="menuName != null and menuName != ''"> menu_name = #{menuName}, </if> <if test="menuName != null and menuName != ''"> menu_name = #{menuName}, </if>
@ -364,6 +376,9 @@
<if test="phaseId != null and phaseId != ''"> phase_id = #{phaseId}, </if> <if test="phaseId != null and phaseId != ''"> phase_id = #{phaseId}, </if>
<if test="iterationId != null and iterationId != ''"> iteration_id = #{iterationId}, </if> <if test="iterationId != null and iterationId != ''"> iteration_id = #{iterationId}, </if>
<if test="calcType != null and calcType != ''"> calc_type = #{calcType}, </if> <if test="calcType != null and calcType != ''"> calc_type = #{calcType}, </if>
<if test="mactWorkload != null and mactWorkload != ''"> mact_workload = #{mactWorkload}, </if>
<if test="mactAmount != null and mactAmount != ''"> mact_amount = #{mactAmount}, </if>
<if test="mactRate != null and mactRate != ''"> mact_rate = #{mactRate}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -398,6 +413,9 @@
budget_amount = #{item.budgetAmount}, budget_amount = #{item.budgetAmount},
phase_id = #{item.phaseId}, phase_id = #{item.phaseId},
iteration_id = #{item.iterationId}, iteration_id = #{item.iterationId},
calc_type = #{item.calcType}
calc_type = #{item.calcType},
mact_workload = #{item.mactWorkload},
mact_amount = #{item.mactAmount},
mact_rate = #{item.mactRate}
</sql> </sql>
</mapper> </mapper>

8
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuStateMapper.xml

@ -155,7 +155,13 @@
where where
res.menu_id = #{menuId} res.menu_id = #{menuId}
</select> </select>
<select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmMenuState">
select * from xm_menu_state res
where (res.menu_id) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</select>
<!-- 通过主键查询获取数据对象 返回map--> <!-- 通过主键查询获取数据对象 返回map-->
<select id="selectOneMap" parameterType="HashMap" resultType="HashMap"> <select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
select * from xm_menu_state res select * from xm_menu_state res

11
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductStateMapper.xml

@ -13,9 +13,6 @@
</if> </if>
<if test="key != null and key !='' "> </if> <if test="key != null and key !='' "> </if>
</sql> </sql>
<update id="loadTasksToXmProductState" parameterType="String" statementType="CALLABLE">
{call load_tasks_to_xm_product_state(#{productId,mode=IN})}
</update>
<!--结束 自定义sql函数区域--> <!--结束 自定义sql函数区域-->
@ -45,7 +42,13 @@
where where
res.product_id = #{productId} res.product_id = #{productId}
</select> </select>
<select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmProductState">
select * from xm_product_state res
where (res.product_id) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</select>
<!-- 通过主键查询获取数据对象 返回map--> <!-- 通过主键查询获取数据对象 返回map-->
<select id="selectOneMap" parameterType="HashMap" resultType="HashMap"> <select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
select * from xm_product_state res select * from xm_product_state res

199
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostNouserMapper.xml

@ -3,92 +3,98 @@
<mapper namespace="com.xm.core.entity.XmProjectMBudgetCostNouser"> <mapper namespace="com.xm.core.entity.XmProjectMBudgetCostNouser">
<!--开始 自定sql函数区域 -->
<!--请在此区域添加自定义函数-->
<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动,因为代码随时重新生成 -->
<!-- 插入流程审批表数据 -->
<sql id="whereForMap">
<if test=" ids != null"> and (res.id) in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</if>
<if test="key != null and key !='' "> </if>
</sql>
<insert id="insertProcessApprova" <insert id="insertProcessApprova"
parameterType="HashMap"
useGeneratedKeys="false" keyProperty="id">
parameterType="HashMap"
useGeneratedKeys="false" keyProperty="id">
insert into xm_project_m_budget_cost_nouser_process_approva ( insert into xm_project_m_budget_cost_nouser_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 ( ) 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}
) )
</insert> </insert>
<!-- 同时修改业务表及流程审批表数据状态 -->
<!-- 同时修改业务表及流程审批表数据状态 -->
<update id="updateProcessApprova" <update id="updateProcessApprova"
parameterType="HashMap">
parameterType="HashMap">
update xm_project_m_budget_cost_nouser b ,XM.xm_project_m_budget_cost_nouser_process_approva pa update xm_project_m_budget_cost_nouser b ,XM.xm_project_m_budget_cost_nouser_process_approva pa
<set>
<if test=' agree != null and agree !="" '> pa.agree = #{agree},</if>
<if test=' actId != null and actId !="" '> pa.act_id = #{actId},</if>
<if test=' assignee != null and assignee !="" '> pa.assignee = #{assignee},</if>
<if test=' assigneeName != null and assigneeName !="" '> pa.assignee_name = #{assigneeName},</if>
<if test=' taskName != null and taskName !="" '> pa.task_name = #{taskName},</if>
<if test=' commentMsg != null and commentMsg !="" '> pa.comment_msg = #{commentMsg},</if>
pa.flow_last_time = now(),
<if test=' eventName != null and eventName !="" '> pa.event_name = #{eventName},</if>
<if test=' flowState != null and flowState !="" '> pa.flow_state=#{flowState},</if>
<if test=' bizFlowState != null and bizFlowState !="" '> b.biz_flow_state=#{bizFlowState},</if>
<if test=' bizProcInstId != null and bizProcInstId !="" '> b.biz_proc_inst_id=#{bizProcInstId},</if>
</set>
<set>
<if test=' agree != null and agree !="" '> pa.agree = #{agree},</if>
<if test=' actId != null and actId !="" '> pa.act_id = #{actId},</if>
<if test=' assignee != null and assignee !="" '> pa.assignee = #{assignee},</if>
<if test=' assigneeName != null and assigneeName !="" '> pa.assignee_name = #{assigneeName},</if>
<if test=' taskName != null and taskName !="" '> pa.task_name = #{taskName},</if>
<if test=' commentMsg != null and commentMsg !="" '> pa.comment_msg = #{commentMsg},</if>
pa.flow_last_time = now(),
<if test=' eventName != null and eventName !="" '> pa.event_name = #{eventName},</if>
<if test=' flowState != null and flowState !="" '> pa.flow_state=#{flowState},</if>
<if test=' bizFlowState != null and bizFlowState !="" '> b.biz_flow_state=#{bizFlowState},</if>
<if test=' bizProcInstId != null and bizProcInstId !="" '> b.biz_proc_inst_id=#{bizProcInstId},</if>
</set>
where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
and b.id=pa.budget_id
</update>
and b.id=pa.budget_id
</update>
<update id="updateFlowStateByProcInstForDeleteSuccess" <update id="updateFlowStateByProcInstForDeleteSuccess"
parameterType="HashMap">
parameterType="HashMap">
update xm_project_m_budget_cost_nouser_process_approva pa set pa.flow_state='2' update xm_project_m_budget_cost_nouser_process_approva pa set pa.flow_state='2'
where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
</update>
</update>
<!-- 按条件删除若干条记录--> <!-- 按条件删除若干条记录-->
<delete id="deleteByProcInstId" parameterType="HashMap"> <delete id="deleteByProcInstId" parameterType="HashMap">
delete from xm_project_m_budget_cost_nouser delete from xm_project_m_budget_cost_nouser
where biz_proc_inst_id=#{procInstId}
</delete>
<!-- 通过条件查询获取数据列表 返回list<map> -->
where biz_proc_inst_id=#{procInstId}
</delete>
<!-- 通过条件查询获取数据列表 返回list<map> -->
<select id="listSum" parameterType="HashMap" resultType="HashMap"> <select id="listSum" parameterType="HashMap" resultType="HashMap">
select res.project_id,res.subject_id,res.subject_name,bizz_month,sum(res.budget_cost) as budget_cost from xm_project_m_budget_cost_nouser res select res.project_id,res.subject_id,res.subject_name,bizz_month,sum(res.budget_cost) as budget_cost from xm_project_m_budget_cost_nouser res
<where>
and res.project_id=#{projectId}
<if test="subjectId != null and subjectId !='' "> and res.subject_id =#{subjectId} </if>
<if test="costType != null and costType !='' "> and res.cost_type =#{costType} </if>
<where>
and res.project_id=#{projectId}
<if test="subjectId != null and subjectId !='' "> and res.subject_id =#{subjectId} </if>
<if test="costType != null and costType !='' "> and res.cost_type =#{costType} </if>
</where> </where>
group by res.project_id ,res.subject_id,res.subject_name,res.bizz_month
group by res.project_id ,res.subject_id,res.subject_name,res.bizz_month
</select> </select>
<!-- 查询非人力的预算及对应的项目的预算,非人力总预算不能大于项目非人力总预算 -->
<!-- 查询非人力的预算及对应的项目的预算,非人力总预算不能大于项目非人力总预算 -->
<select id="selectTotalProjectAndNouserBudgetCost" parameterType="HashMap" resultType="HashMap"> <select id="selectTotalProjectAndNouserBudgetCost" parameterType="HashMap" resultType="HashMap">
SELECT
sum( ifnull(res.budget_cost,0) ) AS budget_cost,
p.plan_nouser_at,
p.plan_inner_user_at,
p.plan_out_user_at,
p.locked,
p.plan_workload,
p.total_receivables,
p.budget_margin_rate,
p.contract_amt,
p.plan_inner_user_price,
p.plan_out_user_price,
p.plan_out_user_cnt,
p.plan_inner_user_cnt,
p.plan_working_hours
SELECT
sum( ifnull(res.budget_cost,0) ) AS budget_cost,
p.plan_nouser_at,
p.plan_inner_user_at,
p.plan_out_user_at,
p.locked,
p.plan_workload,
p.total_receivables,
p.budget_margin_rate,
p.contract_amt,
p.plan_inner_user_price,
p.plan_out_user_price,
p.plan_out_user_cnt,
p.plan_inner_user_cnt,
p.plan_working_hours
FROM FROM
XM.xm_project p
LEFT JOIN xm_project_m_budget_cost_nouser res ON p.id = res.project_id
XM.xm_project p
LEFT JOIN xm_project_m_budget_cost_nouser res ON p.id = res.project_id
<where> <where>
p.id = #{projectId} p.id = #{projectId}
<if test=" excludeIds !=null "> and res.id not in
<foreach collection="excludeIds" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</if>
</where>
<if test=" excludeIds !=null "> and res.id not in
<foreach collection="excludeIds" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</if>
</where>
</select> </select>
<!--结束 自定义sql函数区域--> <!--结束 自定义sql函数区域-->
@ -96,18 +102,12 @@
<!-- 通过条件查询获取数据列表 返回list<map> --> <!-- 通过条件查询获取数据列表 返回list<map> -->
<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap"> <select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
select res.*,pa.proc_inst_id,pa.assignee,pa.assignee_name,pa.main_title,pa.flow_branch_id,pa.task_name,pa.agree,pa.flow_last_time,pa.comment_msg,pa.proc_def_id,pa.flow_state from xm_project_m_budget_cost_nouser res left join xm_project_m_budget_cost_nouser_process_approva pa on res.id=pa.budget_id and res.biz_proc_inst_id=pa.proc_inst_id select res.*,pa.proc_inst_id,pa.assignee,pa.assignee_name,pa.main_title,pa.flow_branch_id,pa.task_name,pa.agree,pa.flow_last_time,pa.comment_msg,pa.proc_def_id,pa.flow_state from xm_project_m_budget_cost_nouser res left join xm_project_m_budget_cost_nouser_process_approva pa on res.id=pa.budget_id and res.biz_proc_inst_id=pa.proc_inst_id
<where>
<if test="ids != null"> and
id in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</if>
<where>
<include refid="whereForMap"></include>
<include refid="where"/> <include refid="where"/>
<if test="key != null and key !='' "> </if>
</where> </where>
</select>
</select>
<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> --> <!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->
<select id="selectListByWhere" parameterType="com.xm.core.entity.XmProjectMBudgetCostNouser" resultType="com.xm.core.entity.XmProjectMBudgetCostNouser"> <select id="selectListByWhere" parameterType="com.xm.core.entity.XmProjectMBudgetCostNouser" resultType="com.xm.core.entity.XmProjectMBudgetCostNouser">
@ -123,7 +123,13 @@
where where
res.id = #{id} res.id = #{id}
</select> </select>
<select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmProjectMBudgetCostNouser">
select * from xm_project_m_budget_cost_nouser res
where (res.id) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</select>
<!-- 通过主键查询获取数据对象 返回map--> <!-- 通过主键查询获取数据对象 返回map-->
<select id="selectOneMap" parameterType="HashMap" resultType="HashMap"> <select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
select * from xm_project_m_budget_cost_nouser res select * from xm_project_m_budget_cost_nouser res
@ -138,11 +144,11 @@
</where> </where>
</select> </select>
<!-- 新增一条记录 主键id,--> <!-- 新增一条记录 主键id,-->
<insert id="insert" parameterType="com.xm.core.entity.XmProjectMBudgetCostNouser" useGeneratedKeys="false" keyProperty="id">
<insert id="insert" parameterType="com.xm.core.entity.XmProjectMBudgetCostNouser" useGeneratedKeys="false" keyProperty="id">
insert into xm_project_m_budget_cost_nouser( insert into xm_project_m_budget_cost_nouser(
<include refid="columns"/> <include refid="columns"/>
) values ( ) 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}
) )
</insert> </insert>
@ -156,13 +162,13 @@
<!-- 按主键删除一条记录--> <!-- 按主键删除一条记录-->
<delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectMBudgetCostNouser"> <delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectMBudgetCostNouser">
delete from xm_project_m_budget_cost_nouser
delete from xm_project_m_budget_cost_nouser
where id = #{id} where id = #{id}
</delete> </delete>
<!-- 根据条件修改若干条记录 --> <!-- 根据条件修改若干条记录 -->
<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectMBudgetCostNouser"> <update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectMBudgetCostNouser">
update xm_project_m_budget_cost_nouser
update xm_project_m_budget_cost_nouser
<set> <set>
<include refid="someFieldSet"/> <include refid="someFieldSet"/>
</set> </set>
@ -171,7 +177,7 @@
<!-- 根据主键修改一条记录 --> <!-- 根据主键修改一条记录 -->
<update id="updateByPk" parameterType="com.xm.core.entity.XmProjectMBudgetCostNouser"> <update id="updateByPk" parameterType="com.xm.core.entity.XmProjectMBudgetCostNouser">
update xm_project_m_budget_cost_nouser
update xm_project_m_budget_cost_nouser
<set> <set>
<include refid="set"/> <include refid="set"/>
</set> </set>
@ -186,7 +192,7 @@
<!-- 批量更新 --> <!-- 批量更新 -->
<update id="batchUpdate" parameterType="List"> <update id="batchUpdate" parameterType="List">
<foreach collection="list" item="item" index="index" separator=";" > <foreach collection="list" item="item" index="index" separator=";" >
update xm_project_m_budget_cost_nouser
update xm_project_m_budget_cost_nouser
set set
<include refid="batchSet"/> <include refid="batchSet"/>
where id = #{item.id} where id = #{item.id}
@ -194,19 +200,20 @@
</update> </update>
<!-- 批量删除 --> <!-- 批量删除 -->
<delete id="batchDelete" parameterType="List"> <delete id="batchDelete" parameterType="List">
delete from xm_project_m_budget_cost_nouser
where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
#{item.id }
</foreach>
delete from xm_project_m_budget_cost_nouser
where
(id) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item.id} )
</foreach>
</delete> </delete>
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <sql id="columns">
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
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
<sql id="where"> <sql id="where">
<if test="projectId != null and projectId != ''"> and res.project_id = #{projectId} </if> <if test="projectId != null and projectId != ''"> and res.project_id = #{projectId} </if>
@ -214,13 +221,14 @@
<if test="id != null and id != ''"> and res.id = #{id} </if> <if test="id != null and id != ''"> and res.id = #{id} </if>
<if test="remark != null and remark != ''"> and res.remark = #{remark} </if> <if test="remark != null and remark != ''"> and res.remark = #{remark} </if>
<if test="subjectId != null and subjectId != ''"> and res.subject_id = #{subjectId} </if> <if test="subjectId != null and subjectId != ''"> and res.subject_id = #{subjectId} </if>
<if test="bizzStartDate != null"> and TO_CHAR(res.bizz_start_date,'YYYY-MM-DD') = TO_CHAR(#{bizzStartDate},'YYYY-MM-DD') </if>
<if test="bizzEndDate != null"> and TO_CHAR(res.bizz_end_date,'YYYY-MM-DD') = TO_CHAR(#{bizzEndDate},'YYYY-MM-DD') </if>
<if test="bizzStartDate != null"> and date_format(res.bizz_start_date,'%Y-%m-%d') = date_format(#{bizzStartDate},'%Y-%m-%d') </if>
<if test="bizzEndDate != null"> and date_format(res.bizz_end_date,'%Y-%m-%d') = date_format(#{bizzEndDate},'%Y-%m-%d') </if>
<if test="bizProcInstId != null and bizProcInstId != ''"> and res.biz_proc_inst_id = #{bizProcInstId} </if> <if test="bizProcInstId != null and bizProcInstId != ''"> and res.biz_proc_inst_id = #{bizProcInstId} </if>
<if test="bizFlowState != null and bizFlowState != ''"> and res.biz_flow_state = #{bizFlowState} </if> <if test="bizFlowState != null and bizFlowState != ''"> and res.biz_flow_state = #{bizFlowState} </if>
<if test="projectPhaseId != null and projectPhaseId != ''"> and res.project_phase_id = #{projectPhaseId} </if>
<if test="phaseId != null and phaseId != ''"> and res.phase_id = #{phaseId} </if>
<if test="costType != null and costType != ''"> and res.cost_type = #{costType} </if> <if test="costType != null and costType != ''"> and res.cost_type = #{costType} </if>
<if test="bizzMonth != null and bizzMonth != ''"> and res.bizz_month = #{bizzMonth} </if> <if test="bizzMonth != null and bizzMonth != ''"> and res.bizz_month = #{bizzMonth} </if>
<if test="subjectName != null and subjectName != ''"> and res.subject_name = #{subjectName} </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -232,9 +240,10 @@
bizz_end_date = #{bizzEndDate}, bizz_end_date = #{bizzEndDate},
biz_proc_inst_id = #{bizProcInstId}, biz_proc_inst_id = #{bizProcInstId},
biz_flow_state = #{bizFlowState}, biz_flow_state = #{bizFlowState},
project_phase_id = #{projectPhaseId},
phase_id = #{phaseId},
cost_type = #{costType}, cost_type = #{costType},
bizz_month = #{bizzMonth}
bizz_month = #{bizzMonth},
subject_name = #{subjectName}
</sql> </sql>
<sql id="someFieldSet"> <sql id="someFieldSet">
<if test="projectId != null and projectId != ''"> project_id = #{projectId}, </if> <if test="projectId != null and projectId != ''"> project_id = #{projectId}, </if>
@ -245,9 +254,10 @@
<if test="bizzEndDate != null"> bizz_end_date = #{bizzEndDate}, </if> <if test="bizzEndDate != null"> bizz_end_date = #{bizzEndDate}, </if>
<if test="bizProcInstId != null and bizProcInstId != ''"> biz_proc_inst_id = #{bizProcInstId}, </if> <if test="bizProcInstId != null and bizProcInstId != ''"> biz_proc_inst_id = #{bizProcInstId}, </if>
<if test="bizFlowState != null and bizFlowState != ''"> biz_flow_state = #{bizFlowState}, </if> <if test="bizFlowState != null and bizFlowState != ''"> biz_flow_state = #{bizFlowState}, </if>
<if test="projectPhaseId != null and projectPhaseId != ''"> project_phase_id = #{projectPhaseId}, </if>
<if test="phaseId != null and phaseId != ''"> phase_id = #{phaseId}, </if>
<if test="costType != null and costType != ''"> cost_type = #{costType}, </if> <if test="costType != null and costType != ''"> cost_type = #{costType}, </if>
<if test="bizzMonth != null and bizzMonth != ''"> bizz_month = #{bizzMonth}, </if> <if test="bizzMonth != null and bizzMonth != ''"> bizz_month = #{bizzMonth}, </if>
<if test="subjectName != null and subjectName != ''"> subject_name = #{subjectName}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -259,8 +269,9 @@
bizz_end_date = #{item.bizzEndDate}, bizz_end_date = #{item.bizzEndDate},
biz_proc_inst_id = #{item.bizProcInstId}, biz_proc_inst_id = #{item.bizProcInstId},
biz_flow_state = #{item.bizFlowState}, biz_flow_state = #{item.bizFlowState},
project_phase_id = #{item.projectPhaseId},
phase_id = #{item.phaseId},
cost_type = #{item.costType}, cost_type = #{item.costType},
bizz_month = #{item.bizzMonth}
bizz_month = #{item.bizzMonth},
subject_name = #{item.subjectName}
</sql> </sql>
</mapper> </mapper>

203
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostUserMapper.xml

@ -3,114 +3,116 @@
<mapper namespace="com.xm.core.entity.XmProjectMBudgetCostUser"> <mapper namespace="com.xm.core.entity.XmProjectMBudgetCostUser">
<!--开始 自定sql函数区域 -->
<!--请在此区域添加自定义函数-->
<!-- 插入流程审批表数据 -->
<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动,因为代码随时重新生成 -->
<sql id="whereForMap">
<if test=" ids != null"> and (res.id) in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</if>
<if test="key != null and key !='' "> </if>
</sql>
<insert id="insertProcessApprova" <insert id="insertProcessApprova"
parameterType="HashMap"
useGeneratedKeys="false" keyProperty="id">
parameterType="HashMap"
useGeneratedKeys="false" keyProperty="id">
insert into xm_project_m_budget_cost_user_process_approva ( 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 ( ) 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}
) )
</insert> </insert>
<!-- 同时修改业务表及流程审批表数据状态 -->
<!-- 同时修改业务表及流程审批表数据状态 -->
<update id="updateProcessApprova" <update id="updateProcessApprova"
parameterType="HashMap">
parameterType="HashMap">
update xm_project_m_budget_cost_user b ,XM.xm_project_m_budget_cost_user_process_approva pa update xm_project_m_budget_cost_user b ,XM.xm_project_m_budget_cost_user_process_approva pa
<set>
<if test=' agree != null and agree !="" '> pa.agree = #{agree},</if>
<if test=' actId != null and actId !="" '> pa.act_id = #{actId},</if>
<if test=' assignee != null and assignee !="" '> pa.assignee = #{assignee},</if>
<if test=' assigneeName != null and assigneeName !="" '> pa.assignee_name = #{assigneeName},</if>
<if test=' taskName != null and taskName !="" '> pa.task_name = #{taskName},</if>
<if test=' commentMsg != null and commentMsg !="" '> pa.comment_msg = #{commentMsg},</if>
pa.flow_last_time = now(),
<if test=' eventName != null and eventName !="" '> pa.event_name = #{eventName},</if>
<if test=' flowState != null and flowState !="" '> pa.flow_state=#{flowState},</if>
<if test=' bizFlowState != null and bizFlowState !="" '> b.biz_flow_state=#{bizFlowState},</if>
<if test=' bizProcInstId != null and bizProcInstId !="" '> b.biz_proc_inst_id=#{bizProcInstId},</if>
</set>
<set>
<if test=' agree != null and agree !="" '> pa.agree = #{agree},</if>
<if test=' actId != null and actId !="" '> pa.act_id = #{actId},</if>
<if test=' assignee != null and assignee !="" '> pa.assignee = #{assignee},</if>
<if test=' assigneeName != null and assigneeName !="" '> pa.assignee_name = #{assigneeName},</if>
<if test=' taskName != null and taskName !="" '> pa.task_name = #{taskName},</if>
<if test=' commentMsg != null and commentMsg !="" '> pa.comment_msg = #{commentMsg},</if>
pa.flow_last_time = now(),
<if test=' eventName != null and eventName !="" '> pa.event_name = #{eventName},</if>
<if test=' flowState != null and flowState !="" '> pa.flow_state=#{flowState},</if>
<if test=' bizFlowState != null and bizFlowState !="" '> b.biz_flow_state=#{bizFlowState},</if>
<if test=' bizProcInstId != null and bizProcInstId !="" '> b.biz_proc_inst_id=#{bizProcInstId},</if>
</set>
where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
and b.id=pa.budget_id
</update>
and b.id=pa.budget_id
</update>
<update id="updateFlowStateByProcInstForDeleteSuccess" <update id="updateFlowStateByProcInstForDeleteSuccess"
parameterType="HashMap">
parameterType="HashMap">
update xm_project_m_budget_cost_user_process_approva pa set pa.flow_state='2' 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} where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
</update>
</update>
<!-- 按条件删除若干条记录--> <!-- 按条件删除若干条记录-->
<delete id="deleteByProcInstId" parameterType="HashMap"> <delete id="deleteByProcInstId" parameterType="HashMap">
delete from xm_project_m_budget_cost_user delete from xm_project_m_budget_cost_user
where biz_proc_inst_id=#{procInstId}
where biz_proc_inst_id=#{procInstId}
</delete> </delete>
<!-- 通过条件查询获取数据列表 返回list<map> -->
<!-- 通过条件查询获取数据列表 返回list<map> -->
<select id="listSum" parameterType="HashMap" resultType="HashMap"> <select id="listSum" parameterType="HashMap" resultType="HashMap">
select res.project_id,res.userid,res.username,subject_id,subject_name,bizz_month,sum(res.budget_cost) as budget_cost from xm_project_m_budget_cost_user res select res.project_id,res.userid,res.username,subject_id,subject_name,bizz_month,sum(res.budget_cost) as budget_cost from xm_project_m_budget_cost_user res
<where>
and res.project_id=#{projectId}
<if test="subjectId != null and subjectId !='' "> and res.subject_id =#{subjectId} </if>
<if test="costType != null and costType !='' "> and res.cost_type =#{costType} </if>
<where>
and res.project_id=#{projectId}
<if test="subjectId != null and subjectId !='' "> and res.subject_id =#{subjectId} </if>
<if test="costType != null and costType !='' "> and res.cost_type =#{costType} </if>
</where> </where>
group by res.project_id,res.userid,res.username,subject_id,subject_name,bizz_month
group by res.project_id,res.userid,res.username,subject_id,subject_name,bizz_month
</select> </select>
<!-- 查询人力的预算及对应的项目的预算,人力总预算不能大于项目人力总预算 -->
<!-- 查询人力的预算及对应的项目的预算,人力总预算不能大于项目人力总预算 -->
<select id="selectTotalProjectAndUserBudgetCost" parameterType="HashMap" resultType="HashMap"> <select id="selectTotalProjectAndUserBudgetCost" parameterType="HashMap" resultType="HashMap">
SELECT SELECT
sum( case when res.cost_type='1' then ifnull(res.budget_cost,0) else 0 end ) AS budget_cost_inner_user_at,
sum( case when res.cost_type='2' then ifnull(res.budget_cost,0) else 0 end ) AS budget_cost_out_user_at,
sum( ifnull(res.budget_cost,0) ) AS budget_cost,
p.plan_nouser_at,
p.plan_inner_user_at,
p.plan_out_user_at,
p.locked,
p.plan_workload,
p.total_receivables,
p.budget_margin_rate,
p.contract_amt,
p.plan_inner_user_price,
p.plan_out_user_price,
p.plan_out_user_cnt,
p.plan_inner_user_cnt,
p.plan_working_hours
sum( case when res.cost_type='1' then ifnull(res.budget_cost,0) else 0 end ) AS budget_cost_inner_user_at,
sum( case when res.cost_type='2' then ifnull(res.budget_cost,0) else 0 end ) AS budget_cost_out_user_at,
sum( ifnull(res.budget_cost,0) ) AS budget_cost,
p.plan_nouser_at,
p.plan_inner_user_at,
p.plan_out_user_at,
p.locked,
p.plan_workload,
p.total_receivables,
p.budget_margin_rate,
p.contract_amt,
p.plan_inner_user_price,
p.plan_out_user_price,
p.plan_out_user_cnt,
p.plan_inner_user_cnt,
p.plan_working_hours
FROM FROM
XM.xm_project p
LEFT JOIN xm_project_m_budget_cost_user res ON p.id = res.project_id
XM.xm_project p
LEFT JOIN xm_project_m_budget_cost_user res ON p.id = res.project_id
<where> <where>
p.id = #{projectId} p.id = #{projectId}
<if test=" excludeIds !=null "> and res.id not in
<foreach collection="excludeIds" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</if>
</where>
<if test=" excludeIds !=null "> and res.id not in
<foreach collection="excludeIds" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</if>
</where>
</select> </select>
<!--结束 自定义sql函数区域-->
<!--结束 自定义sql函数区域-->
<!-- 通过条件查询获取数据列表 返回list<map> --> <!-- 通过条件查询获取数据列表 返回list<map> -->
<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap"> <select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
select res.*,pa.proc_inst_id,pa.assignee,pa.assignee_name,pa.main_title,pa.flow_branch_id,pa.task_name,pa.agree,pa.flow_last_time,pa.comment_msg,pa.proc_def_id,pa.flow_state from xm_project_m_budget_cost_user res left join xm_project_m_budget_cost_user_process_approva pa on res.id=pa.budget_id and res.biz_proc_inst_id=pa.proc_inst_id select res.*,pa.proc_inst_id,pa.assignee,pa.assignee_name,pa.main_title,pa.flow_branch_id,pa.task_name,pa.agree,pa.flow_last_time,pa.comment_msg,pa.proc_def_id,pa.flow_state from xm_project_m_budget_cost_user res left join xm_project_m_budget_cost_user_process_approva pa on res.id=pa.budget_id and res.biz_proc_inst_id=pa.proc_inst_id
<where>
<if test="ids != null"> and
id in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</if>
<where>
<include refid="whereForMap"></include>
<include refid="where"/> <include refid="where"/>
<if test="key != null and key !='' "> </if>
</where> </where>
</select> </select>
<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> --> <!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->
<select id="selectListByWhere" parameterType="com.xm.core.entity.XmProjectMBudgetCostUser" resultType="com.xm.core.entity.XmProjectMBudgetCostUser"> <select id="selectListByWhere" parameterType="com.xm.core.entity.XmProjectMBudgetCostUser" resultType="com.xm.core.entity.XmProjectMBudgetCostUser">
select * from xm_project_m_budget_cost_user res select * from xm_project_m_budget_cost_user res
@ -125,7 +127,13 @@
where where
res.id = #{id} res.id = #{id}
</select> </select>
<select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmProjectMBudgetCostUser">
select * from xm_project_m_budget_cost_user res
where (res.id) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</select>
<!-- 通过主键查询获取数据对象 返回map--> <!-- 通过主键查询获取数据对象 返回map-->
<select id="selectOneMap" parameterType="HashMap" resultType="HashMap"> <select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
select * from xm_project_m_budget_cost_user res select * from xm_project_m_budget_cost_user res
@ -140,11 +148,11 @@
</where> </where>
</select> </select>
<!-- 新增一条记录 主键id,--> <!-- 新增一条记录 主键id,-->
<insert id="insert" parameterType="com.xm.core.entity.XmProjectMBudgetCostUser" useGeneratedKeys="false" keyProperty="id">
<insert id="insert" parameterType="com.xm.core.entity.XmProjectMBudgetCostUser" useGeneratedKeys="false" keyProperty="id">
insert into xm_project_m_budget_cost_user( insert into xm_project_m_budget_cost_user(
<include refid="columns"/> <include refid="columns"/>
) values ( ) 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}
) )
</insert> </insert>
@ -158,13 +166,13 @@
<!-- 按主键删除一条记录--> <!-- 按主键删除一条记录-->
<delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectMBudgetCostUser"> <delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectMBudgetCostUser">
delete from xm_project_m_budget_cost_user
delete from xm_project_m_budget_cost_user
where id = #{id} where id = #{id}
</delete> </delete>
<!-- 根据条件修改若干条记录 --> <!-- 根据条件修改若干条记录 -->
<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectMBudgetCostUser"> <update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectMBudgetCostUser">
update xm_project_m_budget_cost_user
update xm_project_m_budget_cost_user
<set> <set>
<include refid="someFieldSet"/> <include refid="someFieldSet"/>
</set> </set>
@ -173,7 +181,7 @@
<!-- 根据主键修改一条记录 --> <!-- 根据主键修改一条记录 -->
<update id="updateByPk" parameterType="com.xm.core.entity.XmProjectMBudgetCostUser"> <update id="updateByPk" parameterType="com.xm.core.entity.XmProjectMBudgetCostUser">
update xm_project_m_budget_cost_user
update xm_project_m_budget_cost_user
<set> <set>
<include refid="set"/> <include refid="set"/>
</set> </set>
@ -188,7 +196,7 @@
<!-- 批量更新 --> <!-- 批量更新 -->
<update id="batchUpdate" parameterType="List"> <update id="batchUpdate" parameterType="List">
<foreach collection="list" item="item" index="index" separator=";" > <foreach collection="list" item="item" index="index" separator=";" >
update xm_project_m_budget_cost_user
update xm_project_m_budget_cost_user
set set
<include refid="batchSet"/> <include refid="batchSet"/>
where id = #{item.id} where id = #{item.id}
@ -196,19 +204,20 @@
</update> </update>
<!-- 批量删除 --> <!-- 批量删除 -->
<delete id="batchDelete" parameterType="List"> <delete id="batchDelete" parameterType="List">
delete from xm_project_m_budget_cost_user
where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
#{item.id }
</foreach>
delete from xm_project_m_budget_cost_user
where
(id) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item.id} )
</foreach>
</delete> </delete>
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <sql id="columns">
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
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
<sql id="where"> <sql id="where">
<if test="projectId != null and projectId != ''"> and res.project_id = #{projectId} </if> <if test="projectId != null and projectId != ''"> and res.project_id = #{projectId} </if>
@ -218,13 +227,14 @@
<if test="remark != null and remark != ''"> and res.remark = #{remark} </if> <if test="remark != null and remark != ''"> and res.remark = #{remark} </if>
<if test="username != null and username != ''"> and res.username = #{username} </if> <if test="username != null and username != ''"> and res.username = #{username} </if>
<if test="subjectId != null and subjectId != ''"> and res.subject_id = #{subjectId} </if> <if test="subjectId != null and subjectId != ''"> and res.subject_id = #{subjectId} </if>
<if test="bizzStartDate != null"> and TO_CHAR(res.bizz_start_date,'YYYY-MM-DD') = TO_CHAR(#{bizzStartDate},'YYYY-MM-DD') </if>
<if test="bizzEndDate != null"> and TO_CHAR(res.bizz_end_date,'YYYY-MM-DD') = TO_CHAR(#{bizzEndDate},'YYYY-MM-DD') </if>
<if test="bizzStartDate != null"> and date_format(res.bizz_start_date,'%Y-%m-%d') = date_format(#{bizzStartDate},'%Y-%m-%d') </if>
<if test="bizzEndDate != null"> and date_format(res.bizz_end_date,'%Y-%m-%d') = date_format(#{bizzEndDate},'%Y-%m-%d') </if>
<if test="bizzMonth != null and bizzMonth != ''"> and res.bizz_month = #{bizzMonth} </if> <if test="bizzMonth != null and bizzMonth != ''"> and res.bizz_month = #{bizzMonth} </if>
<if test="bizProcInstId != null and bizProcInstId != ''"> and res.biz_proc_inst_id = #{bizProcInstId} </if> <if test="bizProcInstId != null and bizProcInstId != ''"> and res.biz_proc_inst_id = #{bizProcInstId} </if>
<if test="bizFlowState != null and bizFlowState != ''"> and res.biz_flow_state = #{bizFlowState} </if> <if test="bizFlowState != null and bizFlowState != ''"> and res.biz_flow_state = #{bizFlowState} </if>
<if test="projectPhaseId != null and projectPhaseId != ''"> and res.project_phase_id = #{projectPhaseId} </if>
<if test="phaseId != null and phaseId != ''"> and res.phase_id = #{phaseId} </if>
<if test="costType != null and costType != ''"> and res.cost_type = #{costType} </if> <if test="costType != null and costType != ''"> and res.cost_type = #{costType} </if>
<if test="subjectName != null and subjectName != ''"> and res.subject_name = #{subjectName} </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -239,8 +249,9 @@
bizz_month = #{bizzMonth}, bizz_month = #{bizzMonth},
biz_proc_inst_id = #{bizProcInstId}, biz_proc_inst_id = #{bizProcInstId},
biz_flow_state = #{bizFlowState}, biz_flow_state = #{bizFlowState},
project_phase_id = #{projectPhaseId},
cost_type = #{costType}
phase_id = #{phaseId},
cost_type = #{costType},
subject_name = #{subjectName}
</sql> </sql>
<sql id="someFieldSet"> <sql id="someFieldSet">
<if test="projectId != null and projectId != ''"> project_id = #{projectId}, </if> <if test="projectId != null and projectId != ''"> project_id = #{projectId}, </if>
@ -254,8 +265,9 @@
<if test="bizzMonth != null and bizzMonth != ''"> bizz_month = #{bizzMonth}, </if> <if test="bizzMonth != null and bizzMonth != ''"> bizz_month = #{bizzMonth}, </if>
<if test="bizProcInstId != null and bizProcInstId != ''"> biz_proc_inst_id = #{bizProcInstId}, </if> <if test="bizProcInstId != null and bizProcInstId != ''"> biz_proc_inst_id = #{bizProcInstId}, </if>
<if test="bizFlowState != null and bizFlowState != ''"> biz_flow_state = #{bizFlowState}, </if> <if test="bizFlowState != null and bizFlowState != ''"> biz_flow_state = #{bizFlowState}, </if>
<if test="projectPhaseId != null and projectPhaseId != ''"> project_phase_id = #{projectPhaseId}, </if>
<if test="phaseId != null and phaseId != ''"> phase_id = #{phaseId}, </if>
<if test="costType != null and costType != ''"> cost_type = #{costType}, </if> <if test="costType != null and costType != ''"> cost_type = #{costType}, </if>
<if test="subjectName != null and subjectName != ''"> subject_name = #{subjectName}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -270,7 +282,8 @@
bizz_month = #{item.bizzMonth}, bizz_month = #{item.bizzMonth},
biz_proc_inst_id = #{item.bizProcInstId}, biz_proc_inst_id = #{item.bizProcInstId},
biz_flow_state = #{item.bizFlowState}, 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}
</sql> </sql>
</mapper> </mapper>

200
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostNouserMapper.xml

@ -3,109 +3,108 @@
<mapper namespace="com.xm.core.entity.XmProjectMCostNouser"> <mapper namespace="com.xm.core.entity.XmProjectMCostNouser">
<!--开始 自定sql函数区域 -->
<!--请在此区域添加自定义函数-->
<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动,因为代码随时重新生成 -->
<sql id="whereForMap">
<if test=" ids != null"> and (res.id) in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</if>
<if test="key != null and key !='' "> </if>
</sql>
<!-- 插入流程审批表数据 -->
<insert id="insertProcessApprova" <insert id="insertProcessApprova"
parameterType="HashMap"
useGeneratedKeys="false" keyProperty="id">
parameterType="HashMap"
useGeneratedKeys="false" keyProperty="id">
insert into xm_project_m_cost_nouser_process_approva ( 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 ( ) 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}
) )
</insert> </insert>
<!-- 同时修改业务表及流程审批表数据状态 -->
<!-- 同时修改业务表及流程审批表数据状态 -->
<update id="updateProcessApprova" <update id="updateProcessApprova"
parameterType="HashMap">
parameterType="HashMap">
update xm_project_m_cost_nouser b ,XM.xm_project_m_cost_nouser_process_approva pa update xm_project_m_cost_nouser b ,XM.xm_project_m_cost_nouser_process_approva pa
<set>
<if test=' agree != null and agree !="" '> pa.agree = #{agree},</if>
<if test=' actId != null and actId !="" '> pa.act_id = #{actId},</if>
<if test=' assignee != null and assignee !="" '> pa.assignee = #{assignee},</if>
<if test=' assigneeName != null and assigneeName !="" '> pa.assignee_name = #{assigneeName},</if>
<if test=' taskName != null and taskName !="" '> pa.task_name = #{taskName},</if>
<if test=' commentMsg != null and commentMsg !="" '> pa.comment_msg = #{commentMsg},</if>
pa.flow_last_time = now(),
<if test=' eventName != null and eventName !="" '> pa.event_name = #{eventName},</if>
<if test=' flowState != null and flowState !="" '> pa.flow_state=#{flowState},</if>
<if test=' bizFlowState != null and bizFlowState !="" '> b.biz_flow_state=#{bizFlowState},</if>
<if test=' bizProcInstId != null and bizProcInstId !="" '> b.biz_proc_inst_id=#{bizProcInstId},</if>
</set>
<set>
<if test=' agree != null and agree !="" '> pa.agree = #{agree},</if>
<if test=' actId != null and actId !="" '> pa.act_id = #{actId},</if>
<if test=' assignee != null and assignee !="" '> pa.assignee = #{assignee},</if>
<if test=' assigneeName != null and assigneeName !="" '> pa.assignee_name = #{assigneeName},</if>
<if test=' taskName != null and taskName !="" '> pa.task_name = #{taskName},</if>
<if test=' commentMsg != null and commentMsg !="" '> pa.comment_msg = #{commentMsg},</if>
pa.flow_last_time = now(),
<if test=' eventName != null and eventName !="" '> pa.event_name = #{eventName},</if>
<if test=' flowState != null and flowState !="" '> pa.flow_state=#{flowState},</if>
<if test=' bizFlowState != null and bizFlowState !="" '> b.biz_flow_state=#{bizFlowState},</if>
<if test=' bizProcInstId != null and bizProcInstId !="" '> b.biz_proc_inst_id=#{bizProcInstId},</if>
</set>
where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
and b.id=pa.cost_id
</update>
and b.id=pa.cost_id
</update>
<update id="updateFlowStateByProcInstForDeleteSuccess" <update id="updateFlowStateByProcInstForDeleteSuccess"
parameterType="HashMap">
parameterType="HashMap">
update xm_project_m_cost_nouser_process_approva pa set pa.flow_state='2' 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} where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
</update>
</update>
<!-- 按条件删除若干条记录--> <!-- 按条件删除若干条记录-->
<delete id="deleteByProcInstId" parameterType="HashMap"> <delete id="deleteByProcInstId" parameterType="HashMap">
delete from xm_project_m_cost_nouser delete from xm_project_m_cost_nouser
where biz_proc_inst_id=#{procInstId}
where biz_proc_inst_id=#{procInstId}
</delete> </delete>
<!-- 查询非人力的支出及对应的项目的预算,非人力支出不能大于项目非人力总预算 -->
<!-- 查询非人力的支出及对应的项目的预算,非人力支出不能大于项目非人力总预算 -->
<select id="selectTotalProjectAndNouserActCost" parameterType="HashMap" resultType="HashMap"> <select id="selectTotalProjectAndNouserActCost" parameterType="HashMap" resultType="HashMap">
SELECT
sum( ifnull(res.act_cost_amount,0) ) AS act_cost_nouser_amount,
p.plan_nouser_at,
p.plan_inner_user_at,
p.plan_out_user_at,
p.locked,
p.plan_workload,
p.total_receivables,
p.budget_margin_rate,
p.contract_amt,
p.plan_inner_user_price,
p.plan_out_user_price,
p.plan_out_user_cnt,
p.plan_inner_user_cnt,
p.plan_working_hours
SELECT
sum( ifnull(res.act_cost_amount,0) ) AS act_cost_nouser_amount,
p.plan_nouser_at,
p.plan_inner_user_at,
p.plan_out_user_at,
p.locked,
p.plan_workload,
p.total_receivables,
p.budget_margin_rate,
p.contract_amt,
p.plan_inner_user_price,
p.plan_out_user_price,
p.plan_out_user_cnt,
p.plan_inner_user_cnt,
p.plan_working_hours
FROM FROM
XM.xm_project p
LEFT JOIN xm_project_m_cost_nouser res ON p.id = res.project_id
XM.xm_project p
LEFT JOIN xm_project_m_cost_nouser res ON p.id = res.project_id
<where> <where>
p.id = #{projectId} p.id = #{projectId}
<if test=" excludeIds !=null "> and res.id not in
<foreach collection="excludeIds" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</if>
</where>
<if test=" excludeIds !=null "> and res.id not in
<foreach collection="excludeIds" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</if>
</where>
</select> </select>
<!-- 通过条件查询获取数据列表 返回list<map> -->
<!-- 通过条件查询获取数据列表 返回list<map> -->
<select id="listSum" parameterType="HashMap" resultType="HashMap"> <select id="listSum" parameterType="HashMap" resultType="HashMap">
select res.project_id,res.subject_id,res.subject_name,biz_month,sum(res.act_cost_amount) as act_cost_amount from xm_project_m_cost_nouser res select res.project_id,res.subject_id,res.subject_name,biz_month,sum(res.act_cost_amount) as act_cost_amount from xm_project_m_cost_nouser res
<where>
and res.project_id=#{projectId}
<if test="subjectId != null and subjectId !='' "> and res.subject_id =#{subjectId} </if>
<if test="costType != null and costType !='' "> and res.cost_type =#{costType} </if>
<where>
and res.project_id=#{projectId}
<if test="subjectId != null and subjectId !='' "> and res.subject_id =#{subjectId} </if>
<if test="costType != null and costType !='' "> and res.cost_type =#{costType} </if>
</where> </where>
group by res.project_id ,res.subject_id,res.subject_name,res.biz_month
group by res.project_id ,res.subject_id,res.subject_name,res.biz_month
</select> </select>
<!--结束 自定义sql函数区域-->
<!--结束 自定义sql函数区域-->
<!-- 通过条件查询获取数据列表 返回list<map> --> <!-- 通过条件查询获取数据列表 返回list<map> -->
<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap"> <select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
select res.*,pa.proc_inst_id,pa.assignee,pa.assignee_name,pa.main_title,pa.flow_branch_id,pa.task_name,pa.agree,pa.flow_last_time,pa.comment_msg,pa.proc_def_id,pa.flow_state from xm_project_m_cost_nouser res left join xm_project_m_cost_nouser_process_approva pa on res.id=pa.cost_id and res.biz_proc_inst_id=pa.proc_inst_id select res.*,pa.proc_inst_id,pa.assignee,pa.assignee_name,pa.main_title,pa.flow_branch_id,pa.task_name,pa.agree,pa.flow_last_time,pa.comment_msg,pa.proc_def_id,pa.flow_state from xm_project_m_cost_nouser res left join xm_project_m_cost_nouser_process_approva pa on res.id=pa.cost_id and res.biz_proc_inst_id=pa.proc_inst_id
<where>
<if test="ids != null"> and
id in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</if>
<where>
<include refid="whereForMap"/>
<include refid="where"/> <include refid="where"/>
<if test="key != null and key !='' "> </if>
</where> </where>
</select> </select>
@ -123,7 +122,13 @@
where where
res.id = #{id} res.id = #{id}
</select> </select>
<select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmProjectMCostNouser">
select * from xm_project_m_cost_nouser res
where (res.id) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</select>
<!-- 通过主键查询获取数据对象 返回map--> <!-- 通过主键查询获取数据对象 返回map-->
<select id="selectOneMap" parameterType="HashMap" resultType="HashMap"> <select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
select * from xm_project_m_cost_nouser res select * from xm_project_m_cost_nouser res
@ -138,11 +143,11 @@
</where> </where>
</select> </select>
<!-- 新增一条记录 主键id,--> <!-- 新增一条记录 主键id,-->
<insert id="insert" parameterType="com.xm.core.entity.XmProjectMCostNouser" useGeneratedKeys="false" keyProperty="id">
<insert id="insert" parameterType="com.xm.core.entity.XmProjectMCostNouser" useGeneratedKeys="false" keyProperty="id">
insert into xm_project_m_cost_nouser( insert into xm_project_m_cost_nouser(
<include refid="columns"/> <include refid="columns"/>
) values ( ) 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}
) )
</insert> </insert>
@ -156,13 +161,13 @@
<!-- 按主键删除一条记录--> <!-- 按主键删除一条记录-->
<delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectMCostNouser"> <delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectMCostNouser">
delete from xm_project_m_cost_nouser
delete from xm_project_m_cost_nouser
where id = #{id} where id = #{id}
</delete> </delete>
<!-- 根据条件修改若干条记录 --> <!-- 根据条件修改若干条记录 -->
<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectMCostNouser"> <update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectMCostNouser">
update xm_project_m_cost_nouser
update xm_project_m_cost_nouser
<set> <set>
<include refid="someFieldSet"/> <include refid="someFieldSet"/>
</set> </set>
@ -171,7 +176,7 @@
<!-- 根据主键修改一条记录 --> <!-- 根据主键修改一条记录 -->
<update id="updateByPk" parameterType="com.xm.core.entity.XmProjectMCostNouser"> <update id="updateByPk" parameterType="com.xm.core.entity.XmProjectMCostNouser">
update xm_project_m_cost_nouser
update xm_project_m_cost_nouser
<set> <set>
<include refid="set"/> <include refid="set"/>
</set> </set>
@ -186,7 +191,7 @@
<!-- 批量更新 --> <!-- 批量更新 -->
<update id="batchUpdate" parameterType="List"> <update id="batchUpdate" parameterType="List">
<foreach collection="list" item="item" index="index" separator=";" > <foreach collection="list" item="item" index="index" separator=";" >
update xm_project_m_cost_nouser
update xm_project_m_cost_nouser
set set
<include refid="batchSet"/> <include refid="batchSet"/>
where id = #{item.id} where id = #{item.id}
@ -194,25 +199,26 @@
</update> </update>
<!-- 批量删除 --> <!-- 批量删除 -->
<delete id="batchDelete" parameterType="List"> <delete id="batchDelete" parameterType="List">
delete from xm_project_m_cost_nouser
where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
#{item.id }
</foreach>
delete from xm_project_m_cost_nouser
where
(id) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item.id} )
</foreach>
</delete> </delete>
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <sql id="columns">
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
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
<sql id="where"> <sql id="where">
<if test="projectId != null and projectId != ''"> and res.project_id = #{projectId} </if> <if test="projectId != null and projectId != ''"> and res.project_id = #{projectId} </if>
<if test="userid != null and userid != ''"> and res.userid = #{userid} </if> <if test="userid != null and userid != ''"> and res.userid = #{userid} </if>
<if test="createTime != null"> and TO_CHAR(res.create_time,'YYYY-MM-DD') = TO_CHAR(#{createTime},'YYYY-MM-DD') </if>
<if test="sendCostTime != null"> and TO_CHAR(res.send_cost_time,'YYYY-MM-DD') = TO_CHAR(#{sendCostTime},'YYYY-MM-DD') </if>
<if test="createTime != null"> and date_format(res.create_time,'%Y-%m-%d') = date_format(#{createTime},'%Y-%m-%d') </if>
<if test="sendCostTime != null"> and date_format(res.send_cost_time,'%Y-%m-%d') = date_format(#{sendCostTime},'%Y-%m-%d') </if>
<if test="username != null and username != ''"> and res.username = #{username} </if> <if test="username != null and username != ''"> and res.username = #{username} </if>
<if test="projectName != null and projectName != ''"> and res.project_name = #{projectName} </if> <if test="projectName != null and projectName != ''"> and res.project_name = #{projectName} </if>
<if test="remark != null and remark != ''"> and res.remark = #{remark} </if> <if test="remark != null and remark != ''"> and res.remark = #{remark} </if>
@ -220,17 +226,17 @@
<if test="taskId != null and taskId != ''"> and res.task_id = #{taskId} </if> <if test="taskId != null and taskId != ''"> and res.task_id = #{taskId} </if>
<if test="taskName != null and taskName != ''"> and res.task_name = #{taskName} </if> <if test="taskName != null and taskName != ''"> and res.task_name = #{taskName} </if>
<if test="subjectId != null and subjectId != ''"> and res.subject_id = #{subjectId} </if> <if test="subjectId != null and subjectId != ''"> and res.subject_id = #{subjectId} </if>
<if test="bizzStartDate != null"> and TO_CHAR(res.bizz_start_date,'YYYY-MM-DD') = TO_CHAR(#{bizzStartDate},'YYYY-MM-DD') </if>
<if test="bizzEndDate != null"> and TO_CHAR(res.bizz_end_date,'YYYY-MM-DD') = TO_CHAR(#{bizzEndDate},'YYYY-MM-DD') </if>
<if test="bizzStartDate != null"> and date_format(res.bizz_start_date,'%Y-%m-%d') = date_format(#{bizzStartDate},'%Y-%m-%d') </if>
<if test="bizzEndDate != null"> and date_format(res.bizz_end_date,'%Y-%m-%d') = date_format(#{bizzEndDate},'%Y-%m-%d') </if>
<if test="bizProcInstId != null and bizProcInstId != ''"> and res.biz_proc_inst_id = #{bizProcInstId} </if> <if test="bizProcInstId != null and bizProcInstId != ''"> and res.biz_proc_inst_id = #{bizProcInstId} </if>
<if test="bizFlowState != null and bizFlowState != ''"> and res.biz_flow_state = #{bizFlowState} </if> <if test="bizFlowState != null and bizFlowState != ''"> and res.biz_flow_state = #{bizFlowState} </if>
<if test="projectPhaseId != null and projectPhaseId != ''"> and res.project_phase_id = #{projectPhaseId} </if>
<if test="phaseId != null and phaseId != ''"> and res.phase_id = #{phaseId} </if>
<if test="actCostAmount != null and actCostAmount != ''"> and res.act_cost_amount = #{actCostAmount} </if> <if test="actCostAmount != null and actCostAmount != ''"> and res.act_cost_amount = #{actCostAmount} </if>
<if test="costType != null and costType != ''"> and res.cost_type = #{costType} </if> <if test="costType != null and costType != ''"> and res.cost_type = #{costType} </if>
<if test="bizMonth != null and bizMonth != ''"> and res.biz_month = #{bizMonth} </if> <if test="bizMonth != null and bizMonth != ''"> and res.biz_month = #{bizMonth} </if>
<if test="bizDate != null and bizDate != ''"> and res.biz_date = #{bizDate} </if> <if test="bizDate != null and bizDate != ''"> and res.biz_date = #{bizDate} </if>
<if test="subjectName != null and subjectName != ''"> and res.subject_name = #{subjectName} </if> <if test="subjectName != null and subjectName != ''"> and res.subject_name = #{subjectName} </if>
<if test="projectName != null and projectName != ''"> and res.project_phase_name = #{projectName} </if>
<if test="phaseName != null and phaseName != ''"> and res.phase_name = #{phaseName} </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -248,13 +254,13 @@
bizz_end_date = #{bizzEndDate}, bizz_end_date = #{bizzEndDate},
biz_proc_inst_id = #{bizProcInstId}, biz_proc_inst_id = #{bizProcInstId},
biz_flow_state = #{bizFlowState}, biz_flow_state = #{bizFlowState},
project_phase_id = #{projectPhaseId},
phase_id = #{phaseId},
act_cost_amount = #{actCostAmount}, act_cost_amount = #{actCostAmount},
cost_type = #{costType}, cost_type = #{costType},
biz_month = #{bizMonth}, biz_month = #{bizMonth},
biz_date = #{bizDate}, biz_date = #{bizDate},
subject_name = #{subjectName}, subject_name = #{subjectName},
project_phase_name = #{projectName}
phase_name = #{phaseName}
</sql> </sql>
<sql id="someFieldSet"> <sql id="someFieldSet">
<if test="projectId != null and projectId != ''"> project_id = #{projectId}, </if> <if test="projectId != null and projectId != ''"> project_id = #{projectId}, </if>
@ -271,13 +277,13 @@
<if test="bizzEndDate != null"> bizz_end_date = #{bizzEndDate}, </if> <if test="bizzEndDate != null"> bizz_end_date = #{bizzEndDate}, </if>
<if test="bizProcInstId != null and bizProcInstId != ''"> biz_proc_inst_id = #{bizProcInstId}, </if> <if test="bizProcInstId != null and bizProcInstId != ''"> biz_proc_inst_id = #{bizProcInstId}, </if>
<if test="bizFlowState != null and bizFlowState != ''"> biz_flow_state = #{bizFlowState}, </if> <if test="bizFlowState != null and bizFlowState != ''"> biz_flow_state = #{bizFlowState}, </if>
<if test="projectPhaseId != null and projectPhaseId != ''"> project_phase_id = #{projectPhaseId}, </if>
<if test="phaseId != null and phaseId != ''"> phase_id = #{phaseId}, </if>
<if test="actCostAmount != null and actCostAmount != ''"> act_cost_amount = #{actCostAmount}, </if> <if test="actCostAmount != null and actCostAmount != ''"> act_cost_amount = #{actCostAmount}, </if>
<if test="costType != null and costType != ''"> cost_type = #{costType}, </if> <if test="costType != null and costType != ''"> cost_type = #{costType}, </if>
<if test="bizMonth != null and bizMonth != ''"> biz_month = #{bizMonth}, </if> <if test="bizMonth != null and bizMonth != ''"> biz_month = #{bizMonth}, </if>
<if test="bizDate != null and bizDate != ''"> biz_date = #{bizDate}, </if> <if test="bizDate != null and bizDate != ''"> biz_date = #{bizDate}, </if>
<if test="subjectName != null and subjectName != ''"> subject_name = #{subjectName}, </if> <if test="subjectName != null and subjectName != ''"> subject_name = #{subjectName}, </if>
<if test="projectName != null and projectName != ''"> project_phase_name = #{projectName}, </if>
<if test="phaseName != null and phaseName != ''"> phase_name = #{phaseName}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -295,12 +301,12 @@
bizz_end_date = #{item.bizzEndDate}, bizz_end_date = #{item.bizzEndDate},
biz_proc_inst_id = #{item.bizProcInstId}, biz_proc_inst_id = #{item.bizProcInstId},
biz_flow_state = #{item.bizFlowState}, biz_flow_state = #{item.bizFlowState},
project_phase_id = #{item.projectPhaseId},
phase_id = #{item.phaseId},
act_cost_amount = #{item.actCostAmount}, act_cost_amount = #{item.actCostAmount},
cost_type = #{item.costType}, cost_type = #{item.costType},
biz_month = #{item.bizMonth}, biz_month = #{item.bizMonth},
biz_date = #{item.bizDate}, biz_date = #{item.bizDate},
subject_name = #{item.subjectName}, subject_name = #{item.subjectName},
project_phase_name = #{item.projectName}
phase_name = #{item.phaseName}
</sql> </sql>
</mapper> </mapper>

252
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostUserMapper.xml

@ -3,150 +3,149 @@
<mapper namespace="com.xm.core.entity.XmProjectMCostUser"> <mapper namespace="com.xm.core.entity.XmProjectMCostUser">
<!--开始 自定sql函数区域 -->
<!--请在此区域添加自定义函数-->
<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动,因为代码随时重新生成 -->
<sql id="whereForMap">
<if test=" ids != null"> and (res.id) in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</if>
<if test="key != null and key !='' "> </if>
</sql>
<!-- 插入流程审批表数据 -->
<insert id="insertProcessApprova" <insert id="insertProcessApprova"
parameterType="HashMap"
useGeneratedKeys="false" keyProperty="id">
parameterType="HashMap"
useGeneratedKeys="false" keyProperty="id">
insert into xm_project_m_cost_user_process_approva ( 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 ( ) 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}
) )
</insert> </insert>
<!-- 同时修改业务表及流程审批表数据状态 -->
<!-- 同时修改业务表及流程审批表数据状态 -->
<update id="updateProcessApprova" <update id="updateProcessApprova"
parameterType="HashMap">
parameterType="HashMap">
update xm_project_m_cost_user b ,XM.xm_project_m_cost_user_process_approva pa update xm_project_m_cost_user b ,XM.xm_project_m_cost_user_process_approva pa
<set>
<if test=' agree != null and agree !="" '> pa.agree = #{agree},</if>
<if test=' actId != null and actId !="" '> pa.act_id = #{actId},</if>
<if test=' assignee != null and assignee !="" '> pa.assignee = #{assignee},</if>
<if test=' assigneeName != null and assigneeName !="" '> pa.assignee_name = #{assigneeName},</if>
<if test=' taskName != null and taskName !="" '> pa.task_name = #{taskName},</if>
<if test=' commentMsg != null and commentMsg !="" '> pa.comment_msg = #{commentMsg},</if>
pa.flow_last_time = now(),
<if test=' eventName != null and eventName !="" '> pa.event_name = #{eventName},</if>
<if test=' flowState != null and flowState !="" '> pa.flow_state=#{flowState},</if>
<if test=' bizFlowState != null and bizFlowState !="" '> b.biz_flow_state=#{bizFlowState},</if>
<if test=' bizProcInstId != null and bizProcInstId !="" '> b.biz_proc_inst_id=#{bizProcInstId},</if>
</set>
<set>
<if test=' agree != null and agree !="" '> pa.agree = #{agree},</if>
<if test=' actId != null and actId !="" '> pa.act_id = #{actId},</if>
<if test=' assignee != null and assignee !="" '> pa.assignee = #{assignee},</if>
<if test=' assigneeName != null and assigneeName !="" '> pa.assignee_name = #{assigneeName},</if>
<if test=' taskName != null and taskName !="" '> pa.task_name = #{taskName},</if>
<if test=' commentMsg != null and commentMsg !="" '> pa.comment_msg = #{commentMsg},</if>
pa.flow_last_time = now(),
<if test=' eventName != null and eventName !="" '> pa.event_name = #{eventName},</if>
<if test=' flowState != null and flowState !="" '> pa.flow_state=#{flowState},</if>
<if test=' bizFlowState != null and bizFlowState !="" '> b.biz_flow_state=#{bizFlowState},</if>
<if test=' bizProcInstId != null and bizProcInstId !="" '> b.biz_proc_inst_id=#{bizProcInstId},</if>
</set>
where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
and b.id=pa.cost_id
</update>
and b.id=pa.cost_id
</update>
<update id="updateFlowStateByProcInstForDeleteSuccess" <update id="updateFlowStateByProcInstForDeleteSuccess"
parameterType="HashMap">
parameterType="HashMap">
update xm_project_m_cost_user_process_approva pa set pa.flow_state='2' 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} where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
</update>
</update>
<!-- 按条件删除若干条记录--> <!-- 按条件删除若干条记录-->
<delete id="deleteByProcInstId" parameterType="HashMap"> <delete id="deleteByProcInstId" parameterType="HashMap">
delete from xm_project_m_cost_user delete from xm_project_m_cost_user
where biz_proc_inst_id=#{procInstId}
where biz_proc_inst_id=#{procInstId}
</delete> </delete>
<update id="updateExecuserStatusByExecuserProcInstId" <update id="updateExecuserStatusByExecuserProcInstId"
parameterType="HashMap">
parameterType="HashMap">
update xm_project_m_cost_user pa set pa.execuser_status=#{execuserStatus} update xm_project_m_cost_user pa set pa.execuser_status=#{execuserStatus}
where pa.execuser_proc_inst_id = #{execuserProcInstId}
</update>
where pa.execuser_proc_inst_id = #{execuserProcInstId}
</update>
<!-- 按条件删除若干条记录--> <!-- 按条件删除若干条记录-->
<delete id="deleteByExecuserProcInstId" parameterType="HashMap"> <delete id="deleteByExecuserProcInstId" parameterType="HashMap">
delete from xm_project_m_cost_user delete from xm_project_m_cost_user
where execuser_proc_inst_id=#{execuserProcInstId}
where execuser_proc_inst_id=#{execuserProcInstId}
</delete> </delete>
<!-- 查询人力的总支出及对应的项目的总预算,人力总支出不能大于项目人力总预算 -->
<!-- 查询人力的总支出及对应的项目的总预算,人力总支出不能大于项目人力总预算 -->
<select id="selectTotalProjectAndUserActCost" parameterType="HashMap" resultType="HashMap"> <select id="selectTotalProjectAndUserActCost" parameterType="HashMap" resultType="HashMap">
SELECT SELECT
sum( case when res.cost_type='1' then ifnull(res.act_cost_amount,0) else 0 end ) AS act_cost_inner_user_amount,
sum( case when res.cost_type='2' then ifnull(res.act_cost_amount,0) else 0 end ) AS act_cost_out_user_amount,
sum( ifnull(res.act_cost_amount,0) ) AS act_cost_user_amount,
p.plan_nouser_at,
p.plan_inner_user_at,
p.plan_out_user_at,
p.locked,
p.plan_workload,
p.total_receivables,
p.budget_margin_rate,
p.contract_amt,
p.plan_inner_user_price,
p.plan_out_user_price,
p.plan_out_user_cnt,
p.plan_inner_user_cnt,
p.plan_working_hours
sum( case when res.cost_type='1' then ifnull(res.act_cost_amount,0) else 0 end ) AS act_cost_inner_user_amount,
sum( case when res.cost_type='2' then ifnull(res.act_cost_amount,0) else 0 end ) AS act_cost_out_user_amount,
sum( ifnull(res.act_cost_amount,0) ) AS act_cost_user_amount,
p.plan_nouser_at,
p.plan_inner_user_at,
p.plan_out_user_at,
p.locked,
p.plan_workload,
p.total_receivables,
p.budget_margin_rate,
p.contract_amt,
p.plan_inner_user_price,
p.plan_out_user_price,
p.plan_out_user_cnt,
p.plan_inner_user_cnt,
p.plan_working_hours
FROM FROM
XM.xm_project p
LEFT JOIN xm_project_m_cost_user res ON p.id = res.project_id
XM.xm_project p
LEFT JOIN xm_project_m_cost_user res ON p.id = res.project_id
<where> <where>
p.id = #{projectId} p.id = #{projectId}
<if test=" excludeIds !=null "> and res.id not in
<foreach collection="excludeIds" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</if>
</where>
<if test=" excludeIds !=null "> and res.id not in
<foreach collection="excludeIds" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</if>
</where>
</select> </select>
<!-- 通过条件查询获取数据列表 返回list<map> -->
<!-- 通过条件查询获取数据列表 返回list<map> -->
<select id="listSum" parameterType="HashMap" resultType="HashMap"> <select id="listSum" parameterType="HashMap" resultType="HashMap">
select res.project_id,res.userid,max(res.username) as username,subject_id,max(subject_name) as subject_name,biz_month,sum(res.act_cost_amount) as act_cost_amount from xm_project_m_cost_user res select res.project_id,res.userid,max(res.username) as username,subject_id,max(subject_name) as subject_name,biz_month,sum(res.act_cost_amount) as act_cost_amount from xm_project_m_cost_user res
<where>
and res.project_id=#{projectId}
<if test="subjectId != null and subjectId !='' "> and res.subject_id =#{subjectId} </if>
<if test="costType != null and costType !='' "> and res.cost_type =#{costType} </if>
<where>
and res.project_id=#{projectId}
<if test="subjectId != null and subjectId !='' "> and res.subject_id =#{subjectId} </if>
<if test="costType != null and costType !='' "> and res.cost_type =#{costType} </if>
</where> </where>
group by res.project_id,res.userid,subject_id,biz_month
group by res.project_id,res.userid,subject_id,biz_month
</select> </select>
<select id="listSumForSettleGroupByTaskIdAndUserid" parameterType="HashMap" resultType="HashMap"> <select id="listSumForSettleGroupByTaskIdAndUserid" parameterType="HashMap" resultType="HashMap">
SELECT SELECT
res.project_id,
res.task_id,
res.userid,
max( res.username ) as username,
sum( res.act_cost_amount ) AS act_cost_amount,
max( t.budget_cost ) AS task_budget_cost,
max( t.project_name ) AS project_name
res.project_id,
res.task_id,
res.userid,
max( res.username ) as username,
sum( res.act_cost_amount ) AS act_cost_amount,
max( t.budget_cost ) AS task_budget_cost,
max( t.project_name ) AS project_name
FROM xm_task t FROM xm_task t
LEFT JOIN LEFT JOIN
XM.xm_project_m_cost_user res ON res.task_id = t.id AND res.project_id = t.project_id
<where>
t.project_id=#{projectId}
<if test="subjectId != null and subjectId !='' "> and res.subject_id =#{subjectId} </if>
<if test="costType != null and costType !='' "> and res.cost_type =#{costType} </if>
<if test="taskId != null and taskId !='' "> and res.task_id =#{taskId} </if>
<if test="userid != null and userid !='' "> and res.userid =#{userid} </if>
XM.xm_project_m_cost_user res ON res.task_id = t.id AND res.project_id = t.project_id
<where>
t.project_id=#{projectId}
<if test="subjectId != null and subjectId !='' "> and res.subject_id =#{subjectId} </if>
<if test="costType != null and costType !='' "> and res.cost_type =#{costType} </if>
<if test="taskId != null and taskId !='' "> and res.task_id =#{taskId} </if>
<if test="userid != null and userid !='' "> and res.userid =#{userid} </if>
</where> </where>
GROUP BY GROUP BY
res.project_id,
res.task_id,
res.userid
res.project_id,
res.task_id,
res.userid
</select> </select>
<!--结束 自定义sql函数区域-->
<!--结束 自定义sql函数区域-->
<!-- 通过条件查询获取数据列表 返回list<map> --> <!-- 通过条件查询获取数据列表 返回list<map> -->
<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap"> <select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
select res.*,pa.proc_inst_id,pa.assignee,pa.assignee_name,pa.main_title,pa.flow_branch_id,pa.task_name,pa.agree,pa.flow_last_time,pa.comment_msg,pa.proc_def_id,pa.flow_state from xm_project_m_cost_user res left join xm_project_m_cost_user_process_approva pa on res.id=pa.cost_id and res.biz_proc_inst_id=pa.proc_inst_id select res.*,pa.proc_inst_id,pa.assignee,pa.assignee_name,pa.main_title,pa.flow_branch_id,pa.task_name,pa.agree,pa.flow_last_time,pa.comment_msg,pa.proc_def_id,pa.flow_state from xm_project_m_cost_user res left join xm_project_m_cost_user_process_approva pa on res.id=pa.cost_id and res.biz_proc_inst_id=pa.proc_inst_id
<where>
<if test="ids != null"> and
id in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</if>
<where>
<include refid="whereForMap"/>
<include refid="where"/> <include refid="where"/>
<if test="key != null and key !='' "> </if>
</where> </where>
</select>
</select>
<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> --> <!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->
<select id="selectListByWhere" parameterType="com.xm.core.entity.XmProjectMCostUser" resultType="com.xm.core.entity.XmProjectMCostUser"> <select id="selectListByWhere" parameterType="com.xm.core.entity.XmProjectMCostUser" resultType="com.xm.core.entity.XmProjectMCostUser">
@ -162,7 +161,13 @@
where where
res.id = #{id} res.id = #{id}
</select> </select>
<select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmProjectMCostUser">
select * from xm_project_m_cost_user res
where (res.id) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</select>
<!-- 通过主键查询获取数据对象 返回map--> <!-- 通过主键查询获取数据对象 返回map-->
<select id="selectOneMap" parameterType="HashMap" resultType="HashMap"> <select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
select * from xm_project_m_cost_user res select * from xm_project_m_cost_user res
@ -177,11 +182,11 @@
</where> </where>
</select> </select>
<!-- 新增一条记录 主键id,--> <!-- 新增一条记录 主键id,-->
<insert id="insert" parameterType="com.xm.core.entity.XmProjectMCostUser" useGeneratedKeys="false" keyProperty="id">
<insert id="insert" parameterType="com.xm.core.entity.XmProjectMCostUser" useGeneratedKeys="false" keyProperty="id">
insert into xm_project_m_cost_user( insert into xm_project_m_cost_user(
<include refid="columns"/> <include refid="columns"/>
) values ( ) 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}
) )
</insert> </insert>
@ -195,13 +200,13 @@
<!-- 按主键删除一条记录--> <!-- 按主键删除一条记录-->
<delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectMCostUser"> <delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectMCostUser">
delete from xm_project_m_cost_user
delete from xm_project_m_cost_user
where id = #{id} where id = #{id}
</delete> </delete>
<!-- 根据条件修改若干条记录 --> <!-- 根据条件修改若干条记录 -->
<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectMCostUser"> <update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectMCostUser">
update xm_project_m_cost_user
update xm_project_m_cost_user
<set> <set>
<include refid="someFieldSet"/> <include refid="someFieldSet"/>
</set> </set>
@ -210,7 +215,7 @@
<!-- 根据主键修改一条记录 --> <!-- 根据主键修改一条记录 -->
<update id="updateByPk" parameterType="com.xm.core.entity.XmProjectMCostUser"> <update id="updateByPk" parameterType="com.xm.core.entity.XmProjectMCostUser">
update xm_project_m_cost_user
update xm_project_m_cost_user
<set> <set>
<include refid="set"/> <include refid="set"/>
</set> </set>
@ -225,7 +230,7 @@
<!-- 批量更新 --> <!-- 批量更新 -->
<update id="batchUpdate" parameterType="List"> <update id="batchUpdate" parameterType="List">
<foreach collection="list" item="item" index="index" separator=";" > <foreach collection="list" item="item" index="index" separator=";" >
update xm_project_m_cost_user
update xm_project_m_cost_user
set set
<include refid="batchSet"/> <include refid="batchSet"/>
where id = #{item.id} where id = #{item.id}
@ -233,26 +238,27 @@
</update> </update>
<!-- 批量删除 --> <!-- 批量删除 -->
<delete id="batchDelete" parameterType="List"> <delete id="batchDelete" parameterType="List">
delete from xm_project_m_cost_user
where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
#{item.id }
</foreach>
delete from xm_project_m_cost_user
where
(id) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item.id} )
</foreach>
</delete> </delete>
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <sql id="columns">
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
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
<sql id="where"> <sql id="where">
<if test="subjectId != null and subjectId != ''"> and res.subject_id = #{subjectId} </if> <if test="subjectId != null and subjectId != ''"> and res.subject_id = #{subjectId} </if>
<if test="projectId != null and projectId != ''"> and res.project_id = #{projectId} </if> <if test="projectId != null and projectId != ''"> and res.project_id = #{projectId} </if>
<if test="userid != null and userid != ''"> and res.userid = #{userid} </if> <if test="userid != null and userid != ''"> and res.userid = #{userid} </if>
<if test="createTime != null"> and TO_CHAR(res.create_time,'YYYY-MM-DD') = TO_CHAR(#{createTime},'YYYY-MM-DD') </if>
<if test="sendCostTime != null"> and TO_CHAR(res.send_cost_time,'YYYY-MM-DD') = TO_CHAR(#{sendCostTime},'YYYY-MM-DD') </if>
<if test="createTime != null"> and date_format(res.create_time,'%Y-%m-%d') = date_format(#{createTime},'%Y-%m-%d') </if>
<if test="sendCostTime != null"> and date_format(res.send_cost_time,'%Y-%m-%d') = date_format(#{sendCostTime},'%Y-%m-%d') </if>
<if test="username != null and username != ''"> and res.username = #{username} </if> <if test="username != null and username != ''"> and res.username = #{username} </if>
<if test="projectName != null and projectName != ''"> and res.project_name = #{projectName} </if> <if test="projectName != null and projectName != ''"> and res.project_name = #{projectName} </if>
<if test="remark != null and remark != ''"> and res.remark = #{remark} </if> <if test="remark != null and remark != ''"> and res.remark = #{remark} </if>
@ -260,17 +266,17 @@
<if test="taskId != null and taskId != ''"> and res.task_id = #{taskId} </if> <if test="taskId != null and taskId != ''"> and res.task_id = #{taskId} </if>
<if test="taskName != null and taskName != ''"> and res.task_name = #{taskName} </if> <if test="taskName != null and taskName != ''"> and res.task_name = #{taskName} </if>
<if test="actWorkload != null and actWorkload != ''"> and res.act_workload = #{actWorkload} </if> <if test="actWorkload != null and actWorkload != ''"> and res.act_workload = #{actWorkload} </if>
<if test="bizzStartDate != null"> and TO_CHAR(res.bizz_start_date,'YYYY-MM-DD') = TO_CHAR(#{bizzStartDate},'YYYY-MM-DD') </if>
<if test="bizzEndDate != null"> and TO_CHAR(res.bizz_end_date,'YYYY-MM-DD') = TO_CHAR(#{bizzEndDate},'YYYY-MM-DD') </if>
<if test="bizzStartDate != null"> and date_format(res.bizz_start_date,'%Y-%m-%d') = date_format(#{bizzStartDate},'%Y-%m-%d') </if>
<if test="bizzEndDate != null"> and date_format(res.bizz_end_date,'%Y-%m-%d') = date_format(#{bizzEndDate},'%Y-%m-%d') </if>
<if test="bizProcInstId != null and bizProcInstId != ''"> and res.biz_proc_inst_id = #{bizProcInstId} </if> <if test="bizProcInstId != null and bizProcInstId != ''"> and res.biz_proc_inst_id = #{bizProcInstId} </if>
<if test="bizFlowState != null and bizFlowState != ''"> and res.biz_flow_state = #{bizFlowState} </if> <if test="bizFlowState != null and bizFlowState != ''"> and res.biz_flow_state = #{bizFlowState} </if>
<if test="projectPhaseId != null and projectPhaseId != ''"> and res.project_phase_id = #{projectPhaseId} </if>
<if test="phaseId != null and phaseId != ''"> and res.phase_id = #{phaseId} </if>
<if test="actCostAmount != null and actCostAmount != ''"> and res.act_cost_amount = #{actCostAmount} </if> <if test="actCostAmount != null and actCostAmount != ''"> and res.act_cost_amount = #{actCostAmount} </if>
<if test="costType != null and costType != ''"> and res.cost_type = #{costType} </if> <if test="costType != null and costType != ''"> and res.cost_type = #{costType} </if>
<if test="bizMonth != null and bizMonth != ''"> and res.biz_month = #{bizMonth} </if> <if test="bizMonth != null and bizMonth != ''"> and res.biz_month = #{bizMonth} </if>
<if test="bizDate != null and bizDate != ''"> and res.biz_date = #{bizDate} </if> <if test="bizDate != null and bizDate != ''"> and res.biz_date = #{bizDate} </if>
<if test="subjectName != null and subjectName != ''"> and res.subject_name = #{subjectName} </if> <if test="subjectName != null and subjectName != ''"> and res.subject_name = #{subjectName} </if>
<if test="projectName != null and projectName != ''"> and res.project_phase_name = #{projectName} </if>
<if test="phaseName != null and phaseName != ''"> and res.phase_name = #{phaseName} </if>
<if test="execuserProcInstId != null and execuserProcInstId != ''"> and res.execuser_proc_inst_id = #{execuserProcInstId} </if> <if test="execuserProcInstId != null and execuserProcInstId != ''"> and res.execuser_proc_inst_id = #{execuserProcInstId} </if>
<if test="execuserStatus != null and execuserStatus != ''"> and res.execuser_status = #{execuserStatus} </if> <if test="execuserStatus != null and execuserStatus != ''"> and res.execuser_status = #{execuserStatus} </if>
<if test="payStatus != null and payStatus != ''"> and res.pay_status = #{payStatus} </if> <if test="payStatus != null and payStatus != ''"> and res.pay_status = #{payStatus} </if>
@ -294,13 +300,13 @@
bizz_end_date = #{bizzEndDate}, bizz_end_date = #{bizzEndDate},
biz_proc_inst_id = #{bizProcInstId}, biz_proc_inst_id = #{bizProcInstId},
biz_flow_state = #{bizFlowState}, biz_flow_state = #{bizFlowState},
project_phase_id = #{projectPhaseId},
phase_id = #{phaseId},
act_cost_amount = #{actCostAmount}, act_cost_amount = #{actCostAmount},
cost_type = #{costType}, cost_type = #{costType},
biz_month = #{bizMonth}, biz_month = #{bizMonth},
biz_date = #{bizDate}, biz_date = #{bizDate},
subject_name = #{subjectName}, subject_name = #{subjectName},
project_phase_name = #{projectName},
phase_name = #{phaseName},
execuser_proc_inst_id = #{execuserProcInstId}, execuser_proc_inst_id = #{execuserProcInstId},
execuser_status = #{execuserStatus}, execuser_status = #{execuserStatus},
pay_status = #{payStatus}, pay_status = #{payStatus},
@ -323,13 +329,13 @@
<if test="bizzEndDate != null"> bizz_end_date = #{bizzEndDate}, </if> <if test="bizzEndDate != null"> bizz_end_date = #{bizzEndDate}, </if>
<if test="bizProcInstId != null and bizProcInstId != ''"> biz_proc_inst_id = #{bizProcInstId}, </if> <if test="bizProcInstId != null and bizProcInstId != ''"> biz_proc_inst_id = #{bizProcInstId}, </if>
<if test="bizFlowState != null and bizFlowState != ''"> biz_flow_state = #{bizFlowState}, </if> <if test="bizFlowState != null and bizFlowState != ''"> biz_flow_state = #{bizFlowState}, </if>
<if test="projectPhaseId != null and projectPhaseId != ''"> project_phase_id = #{projectPhaseId}, </if>
<if test="phaseId != null and phaseId != ''"> phase_id = #{phaseId}, </if>
<if test="actCostAmount != null and actCostAmount != ''"> act_cost_amount = #{actCostAmount}, </if> <if test="actCostAmount != null and actCostAmount != ''"> act_cost_amount = #{actCostAmount}, </if>
<if test="costType != null and costType != ''"> cost_type = #{costType}, </if> <if test="costType != null and costType != ''"> cost_type = #{costType}, </if>
<if test="bizMonth != null and bizMonth != ''"> biz_month = #{bizMonth}, </if> <if test="bizMonth != null and bizMonth != ''"> biz_month = #{bizMonth}, </if>
<if test="bizDate != null and bizDate != ''"> biz_date = #{bizDate}, </if> <if test="bizDate != null and bizDate != ''"> biz_date = #{bizDate}, </if>
<if test="subjectName != null and subjectName != ''"> subject_name = #{subjectName}, </if> <if test="subjectName != null and subjectName != ''"> subject_name = #{subjectName}, </if>
<if test="projectName != null and projectName != ''"> project_phase_name = #{projectName}, </if>
<if test="phaseName != null and phaseName != ''"> phase_name = #{phaseName}, </if>
<if test="execuserProcInstId != null and execuserProcInstId != ''"> execuser_proc_inst_id = #{execuserProcInstId}, </if> <if test="execuserProcInstId != null and execuserProcInstId != ''"> execuser_proc_inst_id = #{execuserProcInstId}, </if>
<if test="execuserStatus != null and execuserStatus != ''"> execuser_status = #{execuserStatus}, </if> <if test="execuserStatus != null and execuserStatus != ''"> execuser_status = #{execuserStatus}, </if>
<if test="payStatus != null and payStatus != ''"> pay_status = #{payStatus}, </if> <if test="payStatus != null and payStatus != ''"> pay_status = #{payStatus}, </if>
@ -353,13 +359,13 @@
bizz_end_date = #{item.bizzEndDate}, bizz_end_date = #{item.bizzEndDate},
biz_proc_inst_id = #{item.bizProcInstId}, biz_proc_inst_id = #{item.bizProcInstId},
biz_flow_state = #{item.bizFlowState}, biz_flow_state = #{item.bizFlowState},
project_phase_id = #{item.projectPhaseId},
phase_id = #{item.phaseId},
act_cost_amount = #{item.actCostAmount}, act_cost_amount = #{item.actCostAmount},
cost_type = #{item.costType}, cost_type = #{item.costType},
biz_month = #{item.bizMonth}, biz_month = #{item.bizMonth},
biz_date = #{item.bizDate}, biz_date = #{item.bizDate},
subject_name = #{item.subjectName}, subject_name = #{item.subjectName},
project_phase_name = #{item.projectName},
phase_name = #{item.phaseName},
execuser_proc_inst_id = #{item.execuserProcInstId}, execuser_proc_inst_id = #{item.execuserProcInstId},
execuser_status = #{item.execuserStatus}, execuser_status = #{item.execuserStatus},
pay_status = #{item.payStatus}, pay_status = #{item.payStatus},

68
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml

@ -172,7 +172,7 @@
insert into xm_project( insert into xm_project(
<include refid="columns"/> <include refid="columns"/>
) values ( ) values (
#{id},#{code},#{name},#{xmType},#{startTime},#{endTime},#{urgent},#{priority},#{description},#{createUserid},#{createUsername},#{createTime},#{assess},#{assessRemarks},#{status},#{branchId},#{planTotalCost},#{bizProcInstId},#{bizFlowState},#{planNouserAt},#{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}
) )
</insert> </insert>
@ -235,7 +235,7 @@
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <sql id="columns">
id,code,name,xm_type,start_time,end_time,urgent,priority,description,create_userid,create_username,create_time,assess,assess_remarks,status,branch_id,plan_total_cost,biz_proc_inst_id,biz_flow_state,plan_nouser_at,plan_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
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -260,8 +260,8 @@
<if test="bizProcInstId != null and bizProcInstId != ''"> and res.biz_proc_inst_id = #{bizProcInstId} </if> <if test="bizProcInstId != null and bizProcInstId != ''"> and res.biz_proc_inst_id = #{bizProcInstId} </if>
<if test="bizFlowState != null and bizFlowState != ''"> and res.biz_flow_state = #{bizFlowState} </if> <if test="bizFlowState != null and bizFlowState != ''"> and res.biz_flow_state = #{bizFlowState} </if>
<if test="planNouserAt != null and planNouserAt != ''"> and res.plan_nouser_at = #{planNouserAt} </if> <if test="planNouserAt != null and planNouserAt != ''"> and res.plan_nouser_at = #{planNouserAt} </if>
<if test="planInnerUserAt != null and planInnerUserAt != ''"> and res.plan_inner_user_at = #{planInnerUserAt} </if>
<if test="planOutUserAt != null and planOutUserAt != ''"> and res.plan_out_user_at = #{planOutUserAt} </if>
<if test="planIuserAt != null and planIuserAt != ''"> and res.plan_iuser_at = #{planIuserAt} </if>
<if test="planOuserAt != null and planOuserAt != ''"> and res.plan_ouser_at = #{planOuserAt} </if>
<if test="locked != null and locked != ''"> and res.locked = #{locked} </if> <if test="locked != null and locked != ''"> and res.locked = #{locked} </if>
<if test="baseTime != null"> and date_format(res.base_time,'%Y-%m-%d') = date_format(#{baseTime},'%Y-%m-%d') </if> <if test="baseTime != null"> and date_format(res.base_time,'%Y-%m-%d') = date_format(#{baseTime},'%Y-%m-%d') </if>
<if test="baseRemark != null and baseRemark != ''"> and res.base_remark = #{baseRemark} </if> <if test="baseRemark != null and baseRemark != ''"> and res.base_remark = #{baseRemark} </if>
@ -270,14 +270,14 @@
<if test="totalReceivables != null and totalReceivables != ''"> and res.total_receivables = #{totalReceivables} </if> <if test="totalReceivables != null and totalReceivables != ''"> and res.total_receivables = #{totalReceivables} </if>
<if test="budgetMarginRate != null and budgetMarginRate != ''"> and res.budget_margin_rate = #{budgetMarginRate} </if> <if test="budgetMarginRate != null and budgetMarginRate != ''"> and res.budget_margin_rate = #{budgetMarginRate} </if>
<if test="contractAmt != null and contractAmt != ''"> and res.contract_amt = #{contractAmt} </if> <if test="contractAmt != null and contractAmt != ''"> and res.contract_amt = #{contractAmt} </if>
<if test="planInnerUserPrice != null and planInnerUserPrice != ''"> and res.plan_inner_user_price = #{planInnerUserPrice} </if>
<if test="planOutUserPrice != null and planOutUserPrice != ''"> and res.plan_out_user_price = #{planOutUserPrice} </if>
<if test="planOutUserCnt != null and planOutUserCnt != ''"> and res.plan_out_user_cnt = #{planOutUserCnt} </if>
<if test="planInnerUserCnt != null and planInnerUserCnt != ''"> and res.plan_inner_user_cnt = #{planInnerUserCnt} </if>
<if test="planIuserPrice != null and planIuserPrice != ''"> and res.plan_iuser_price = #{planIuserPrice} </if>
<if test="planOuserPrice != null and planOuserPrice != ''"> and res.plan_ouser_price = #{planOuserPrice} </if>
<if test="planOuserCnt != null and planOuserCnt != ''"> and res.plan_ouser_cnt = #{planOuserCnt} </if>
<if test="planIuserCnt != null and planIuserCnt != ''"> and res.plan_iuser_cnt = #{planIuserCnt} </if>
<if test="planWorkingHours != null and planWorkingHours != ''"> and res.plan_working_hours = #{planWorkingHours} </if> <if test="planWorkingHours != null and planWorkingHours != ''"> and res.plan_working_hours = #{planWorkingHours} </if>
<if test="taxRate != null and taxRate != ''"> and res.tax_rate = #{taxRate} </if> <if test="taxRate != null and taxRate != ''"> and res.tax_rate = #{taxRate} </if>
<if test="planInnerUserWorkload != null and planInnerUserWorkload != ''"> and res.plan_inner_user_workload = #{planInnerUserWorkload} </if>
<if test="planOutUserWorkload != null and planOutUserWorkload != ''"> and res.plan_out_user_workload = #{planOutUserWorkload} </if>
<if test="planIuserWorkload != null and planIuserWorkload != ''"> and res.plan_iuser_workload = #{planIuserWorkload} </if>
<if test="planOuserWorkload != null and planOuserWorkload != ''"> and res.plan_ouser_workload = #{planOuserWorkload} </if>
<if test="fromTplId != null and fromTplId != ''"> and res.from_tpl_id = #{fromTplId} </if> <if test="fromTplId != null and fromTplId != ''"> and res.from_tpl_id = #{fromTplId} </if>
<if test="budgetCtrl != null and budgetCtrl != ''"> and res.budget_ctrl = #{budgetCtrl} </if> <if test="budgetCtrl != null and budgetCtrl != ''"> and res.budget_ctrl = #{budgetCtrl} </if>
<if test="deptid != null and deptid != ''"> and res.deptid = #{deptid} </if> <if test="deptid != null and deptid != ''"> and res.deptid = #{deptid} </if>
@ -315,8 +315,8 @@
biz_proc_inst_id = #{bizProcInstId}, biz_proc_inst_id = #{bizProcInstId},
biz_flow_state = #{bizFlowState}, biz_flow_state = #{bizFlowState},
plan_nouser_at = #{planNouserAt}, plan_nouser_at = #{planNouserAt},
plan_inner_user_at = #{planInnerUserAt},
plan_out_user_at = #{planOutUserAt},
plan_iuser_at = #{planIuserAt},
plan_ouser_at = #{planOuserAt},
locked = #{locked}, locked = #{locked},
base_time = #{baseTime}, base_time = #{baseTime},
base_remark = #{baseRemark}, base_remark = #{baseRemark},
@ -325,14 +325,14 @@
total_receivables = #{totalReceivables}, total_receivables = #{totalReceivables},
budget_margin_rate = #{budgetMarginRate}, budget_margin_rate = #{budgetMarginRate},
contract_amt = #{contractAmt}, 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}, plan_working_hours = #{planWorkingHours},
tax_rate = #{taxRate}, 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}, from_tpl_id = #{fromTplId},
budget_ctrl = #{budgetCtrl}, budget_ctrl = #{budgetCtrl},
deptid = #{deptid}, deptid = #{deptid},
@ -369,8 +369,8 @@
<if test="bizProcInstId != null and bizProcInstId != ''"> biz_proc_inst_id = #{bizProcInstId}, </if> <if test="bizProcInstId != null and bizProcInstId != ''"> biz_proc_inst_id = #{bizProcInstId}, </if>
<if test="bizFlowState != null and bizFlowState != ''"> biz_flow_state = #{bizFlowState}, </if> <if test="bizFlowState != null and bizFlowState != ''"> biz_flow_state = #{bizFlowState}, </if>
<if test="planNouserAt != null and planNouserAt != ''"> plan_nouser_at = #{planNouserAt}, </if> <if test="planNouserAt != null and planNouserAt != ''"> plan_nouser_at = #{planNouserAt}, </if>
<if test="planInnerUserAt != null and planInnerUserAt != ''"> plan_inner_user_at = #{planInnerUserAt}, </if>
<if test="planOutUserAt != null and planOutUserAt != ''"> plan_out_user_at = #{planOutUserAt}, </if>
<if test="planIuserAt != null and planIuserAt != ''"> plan_iuser_at = #{planIuserAt}, </if>
<if test="planOuserAt != null and planOuserAt != ''"> plan_ouser_at = #{planOuserAt}, </if>
<if test="locked != null and locked != ''"> locked = #{locked}, </if> <if test="locked != null and locked != ''"> locked = #{locked}, </if>
<if test="baseTime != null"> base_time = #{baseTime}, </if> <if test="baseTime != null"> base_time = #{baseTime}, </if>
<if test="baseRemark != null and baseRemark != ''"> base_remark = #{baseRemark}, </if> <if test="baseRemark != null and baseRemark != ''"> base_remark = #{baseRemark}, </if>
@ -379,14 +379,14 @@
<if test="totalReceivables != null and totalReceivables != ''"> total_receivables = #{totalReceivables}, </if> <if test="totalReceivables != null and totalReceivables != ''"> total_receivables = #{totalReceivables}, </if>
<if test="budgetMarginRate != null and budgetMarginRate != ''"> budget_margin_rate = #{budgetMarginRate}, </if> <if test="budgetMarginRate != null and budgetMarginRate != ''"> budget_margin_rate = #{budgetMarginRate}, </if>
<if test="contractAmt != null and contractAmt != ''"> contract_amt = #{contractAmt}, </if> <if test="contractAmt != null and contractAmt != ''"> contract_amt = #{contractAmt}, </if>
<if test="planInnerUserPrice != null and planInnerUserPrice != ''"> plan_inner_user_price = #{planInnerUserPrice}, </if>
<if test="planOutUserPrice != null and planOutUserPrice != ''"> plan_out_user_price = #{planOutUserPrice}, </if>
<if test="planOutUserCnt != null and planOutUserCnt != ''"> plan_out_user_cnt = #{planOutUserCnt}, </if>
<if test="planInnerUserCnt != null and planInnerUserCnt != ''"> plan_inner_user_cnt = #{planInnerUserCnt}, </if>
<if test="planIuserPrice != null and planIuserPrice != ''"> plan_iuser_price = #{planIuserPrice}, </if>
<if test="planOuserPrice != null and planOuserPrice != ''"> plan_ouser_price = #{planOuserPrice}, </if>
<if test="planOuserCnt != null and planOuserCnt != ''"> plan_ouser_cnt = #{planOuserCnt}, </if>
<if test="planIuserCnt != null and planIuserCnt != ''"> plan_iuser_cnt = #{planIuserCnt}, </if>
<if test="planWorkingHours != null and planWorkingHours != ''"> plan_working_hours = #{planWorkingHours}, </if> <if test="planWorkingHours != null and planWorkingHours != ''"> plan_working_hours = #{planWorkingHours}, </if>
<if test="taxRate != null and taxRate != ''"> tax_rate = #{taxRate}, </if> <if test="taxRate != null and taxRate != ''"> tax_rate = #{taxRate}, </if>
<if test="planInnerUserWorkload != null and planInnerUserWorkload != ''"> plan_inner_user_workload = #{planInnerUserWorkload}, </if>
<if test="planOutUserWorkload != null and planOutUserWorkload != ''"> plan_out_user_workload = #{planOutUserWorkload}, </if>
<if test="planIuserWorkload != null and planIuserWorkload != ''"> plan_iuser_workload = #{planIuserWorkload}, </if>
<if test="planOuserWorkload != null and planOuserWorkload != ''"> plan_ouser_workload = #{planOuserWorkload}, </if>
<if test="fromTplId != null and fromTplId != ''"> from_tpl_id = #{fromTplId}, </if> <if test="fromTplId != null and fromTplId != ''"> from_tpl_id = #{fromTplId}, </if>
<if test="budgetCtrl != null and budgetCtrl != ''"> budget_ctrl = #{budgetCtrl}, </if> <if test="budgetCtrl != null and budgetCtrl != ''"> budget_ctrl = #{budgetCtrl}, </if>
<if test="deptid != null and deptid != ''"> deptid = #{deptid}, </if> <if test="deptid != null and deptid != ''"> deptid = #{deptid}, </if>
@ -424,8 +424,8 @@
biz_proc_inst_id = #{item.bizProcInstId}, biz_proc_inst_id = #{item.bizProcInstId},
biz_flow_state = #{item.bizFlowState}, biz_flow_state = #{item.bizFlowState},
plan_nouser_at = #{item.planNouserAt}, 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}, locked = #{item.locked},
base_time = #{item.baseTime}, base_time = #{item.baseTime},
base_remark = #{item.baseRemark}, base_remark = #{item.baseRemark},
@ -434,14 +434,14 @@
total_receivables = #{item.totalReceivables}, total_receivables = #{item.totalReceivables},
budget_margin_rate = #{item.budgetMarginRate}, budget_margin_rate = #{item.budgetMarginRate},
contract_amt = #{item.contractAmt}, 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}, plan_working_hours = #{item.planWorkingHours},
tax_rate = #{item.taxRate}, 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}, from_tpl_id = #{item.fromTplId},
budget_ctrl = #{item.budgetCtrl}, budget_ctrl = #{item.budgetCtrl},
deptid = #{item.deptid}, deptid = #{item.deptid},

88
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateMapper.xml

@ -48,7 +48,13 @@
where where
res.project_id = #{projectId} res.project_id = #{projectId}
</select> </select>
<select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmProjectState">
select * from xm_project_state res
where (res.project_id) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</select>
<!-- 通过主键查询获取数据对象 返回map--> <!-- 通过主键查询获取数据对象 返回map-->
<select id="selectOneMap" parameterType="HashMap" resultType="HashMap"> <select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
select * from xm_project_state res select * from xm_project_state res
@ -67,7 +73,7 @@
insert into xm_project_state( insert into xm_project_state(
<include refid="columns"/> <include refid="columns"/>
) values ( ) values (
#{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}
) )
</insert> </insert>
@ -130,7 +136,7 @@
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <sql id="columns">
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
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -156,16 +162,16 @@
<if test="totalNeedColAmount != null and totalNeedColAmount != ''"> and res.total_need_col_amount = #{totalNeedColAmount} </if> <if test="totalNeedColAmount != null and totalNeedColAmount != ''"> and res.total_need_col_amount = #{totalNeedColAmount} </if>
<if test="totalFinishColAmount != null and totalFinishColAmount != ''"> and res.total_finish_col_amount = #{totalFinishColAmount} </if> <if test="totalFinishColAmount != null and totalFinishColAmount != ''"> and res.total_finish_col_amount = #{totalFinishColAmount} </if>
<if test="totalCostUserAmount != null and totalCostUserAmount != ''"> and res.total_cost_user_amount = #{totalCostUserAmount} </if> <if test="totalCostUserAmount != null and totalCostUserAmount != ''"> and res.total_cost_user_amount = #{totalCostUserAmount} </if>
<if test="totalBudgetInnerUserAmount != null and totalBudgetInnerUserAmount != ''"> and res.total_budget_inner_user_amount = #{totalBudgetInnerUserAmount} </if>
<if test="totalBudgetIuserAmount != null and totalBudgetIuserAmount != ''"> and res.total_budget_iuser_amount = #{totalBudgetIuserAmount} </if>
<if test="totalPlanWorkload != null and totalPlanWorkload != ''"> and res.total_plan_workload = #{totalPlanWorkload} </if> <if test="totalPlanWorkload != null and totalPlanWorkload != ''"> and res.total_plan_workload = #{totalPlanWorkload} </if>
<if test="totalRiskCnt != null and totalRiskCnt != ''"> and res.total_risk_cnt = #{totalRiskCnt} </if> <if test="totalRiskCnt != null and totalRiskCnt != ''"> and res.total_risk_cnt = #{totalRiskCnt} </if>
<if test="totalCompleteRiskCnt != null and totalCompleteRiskCnt != ''"> and res.total_complete_risk_cnt = #{totalCompleteRiskCnt} </if> <if test="totalCompleteRiskCnt != null and totalCompleteRiskCnt != ''"> and res.total_complete_risk_cnt = #{totalCompleteRiskCnt} </if>
<if test="branchId != null and branchId != ''"> and res.branch_id = #{branchId} </if> <if test="branchId != null and branchId != ''"> and res.branch_id = #{branchId} </if>
<if test="branchName != null and branchName != ''"> and res.branch_name = #{branchName} </if> <if test="branchName != null and branchName != ''"> and res.branch_name = #{branchName} </if>
<if test="totalBudgetOutUserAmount != null and totalBudgetOutUserAmount != ''"> and res.total_budget_out_user_amount = #{totalBudgetOutUserAmount} </if>
<if test="totalBudgetOuserAmount != null and totalBudgetOuserAmount != ''"> and res.total_budget_ouser_amount = #{totalBudgetOuserAmount} </if>
<if test="totalCompleteWorkload != null and totalCompleteWorkload != ''"> and res.total_complete_workload = #{totalCompleteWorkload} </if> <if test="totalCompleteWorkload != null and totalCompleteWorkload != ''"> and res.total_complete_workload = #{totalCompleteWorkload} </if>
<if test="totalCostInnerUserAmount != null and totalCostInnerUserAmount != ''"> and res.total_cost_inner_user_amount = #{totalCostInnerUserAmount} </if>
<if test="totalCostOutUserAmount != null and totalCostOutUserAmount != ''"> and res.total_cost_out_user_amount = #{totalCostOutUserAmount} </if>
<if test="totalCostIuserAmount != null and totalCostIuserAmount != ''"> and res.total_cost_iuser_amount = #{totalCostIuserAmount} </if>
<if test="totalCostOuserAmount != null and totalCostOuserAmount != ''"> and res.total_cost_ouser_amount = #{totalCostOuserAmount} </if>
<if test="totalProgress != null and totalProgress != ''"> and res.total_progress = #{totalProgress} </if> <if test="totalProgress != null and totalProgress != ''"> and res.total_progress = #{totalProgress} </if>
<if test="totalActiveBugCnt != null and totalActiveBugCnt != ''"> and res.total_active_bug_cnt = #{totalActiveBugCnt} </if> <if test="totalActiveBugCnt != null and totalActiveBugCnt != ''"> and res.total_active_bug_cnt = #{totalActiveBugCnt} </if>
<if test="totalConfirmedBugCnt != null and totalConfirmedBugCnt != ''"> and res.total_confirmed_bug_cnt = #{totalConfirmedBugCnt} </if> <if test="totalConfirmedBugCnt != null and totalConfirmedBugCnt != ''"> and res.total_confirmed_bug_cnt = #{totalConfirmedBugCnt} </if>
@ -179,8 +185,8 @@
<if test="totalFinishPayCnt != null and totalFinishPayCnt != ''"> and res.total_finish_pay_cnt = #{totalFinishPayCnt} </if> <if test="totalFinishPayCnt != null and totalFinishPayCnt != ''"> and res.total_finish_pay_cnt = #{totalFinishPayCnt} </if>
<if test="totalFinishPayUserCnt != null and totalFinishPayUserCnt != ''"> and res.total_finish_pay_user_cnt = #{totalFinishPayUserCnt} </if> <if test="totalFinishPayUserCnt != null and totalFinishPayUserCnt != ''"> and res.total_finish_pay_user_cnt = #{totalFinishPayUserCnt} </if>
<if test="totalNeedPayUserCnt != null and totalNeedPayUserCnt != ''"> and res.total_need_pay_user_cnt = #{totalNeedPayUserCnt} </if> <if test="totalNeedPayUserCnt != null and totalNeedPayUserCnt != ''"> and res.total_need_pay_user_cnt = #{totalNeedPayUserCnt} </if>
<if test="totalPlanInnerUserWorkload != null and totalPlanInnerUserWorkload != ''"> and res.total_plan_inner_user_workload = #{totalPlanInnerUserWorkload} </if>
<if test="totalPlanOutUserWorkload != null and totalPlanOutUserWorkload != ''"> and res.total_plan_out_user_workload = #{totalPlanOutUserWorkload} </if>
<if test="totalPlanIuserWorkload != null and totalPlanIuserWorkload != ''"> and res.total_plan_iuser_workload = #{totalPlanIuserWorkload} </if>
<if test="totalPlanOuserWorkload != null and totalPlanOuserWorkload != ''"> and res.total_plan_ouser_workload = #{totalPlanOuserWorkload} </if>
<if test="testCases != null and testCases != ''"> and res.test_cases = #{testCases} </if> <if test="testCases != null and testCases != ''"> and res.test_cases = #{testCases} </if>
<if test="execCases != null and execCases != ''"> and res.exec_cases = #{execCases} </if> <if test="execCases != null and execCases != ''"> and res.exec_cases = #{execCases} </if>
<if test="designCases != null and designCases != ''"> and res.design_cases = #{designCases} </if> <if test="designCases != null and designCases != ''"> and res.design_cases = #{designCases} </if>
@ -188,6 +194,12 @@
<if test="iterationCnt != null and iterationCnt != ''"> and res.iteration_cnt = #{iterationCnt} </if> <if test="iterationCnt != null and iterationCnt != ''"> and res.iteration_cnt = #{iterationCnt} </if>
<if test="productCnt != null and productCnt != ''"> and res.product_cnt = #{productCnt} </if> <if test="productCnt != null and productCnt != ''"> and res.product_cnt = #{productCnt} </if>
<if test="menuCnt != null and menuCnt != ''"> and res.menu_cnt = #{menuCnt} </if> <if test="menuCnt != null and menuCnt != ''"> and res.menu_cnt = #{menuCnt} </if>
<if test="finishMenuCnt != null and finishMenuCnt != ''"> and res.finish_menu_cnt = #{finishMenuCnt} </if>
<if test="estimateWorkload != null and estimateWorkload != ''"> and res.estimate_workload = #{estimateWorkload} </if>
<if test="execTaskCnt != null and execTaskCnt != ''"> and res.exec_task_cnt = #{execTaskCnt} </if>
<if test="toStartTaskCnt != null and toStartTaskCnt != ''"> and res.to_start_task_cnt = #{toStartTaskCnt} </if>
<if test="execMenuCnt != null and execMenuCnt != ''"> and res.exec_menu_cnt = #{execMenuCnt} </if>
<if test="toStartMenuCnt != null and toStartMenuCnt != ''"> and res.to_start_menu_cnt = #{toStartMenuCnt} </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -211,16 +223,16 @@
total_need_col_amount = #{totalNeedColAmount}, total_need_col_amount = #{totalNeedColAmount},
total_finish_col_amount = #{totalFinishColAmount}, total_finish_col_amount = #{totalFinishColAmount},
total_cost_user_amount = #{totalCostUserAmount}, total_cost_user_amount = #{totalCostUserAmount},
total_budget_inner_user_amount = #{totalBudgetInnerUserAmount},
total_budget_iuser_amount = #{totalBudgetIuserAmount},
total_plan_workload = #{totalPlanWorkload}, total_plan_workload = #{totalPlanWorkload},
total_risk_cnt = #{totalRiskCnt}, total_risk_cnt = #{totalRiskCnt},
total_complete_risk_cnt = #{totalCompleteRiskCnt}, total_complete_risk_cnt = #{totalCompleteRiskCnt},
branch_id = #{branchId}, branch_id = #{branchId},
branch_name = #{branchName}, branch_name = #{branchName},
total_budget_out_user_amount = #{totalBudgetOutUserAmount},
total_budget_ouser_amount = #{totalBudgetOuserAmount},
total_complete_workload = #{totalCompleteWorkload}, 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_progress = #{totalProgress},
total_active_bug_cnt = #{totalActiveBugCnt}, total_active_bug_cnt = #{totalActiveBugCnt},
total_confirmed_bug_cnt = #{totalConfirmedBugCnt}, total_confirmed_bug_cnt = #{totalConfirmedBugCnt},
@ -234,15 +246,21 @@
total_finish_pay_cnt = #{totalFinishPayCnt}, total_finish_pay_cnt = #{totalFinishPayCnt},
total_finish_pay_user_cnt = #{totalFinishPayUserCnt}, total_finish_pay_user_cnt = #{totalFinishPayUserCnt},
total_need_pay_user_cnt = #{totalNeedPayUserCnt}, 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}, test_cases = #{testCases},
exec_cases = #{execCases}, exec_cases = #{execCases},
design_cases = #{designCases}, design_cases = #{designCases},
finish_cases = #{finishCases}, finish_cases = #{finishCases},
iteration_cnt = #{iterationCnt}, iteration_cnt = #{iterationCnt},
product_cnt = #{productCnt}, 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}
</sql> </sql>
<sql id="someFieldSet"> <sql id="someFieldSet">
<if test="bizDate != null and bizDate != ''"> biz_date = #{bizDate}, </if> <if test="bizDate != null and bizDate != ''"> biz_date = #{bizDate}, </if>
@ -265,16 +283,16 @@
<if test="totalNeedColAmount != null and totalNeedColAmount != ''"> total_need_col_amount = #{totalNeedColAmount}, </if> <if test="totalNeedColAmount != null and totalNeedColAmount != ''"> total_need_col_amount = #{totalNeedColAmount}, </if>
<if test="totalFinishColAmount != null and totalFinishColAmount != ''"> total_finish_col_amount = #{totalFinishColAmount}, </if> <if test="totalFinishColAmount != null and totalFinishColAmount != ''"> total_finish_col_amount = #{totalFinishColAmount}, </if>
<if test="totalCostUserAmount != null and totalCostUserAmount != ''"> total_cost_user_amount = #{totalCostUserAmount}, </if> <if test="totalCostUserAmount != null and totalCostUserAmount != ''"> total_cost_user_amount = #{totalCostUserAmount}, </if>
<if test="totalBudgetInnerUserAmount != null and totalBudgetInnerUserAmount != ''"> total_budget_inner_user_amount = #{totalBudgetInnerUserAmount}, </if>
<if test="totalBudgetIuserAmount != null and totalBudgetIuserAmount != ''"> total_budget_iuser_amount = #{totalBudgetIuserAmount}, </if>
<if test="totalPlanWorkload != null and totalPlanWorkload != ''"> total_plan_workload = #{totalPlanWorkload}, </if> <if test="totalPlanWorkload != null and totalPlanWorkload != ''"> total_plan_workload = #{totalPlanWorkload}, </if>
<if test="totalRiskCnt != null and totalRiskCnt != ''"> total_risk_cnt = #{totalRiskCnt}, </if> <if test="totalRiskCnt != null and totalRiskCnt != ''"> total_risk_cnt = #{totalRiskCnt}, </if>
<if test="totalCompleteRiskCnt != null and totalCompleteRiskCnt != ''"> total_complete_risk_cnt = #{totalCompleteRiskCnt}, </if> <if test="totalCompleteRiskCnt != null and totalCompleteRiskCnt != ''"> total_complete_risk_cnt = #{totalCompleteRiskCnt}, </if>
<if test="branchId != null and branchId != ''"> branch_id = #{branchId}, </if> <if test="branchId != null and branchId != ''"> branch_id = #{branchId}, </if>
<if test="branchName != null and branchName != ''"> branch_name = #{branchName}, </if> <if test="branchName != null and branchName != ''"> branch_name = #{branchName}, </if>
<if test="totalBudgetOutUserAmount != null and totalBudgetOutUserAmount != ''"> total_budget_out_user_amount = #{totalBudgetOutUserAmount}, </if>
<if test="totalBudgetOuserAmount != null and totalBudgetOuserAmount != ''"> total_budget_ouser_amount = #{totalBudgetOuserAmount}, </if>
<if test="totalCompleteWorkload != null and totalCompleteWorkload != ''"> total_complete_workload = #{totalCompleteWorkload}, </if> <if test="totalCompleteWorkload != null and totalCompleteWorkload != ''"> total_complete_workload = #{totalCompleteWorkload}, </if>
<if test="totalCostInnerUserAmount != null and totalCostInnerUserAmount != ''"> total_cost_inner_user_amount = #{totalCostInnerUserAmount}, </if>
<if test="totalCostOutUserAmount != null and totalCostOutUserAmount != ''"> total_cost_out_user_amount = #{totalCostOutUserAmount}, </if>
<if test="totalCostIuserAmount != null and totalCostIuserAmount != ''"> total_cost_iuser_amount = #{totalCostIuserAmount}, </if>
<if test="totalCostOuserAmount != null and totalCostOuserAmount != ''"> total_cost_ouser_amount = #{totalCostOuserAmount}, </if>
<if test="totalProgress != null and totalProgress != ''"> total_progress = #{totalProgress}, </if> <if test="totalProgress != null and totalProgress != ''"> total_progress = #{totalProgress}, </if>
<if test="totalActiveBugCnt != null and totalActiveBugCnt != ''"> total_active_bug_cnt = #{totalActiveBugCnt}, </if> <if test="totalActiveBugCnt != null and totalActiveBugCnt != ''"> total_active_bug_cnt = #{totalActiveBugCnt}, </if>
<if test="totalConfirmedBugCnt != null and totalConfirmedBugCnt != ''"> total_confirmed_bug_cnt = #{totalConfirmedBugCnt}, </if> <if test="totalConfirmedBugCnt != null and totalConfirmedBugCnt != ''"> total_confirmed_bug_cnt = #{totalConfirmedBugCnt}, </if>
@ -288,8 +306,8 @@
<if test="totalFinishPayCnt != null and totalFinishPayCnt != ''"> total_finish_pay_cnt = #{totalFinishPayCnt}, </if> <if test="totalFinishPayCnt != null and totalFinishPayCnt != ''"> total_finish_pay_cnt = #{totalFinishPayCnt}, </if>
<if test="totalFinishPayUserCnt != null and totalFinishPayUserCnt != ''"> total_finish_pay_user_cnt = #{totalFinishPayUserCnt}, </if> <if test="totalFinishPayUserCnt != null and totalFinishPayUserCnt != ''"> total_finish_pay_user_cnt = #{totalFinishPayUserCnt}, </if>
<if test="totalNeedPayUserCnt != null and totalNeedPayUserCnt != ''"> total_need_pay_user_cnt = #{totalNeedPayUserCnt}, </if> <if test="totalNeedPayUserCnt != null and totalNeedPayUserCnt != ''"> total_need_pay_user_cnt = #{totalNeedPayUserCnt}, </if>
<if test="totalPlanInnerUserWorkload != null and totalPlanInnerUserWorkload != ''"> total_plan_inner_user_workload = #{totalPlanInnerUserWorkload}, </if>
<if test="totalPlanOutUserWorkload != null and totalPlanOutUserWorkload != ''"> total_plan_out_user_workload = #{totalPlanOutUserWorkload}, </if>
<if test="totalPlanIuserWorkload != null and totalPlanIuserWorkload != ''"> total_plan_iuser_workload = #{totalPlanIuserWorkload}, </if>
<if test="totalPlanOuserWorkload != null and totalPlanOuserWorkload != ''"> total_plan_ouser_workload = #{totalPlanOuserWorkload}, </if>
<if test="testCases != null and testCases != ''"> test_cases = #{testCases}, </if> <if test="testCases != null and testCases != ''"> test_cases = #{testCases}, </if>
<if test="execCases != null and execCases != ''"> exec_cases = #{execCases}, </if> <if test="execCases != null and execCases != ''"> exec_cases = #{execCases}, </if>
<if test="designCases != null and designCases != ''"> design_cases = #{designCases}, </if> <if test="designCases != null and designCases != ''"> design_cases = #{designCases}, </if>
@ -297,6 +315,12 @@
<if test="iterationCnt != null and iterationCnt != ''"> iteration_cnt = #{iterationCnt}, </if> <if test="iterationCnt != null and iterationCnt != ''"> iteration_cnt = #{iterationCnt}, </if>
<if test="productCnt != null and productCnt != ''"> product_cnt = #{productCnt}, </if> <if test="productCnt != null and productCnt != ''"> product_cnt = #{productCnt}, </if>
<if test="menuCnt != null and menuCnt != ''"> menu_cnt = #{menuCnt}, </if> <if test="menuCnt != null and menuCnt != ''"> menu_cnt = #{menuCnt}, </if>
<if test="finishMenuCnt != null and finishMenuCnt != ''"> finish_menu_cnt = #{finishMenuCnt}, </if>
<if test="estimateWorkload != null and estimateWorkload != ''"> estimate_workload = #{estimateWorkload}, </if>
<if test="execTaskCnt != null and execTaskCnt != ''"> exec_task_cnt = #{execTaskCnt}, </if>
<if test="toStartTaskCnt != null and toStartTaskCnt != ''"> to_start_task_cnt = #{toStartTaskCnt}, </if>
<if test="execMenuCnt != null and execMenuCnt != ''"> exec_menu_cnt = #{execMenuCnt}, </if>
<if test="toStartMenuCnt != null and toStartMenuCnt != ''"> to_start_menu_cnt = #{toStartMenuCnt}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -320,16 +344,16 @@
total_need_col_amount = #{item.totalNeedColAmount}, total_need_col_amount = #{item.totalNeedColAmount},
total_finish_col_amount = #{item.totalFinishColAmount}, total_finish_col_amount = #{item.totalFinishColAmount},
total_cost_user_amount = #{item.totalCostUserAmount}, 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_plan_workload = #{item.totalPlanWorkload},
total_risk_cnt = #{item.totalRiskCnt}, total_risk_cnt = #{item.totalRiskCnt},
total_complete_risk_cnt = #{item.totalCompleteRiskCnt}, total_complete_risk_cnt = #{item.totalCompleteRiskCnt},
branch_id = #{item.branchId}, branch_id = #{item.branchId},
branch_name = #{item.branchName}, branch_name = #{item.branchName},
total_budget_out_user_amount = #{item.totalBudgetOutUserAmount},
total_budget_ouser_amount = #{item.totalBudgetOuserAmount},
total_complete_workload = #{item.totalCompleteWorkload}, 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_progress = #{item.totalProgress},
total_active_bug_cnt = #{item.totalActiveBugCnt}, total_active_bug_cnt = #{item.totalActiveBugCnt},
total_confirmed_bug_cnt = #{item.totalConfirmedBugCnt}, total_confirmed_bug_cnt = #{item.totalConfirmedBugCnt},
@ -343,14 +367,20 @@
total_finish_pay_cnt = #{item.totalFinishPayCnt}, total_finish_pay_cnt = #{item.totalFinishPayCnt},
total_finish_pay_user_cnt = #{item.totalFinishPayUserCnt}, total_finish_pay_user_cnt = #{item.totalFinishPayUserCnt},
total_need_pay_user_cnt = #{item.totalNeedPayUserCnt}, 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}, test_cases = #{item.testCases},
exec_cases = #{item.execCases}, exec_cases = #{item.execCases},
design_cases = #{item.designCases}, design_cases = #{item.designCases},
finish_cases = #{item.finishCases}, finish_cases = #{item.finishCases},
iteration_cnt = #{item.iterationCnt}, iteration_cnt = #{item.iterationCnt},
product_cnt = #{item.productCnt}, 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}
</sql> </sql>
</mapper> </mapper>

250
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml

@ -3,47 +3,51 @@
<mapper namespace="com.xm.core.entity.XmTaskExecuser"> <mapper namespace="com.xm.core.entity.XmTaskExecuser">
<!--开始 自定sql函数区域 -->
<!--请在此区域添加自定义函数-->
<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动,因为代码随时重新生成 -->
<!-- 插入流程审批表数据 -->
<sql id="whereForMap">
<if test=" ids != null"> and (res.id) in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</if>
<if test="key != null and key !='' "> </if>
</sql>
<insert id="insertProcessApprova" <insert id="insertProcessApprova"
parameterType="HashMap"
useGeneratedKeys="false" keyProperty="id">
parameterType="HashMap"
useGeneratedKeys="false" keyProperty="id">
insert into xm_task_execuser_process_approva ( 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 ( ) 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}
) )
</insert> </insert>
<!-- 同时修改业务表及流程审批表数据状态 -->
<!-- 同时修改业务表及流程审批表数据状态 -->
<update id="updateProcessApprova" <update id="updateProcessApprova"
parameterType="HashMap">
parameterType="HashMap">
update xm_task_execuser b ,XM.xm_task_execuser_process_approva pa update xm_task_execuser b ,XM.xm_task_execuser_process_approva pa
<set>
<if test=' agree != null and agree !="" '> pa.agree = #{agree},</if>
<if test=' actId != null and actId !="" '> pa.act_id = #{actId},</if>
<if test=' assignee != null and assignee !="" '> pa.assignee = #{assignee},</if>
<if test=' assigneeName != null and assigneeName !="" '> pa.assignee_name = #{assigneeName},</if>
<if test=' taskName != null and taskName !="" '> pa.task_name = #{taskName},</if>
<if test=' commentMsg != null and commentMsg !="" '> pa.comment_msg = #{commentMsg},</if>
pa.flow_last_time = now(),
<if test=' eventName != null and eventName !="" '> pa.event_name = #{eventName},</if>
<if test=' flowState != null and flowState !="" '> pa.flow_state=#{flowState},</if>
<if test=' bizFlowState != null and bizFlowState !="" '> b.biz_flow_state=#{bizFlowState},</if>
<if test=' bizProcInstId != null and bizProcInstId !="" '> b.biz_proc_inst_id=#{bizProcInstId},</if>
<if test=' settleStatus != null and settleStatus !="" '> b.settle_status=#{settleStatus},</if>
<set>
<if test=' agree != null and agree !="" '> pa.agree = #{agree},</if>
<if test=' actId != null and actId !="" '> pa.act_id = #{actId},</if>
<if test=' assignee != null and assignee !="" '> pa.assignee = #{assignee},</if>
<if test=' assigneeName != null and assigneeName !="" '> pa.assignee_name = #{assigneeName},</if>
<if test=' taskName != null and taskName !="" '> pa.task_name = #{taskName},</if>
<if test=' commentMsg != null and commentMsg !="" '> pa.comment_msg = #{commentMsg},</if>
pa.flow_last_time = now(),
<if test=' eventName != null and eventName !="" '> pa.event_name = #{eventName},</if>
<if test=' flowState != null and flowState !="" '> pa.flow_state=#{flowState},</if>
<if test=' bizFlowState != null and bizFlowState !="" '> b.biz_flow_state=#{bizFlowState},</if>
<if test=' bizProcInstId != null and bizProcInstId !="" '> b.biz_proc_inst_id=#{bizProcInstId},</if>
<if test=' settleStatus != null and settleStatus !="" '> b.settle_status=#{settleStatus},</if>
</set>
</set>
where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
and b.id=pa.execuser_id
and b.id=pa.execuser_id
</update> </update>
<update id="updateFlowStateByProcInstForDeleteSuccess" <update id="updateFlowStateByProcInstForDeleteSuccess"
parameterType="HashMap">
parameterType="HashMap">
update xm_task_execuser_process_approva pa set pa.flow_state='2' update xm_task_execuser_process_approva pa set pa.flow_state='2'
where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
</update> </update>
@ -51,73 +55,74 @@
<!-- 按条件删除若干条记录--> <!-- 按条件删除若干条记录-->
<delete id="deleteByProcInstId" parameterType="HashMap"> <delete id="deleteByProcInstId" parameterType="HashMap">
delete from xm_task_execuser delete from xm_task_execuser
where biz_proc_inst_id=#{procInstId}
where biz_proc_inst_id=#{procInstId}
</delete> </delete>
<update id="updateXmTaskExeUseridsAndUsernamesByTaskId" <update id="updateXmTaskExeUseridsAndUsernamesByTaskId"
parameterType="String">
parameterType="String">
UPDATE xm_task t 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}
</update> </update>
<!--结束 自定义sql函数区域--> <!--结束 自定义sql函数区域-->
@ -126,16 +131,9 @@
<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap"> <select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
select res.*,pa.proc_inst_id,pa.assignee,pa.assignee_name,pa.main_title,pa.flow_branch_id,pa.task_name,pa.agree,pa.flow_last_time,pa.comment_msg,pa.proc_def_id,pa.flow_state from xm_task_execuser res left join xm_task_execuser_process_approva pa on res.id=pa.execuser_id and res.biz_proc_inst_id=pa.proc_inst_id select res.*,pa.proc_inst_id,pa.assignee,pa.assignee_name,pa.main_title,pa.flow_branch_id,pa.task_name,pa.agree,pa.flow_last_time,pa.comment_msg,pa.proc_def_id,pa.flow_state from xm_task_execuser res left join xm_task_execuser_process_approva pa on res.id=pa.execuser_id and res.biz_proc_inst_id=pa.proc_inst_id
<where>
<if test="ids != null"> and
id in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</if>
<where>
<include refid="whereForMap"/>
<include refid="where"/> <include refid="where"/>
<if test="key != null and key !='' "> </if>
<if test="fuzzy != null and fuzzy != ''"> and username like #{fuzzy} </if>
</where> </where>
</select> </select>
@ -153,7 +151,13 @@
where where
res.id = #{id} res.id = #{id}
</select> </select>
<select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmTaskExecuser">
select * from xm_task_execuser res
where (res.id) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</select>
<!-- 通过主键查询获取数据对象 返回map--> <!-- 通过主键查询获取数据对象 返回map-->
<select id="selectOneMap" parameterType="HashMap" resultType="HashMap"> <select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
select * from xm_task_execuser res select * from xm_task_execuser res
@ -172,27 +176,27 @@
insert into xm_task_execuser( insert into xm_task_execuser(
<include refid="columns"/> <include refid="columns"/>
) values ( ) values (
#{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}
#{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}
) )
</insert> </insert>
<!-- 按条件删除若干条记录--> <!-- 按条件删除若干条记录-->
<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmTaskExecuser"> <delete id="deleteByWhere" parameterType="com.xm.core.entity.XmTaskExecuser">
delete from xm_task_execuser
delete from xm_task_execuser res
<where> <where>
1=2
<include refid="where"/>
</where> </where>
</delete> </delete>
<!-- 按主键删除一条记录--> <!-- 按主键删除一条记录-->
<delete id="deleteByPk" parameterType="com.xm.core.entity.XmTaskExecuser"> <delete id="deleteByPk" parameterType="com.xm.core.entity.XmTaskExecuser">
delete from xm_task_execuser
delete from xm_task_execuser
where id = #{id} where id = #{id}
</delete> </delete>
<!-- 根据条件修改若干条记录 --> <!-- 根据条件修改若干条记录 -->
<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmTaskExecuser"> <update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmTaskExecuser">
update xm_task_execuser
update xm_task_execuser
<set> <set>
<include refid="someFieldSet"/> <include refid="someFieldSet"/>
</set> </set>
@ -201,7 +205,7 @@
<!-- 根据主键修改一条记录 --> <!-- 根据主键修改一条记录 -->
<update id="updateByPk" parameterType="com.xm.core.entity.XmTaskExecuser"> <update id="updateByPk" parameterType="com.xm.core.entity.XmTaskExecuser">
update xm_task_execuser
update xm_task_execuser
<set> <set>
<include refid="set"/> <include refid="set"/>
</set> </set>
@ -216,7 +220,7 @@
<!-- 批量更新 --> <!-- 批量更新 -->
<update id="batchUpdate" parameterType="List"> <update id="batchUpdate" parameterType="List">
<foreach collection="list" item="item" index="index" separator=";" > <foreach collection="list" item="item" index="index" separator=";" >
update xm_task_execuser
update xm_task_execuser
set set
<include refid="batchSet"/> <include refid="batchSet"/>
where id = #{item.id} where id = #{item.id}
@ -224,20 +228,18 @@
</update> </update>
<!-- 批量删除 --> <!-- 批量删除 -->
<delete id="batchDelete" parameterType="List"> <delete id="batchDelete" parameterType="List">
delete from xm_task_execuser
delete from xm_task_execuser
where where
(id)
in
(id) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" > <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item.id}
)
( #{item.id} )
</foreach> </foreach>
</delete> </delete>
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <sql id="columns">
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
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -264,17 +266,19 @@
<if test="bizProcInstId != null and bizProcInstId != ''"> and res.biz_proc_inst_id = #{bizProcInstId} </if> <if test="bizProcInstId != null and bizProcInstId != ''"> and res.biz_proc_inst_id = #{bizProcInstId} </if>
<if test="bizFlowState != null and bizFlowState != ''"> and res.biz_flow_state = #{bizFlowState} </if> <if test="bizFlowState != null and bizFlowState != ''"> and res.biz_flow_state = #{bizFlowState} </if>
<if test="projectId != null and projectId != ''"> and res.project_id = #{projectId} </if> <if test="projectId != null and projectId != ''"> and res.project_id = #{projectId} </if>
<if test="projectPhaseId != null and projectPhaseId != ''"> and res.project_phase_id = #{projectPhaseId} </if>
<if test="phaseId != null and phaseId != ''"> and res.phase_id = #{phaseId} </if>
<if test="skillRemark != null and skillRemark != ''"> and res.skill_remark = #{skillRemark} </if> <if test="skillRemark != null and skillRemark != ''"> and res.skill_remark = #{skillRemark} </if>
<if test="quoteWorkload != null and quoteWorkload != ''"> and res.quote_workload = #{quoteWorkload} </if> <if test="quoteWorkload != null and quoteWorkload != ''"> and res.quote_workload = #{quoteWorkload} </if>
<if test="quoteStartTime != null"> and date_format(res.quote_start_time,'%Y-%m-%d') = date_format(#{quoteStartTime},'%Y-%m-%d') </if> <if test="quoteStartTime != null"> and date_format(res.quote_start_time,'%Y-%m-%d') = date_format(#{quoteStartTime},'%Y-%m-%d') </if>
<if test="quoteEndTime != null"> and date_format(res.quote_end_time,'%Y-%m-%d') = date_format(#{quoteEndTime},'%Y-%m-%d') </if> <if test="quoteEndTime != null"> and date_format(res.quote_end_time,'%Y-%m-%d') = date_format(#{quoteEndTime},'%Y-%m-%d') </if>
<if test="branchId != null and branchId != ''"> and res.branch_id = #{branchId} </if> <if test="branchId != null and branchId != ''"> and res.branch_id = #{branchId} </if>
<if test="projectName != null and projectName != ''"> and res.project_phase_name = #{projectName} </if>
<if test="phaseName != null and phaseName != ''"> and res.phase_name = #{phaseName} </if>
<if test="taskName != null and taskName != ''"> and res.task_name = #{taskName} </if> <if test="taskName != null and taskName != ''"> and res.task_name = #{taskName} </if>
<if test="isLeader != null and isLeader != ''"> and res.is_leader = #{isLeader} </if> <if test="isLeader != null and isLeader != ''"> and res.is_leader = #{isLeader} </if>
<if test="distUserid != null and distUserid != ''"> and res.dist_userid = #{distUserid} </if> <if test="distUserid != null and distUserid != ''"> and res.dist_userid = #{distUserid} </if>
<if test="distUsername != null and distUsername != ''"> and res.dist_username = #{distUsername} </if> <if test="distUsername != null and distUsername != ''"> and res.dist_username = #{distUsername} </if>
<if test="execUserBranchid != null and execUserBranchid != ''"> and res.exec_user_branchid = #{execUserBranchid} </if>
<if test="shareKey != null and shareKey != ''"> and res.share_key = #{shareKey} </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -299,17 +303,19 @@
biz_proc_inst_id = #{bizProcInstId}, biz_proc_inst_id = #{bizProcInstId},
biz_flow_state = #{bizFlowState}, biz_flow_state = #{bizFlowState},
project_id = #{projectId}, project_id = #{projectId},
project_phase_id = #{projectPhaseId},
phase_id = #{phaseId},
skill_remark = #{skillRemark}, skill_remark = #{skillRemark},
quote_workload = #{quoteWorkload}, quote_workload = #{quoteWorkload},
quote_start_time = #{quoteStartTime}, quote_start_time = #{quoteStartTime},
quote_end_time = #{quoteEndTime}, quote_end_time = #{quoteEndTime},
branch_id = #{branchId}, branch_id = #{branchId},
project_phase_name = #{projectName},
phase_name = #{phaseName},
task_name = #{taskName}, task_name = #{taskName},
is_leader = #{isLeader}, is_leader = #{isLeader},
dist_userid = #{distUserid}, dist_userid = #{distUserid},
dist_username = #{distUsername}
dist_username = #{distUsername},
exec_user_branchid = #{execUserBranchid},
share_key = #{shareKey}
</sql> </sql>
<sql id="someFieldSet"> <sql id="someFieldSet">
<if test="createTime != null"> create_time = #{createTime}, </if> <if test="createTime != null"> create_time = #{createTime}, </if>
@ -333,17 +339,19 @@
<if test="bizProcInstId != null and bizProcInstId != ''"> biz_proc_inst_id = #{bizProcInstId}, </if> <if test="bizProcInstId != null and bizProcInstId != ''"> biz_proc_inst_id = #{bizProcInstId}, </if>
<if test="bizFlowState != null and bizFlowState != ''"> biz_flow_state = #{bizFlowState}, </if> <if test="bizFlowState != null and bizFlowState != ''"> biz_flow_state = #{bizFlowState}, </if>
<if test="projectId != null and projectId != ''"> project_id = #{projectId}, </if> <if test="projectId != null and projectId != ''"> project_id = #{projectId}, </if>
<if test="projectPhaseId != null and projectPhaseId != ''"> project_phase_id = #{projectPhaseId}, </if>
<if test="phaseId != null and phaseId != ''"> phase_id = #{phaseId}, </if>
<if test="skillRemark != null and skillRemark != ''"> skill_remark = #{skillRemark}, </if> <if test="skillRemark != null and skillRemark != ''"> skill_remark = #{skillRemark}, </if>
<if test="quoteWorkload != null and quoteWorkload != ''"> quote_workload = #{quoteWorkload}, </if> <if test="quoteWorkload != null and quoteWorkload != ''"> quote_workload = #{quoteWorkload}, </if>
<if test="quoteStartTime != null"> quote_start_time = #{quoteStartTime}, </if> <if test="quoteStartTime != null"> quote_start_time = #{quoteStartTime}, </if>
<if test="quoteEndTime != null"> quote_end_time = #{quoteEndTime}, </if> <if test="quoteEndTime != null"> quote_end_time = #{quoteEndTime}, </if>
<if test="branchId != null and branchId != ''"> branch_id = #{branchId}, </if> <if test="branchId != null and branchId != ''"> branch_id = #{branchId}, </if>
<if test="projectName != null and projectName != ''"> project_phase_name = #{projectName}, </if>
<if test="phaseName != null and phaseName != ''"> phase_name = #{phaseName}, </if>
<if test="taskName != null and taskName != ''"> task_name = #{taskName}, </if> <if test="taskName != null and taskName != ''"> task_name = #{taskName}, </if>
<if test="isLeader != null and isLeader != ''"> is_leader = #{isLeader}, </if> <if test="isLeader != null and isLeader != ''"> is_leader = #{isLeader}, </if>
<if test="distUserid != null and distUserid != ''"> dist_userid = #{distUserid}, </if> <if test="distUserid != null and distUserid != ''"> dist_userid = #{distUserid}, </if>
<if test="distUsername != null and distUsername != ''"> dist_username = #{distUsername}, </if> <if test="distUsername != null and distUsername != ''"> dist_username = #{distUsername}, </if>
<if test="execUserBranchid != null and execUserBranchid != ''"> exec_user_branchid = #{execUserBranchid}, </if>
<if test="shareKey != null and shareKey != ''"> share_key = #{shareKey}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -368,16 +376,18 @@
biz_proc_inst_id = #{item.bizProcInstId}, biz_proc_inst_id = #{item.bizProcInstId},
biz_flow_state = #{item.bizFlowState}, biz_flow_state = #{item.bizFlowState},
project_id = #{item.projectId}, project_id = #{item.projectId},
project_phase_id = #{item.projectPhaseId},
phase_id = #{item.phaseId},
skill_remark = #{item.skillRemark}, skill_remark = #{item.skillRemark},
quote_workload = #{item.quoteWorkload}, quote_workload = #{item.quoteWorkload},
quote_start_time = #{item.quoteStartTime}, quote_start_time = #{item.quoteStartTime},
quote_end_time = #{item.quoteEndTime}, quote_end_time = #{item.quoteEndTime},
branch_id = #{item.branchId}, branch_id = #{item.branchId},
project_phase_name = #{item.projectName},
phase_name = #{item.phaseName},
task_name = #{item.taskName}, task_name = #{item.taskName},
is_leader = #{item.isLeader}, is_leader = #{item.isLeader},
dist_userid = #{item.distUserid}, dist_userid = #{item.distUserid},
dist_username = #{item.distUsername}
dist_username = #{item.distUsername},
exec_user_branchid = #{item.execUserBranchid},
share_key = #{item.shareKey}
</sql> </sql>
</mapper> </mapper>
Loading…
Cancel
Save