end7less
/
program_xm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
995c0356cf
commit
afd8d74629
14 changed files with 440 additions and 181 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateController.java
  2. 12
      xm-core/src/main/java/com/xm/core/ctrl/XmIterationStateController.java
  3. 13
      xm-core/src/main/java/com/xm/core/ctrl/XmProductStateController.java
  4. 14
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateController.java
  5. 34
      xm-core/src/main/java/com/xm/core/entity/XmBranchState.java
  6. 49
      xm-core/src/main/java/com/xm/core/entity/XmIterationState.java
  7. 34
      xm-core/src/main/java/com/xm/core/entity/XmProductState.java
  8. 34
      xm-core/src/main/java/com/xm/core/entity/XmProjectState.java
  9. 227
      xm-core/src/main/java/com/xm/core/entity/XmProjectStateHis.java
  10. 16
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml
  11. 20
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationStateMapper.xml
  12. 16
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductStateMapper.xml
  13. 123
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateHisMapper.xml
  14. 16
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateMapper.xml

13
xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateController.java
View File

@ -119,19 +119,6 @@ public class XmBranchStateController {
return m; return m;
} }
@RequestMapping(value="/list/his",method=RequestMethod.GET)
public Map<String,Object> listXmBranchStateHis( @RequestParam Map<String,Object> xmBranchState){
Map<String,Object> m = new HashMap<>();
RequestUtils.transformArray(xmBranchState, "ids");
PageUtils.startPage(xmBranchState);
List<Map<String,Object>> xmBranchStateList = xmBranchStateService.selectList("listXmBranchStateHis",xmBranchState); //列出XmBranchState列表
PageUtils.responePage(m, xmBranchStateList);
m.put("data",xmBranchStateList);
Tips tips=new Tips("查询成功");
m.put("tips", tips);
return m;
}
@ApiOperation( value = "查询机构内所有项目指标汇总信息列表",notes="listXmBranchState,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}") @ApiOperation( value = "查询机构内所有项目指标汇总信息列表",notes="listXmBranchState,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
@ApiResponses({ @ApiResponses({

12
xm-core/src/main/java/com/xm/core/ctrl/XmIterationStateController.java
View File

@ -90,18 +90,6 @@ public class XmIterationStateController {
m.put("tips", tips); m.put("tips", tips);
return m; return m;
} }
@RequestMapping(value="/list/his",method=RequestMethod.GET)
public Map<String,Object> listXmIterationStateHis( @RequestParam Map<String,Object> xmIterationState){
Map<String,Object> m = new HashMap<>();
RequestUtils.transformArray(xmIterationState, "ids");
PageUtils.startPage(xmIterationState);
List<Map<String,Object>> xmIterationStateList = xmIterationStateService.selectList("listXmIterationStateHis",xmIterationState); //列出XmIterationState列表
PageUtils.responePage(m, xmIterationStateList);
m.put("data",xmIterationStateList);
Tips tips=new Tips("查询成功");
m.put("tips", tips);
return m;
}
@ApiOperation( value = "计算bug、task、测试案例、等数据",notes="loadTasksToXmIterationState") @ApiOperation( value = "计算bug、task、测试案例、等数据",notes="loadTasksToXmIterationState")
@ApiResponses({ @ApiResponses({

13
xm-core/src/main/java/com/xm/core/ctrl/XmProductStateController.java
View File

@ -102,19 +102,6 @@ public class XmProductStateController {
m.put("tips", tips); m.put("tips", tips);
return m; return m;
} }
@RequestMapping(value="/list/his",method=RequestMethod.GET)
public Map<String,Object> listXmProductStateHis( @RequestParam Map<String,Object> xmProductState){
Map<String,Object> m = new HashMap<>();
RequestUtils.transformArray(xmProductState, "ids");
PageUtils.startPage(xmProductState);
List<Map<String,Object>> xmProductStateList = xmProductStateService.selectList("listXmProductStateHis",xmProductState); //列出XmProductState列表
PageUtils.responePage(m, xmProductStateList);
m.put("data",xmProductStateList);
Tips tips=new Tips("查询成功");
m.put("tips", tips);
return m;
}
@ApiOperation( value = "计算bug、task、测试案例、等数据",notes="loadTasksToXmProductState") @ApiOperation( value = "计算bug、task、测试案例、等数据",notes="loadTasksToXmProductState")
@ApiResponses({ @ApiResponses({
@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")

14
xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateController.java
View File

@ -124,20 +124,6 @@ public class XmProjectStateController {
return m; return m;
} }
@RequestMapping(value="/list/his",method=RequestMethod.GET)
public Map<String,Object> listXmProjectStateHis( @RequestParam Map<String,Object> xmProjectState){
Map<String,Object> m = new HashMap<>();
RequestUtils.transformArray(xmProjectState, "ids");
PageUtils.startPage(xmProjectState);
List<Map<String,Object>> xmProjectStateList = xmProjectStateService.selectList("listXmProjectStateHis",xmProjectState); //列出XmProjectState列表
PageUtils.responePage(m, xmProjectStateList);
m.put("data",xmProjectStateList);
Tips tips=new Tips("查询成功");
m.put("tips", tips);
return m;
}
@ApiOperation( value = "查询功能状态表,无需前端维护，所有数据由汇总统计得出信息列表",notes="listXmProductState,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}") @ApiOperation( value = "查询功能状态表,无需前端维护，所有数据由汇总统计得出信息列表",notes="listXmProductState,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
@ApiResponses({ @ApiResponses({

34
xm-core/src/main/java/com/xm/core/entity/XmBranchState.java
View File

@ -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,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>
* 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,minStartTime,maxEndTime;<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_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>
* 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,min_start_time,max_end_time;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* branch_id;<br> * branch_id;<br>
*/ */
@ -196,6 +196,12 @@ public class XmBranchState implements java.io.Serializable {
@ApiModelProperty(notes="待开始需求数=需求表中开始日期大于当前日期的需求数",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="待开始需求数=需求表中开始日期大于当前日期的需求数",allowEmptyValue=true,example="",allowableValues="")
Integer toStartMenuCnt; Integer toStartMenuCnt;
@ApiModelProperty(notes="最早开始日期",allowEmptyValue=true,example="",allowableValues="")
Date minStartTime;
@ApiModelProperty(notes="最晚结束时间",allowEmptyValue=true,example="",allowableValues="")
Date maxEndTime;
/**机构编号**/ /**机构编号**/
public XmBranchState(String branchId) { public XmBranchState(String branchId) {
@ -560,6 +566,18 @@ public class XmBranchState implements java.io.Serializable {
public void setToStartMenuCnt(Integer toStartMenuCnt) { public void setToStartMenuCnt(Integer toStartMenuCnt) {
this.toStartMenuCnt = toStartMenuCnt; this.toStartMenuCnt = toStartMenuCnt;
} }
/**
* 最早开始日期
**/
public void setMinStartTime(Date minStartTime) {
this.minStartTime = minStartTime;
}
/**
* 最晚结束时间
**/
public void setMaxEndTime(Date maxEndTime) {
this.maxEndTime = maxEndTime;
}
/** /**
* 统计日期yyyy-mm-dd类型 * 统计日期yyyy-mm-dd类型
@ -915,5 +933,17 @@ public class XmBranchState implements java.io.Serializable {
public Integer getToStartMenuCnt() { public Integer getToStartMenuCnt() {
return this.toStartMenuCnt; return this.toStartMenuCnt;
} }
/**
* 最早开始日期
**/
public Date getMinStartTime() {
return this.minStartTime;
}
/**
* 最晚结束时间
**/
public Date getMaxEndTime() {
return this.maxEndTime;
}
} }

49
xm-core/src/main/java/com/xm/core/entity/XmIterationState.java
View File

@ -8,9 +8,9 @@ import java.util.Date;
/** /**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br> * 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmIterationState所有属性名: <br> * 实体 XmIterationState所有属性名: <br>
* distBudgetCost,distBudgetWorkload,actCost,actWorkload,actStaffNum,finishRate,testCases,execCases,designCases,finishCases,projectCnt,productCnt,menuCnt,taskCnt,finishTaskCnt,calcTime,iterationName,budgetCost,budgetWorkload,iterationId,bizDate,closedBugCnt,resolvedBugCnt,activeBugCnt,confirmedBugCnt,bugCnt;<br>
* distBudgetCost,distBudgetWorkload,actCost,actWorkload,actStaffNum,finishRate,testCases,execCases,designCases,finishCases,projectCnt,productCnt,menuCnt,taskCnt,finishTaskCnt,calcTime,iterationName,budgetCost,budgetWorkload,iterationId,bizDate,closedBugCnt,resolvedBugCnt,activeBugCnt,confirmedBugCnt,bugCnt,estimateWorkload,minStartTime,maxEndTime;<br>
* 表 xm_iteration_state 迭代定义的所有字段名: <br> * 表 xm_iteration_state 迭代定义的所有字段名: <br>
* dist_budget_cost,dist_budget_workload,act_cost,act_workload,act_staff_num,finish_rate,test_cases,exec_cases,design_cases,finish_cases,project_cnt,product_cnt,menu_cnt,task_cnt,finish_task_cnt,calc_time,iteration_name,budget_cost,budget_workload,iteration_id,biz_date,closed_bug_cnt,resolved_bug_cnt,active_bug_cnt,confirmed_bug_cnt,bug_cnt;<br>
* dist_budget_cost,dist_budget_workload,act_cost,act_workload,act_staff_num,finish_rate,test_cases,exec_cases,design_cases,finish_cases,project_cnt,product_cnt,menu_cnt,task_cnt,finish_task_cnt,calc_time,iteration_name,budget_cost,budget_workload,iteration_id,biz_date,closed_bug_cnt,resolved_bug_cnt,active_bug_cnt,confirmed_bug_cnt,bug_cnt,estimate_workload,min_start_time,max_end_time;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* iteration_id;<br> * iteration_id;<br>
*/ */
@ -97,6 +97,15 @@ public class XmIterationState implements java.io.Serializable {
@ApiModelProperty(notes="bug总数",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="bug总数",allowEmptyValue=true,example="",allowableValues="")
Integer bugCnt; Integer bugCnt;
@ApiModelProperty(notes="预估工时=计划结束时间在计算当日前完成的任务的预算工时总和",allowEmptyValue=true,example="",allowableValues="")
BigDecimal estimateWorkload;
@ApiModelProperty(notes="最早开始日期",allowEmptyValue=true,example="",allowableValues="")
Date minStartTime;
@ApiModelProperty(notes="最晚结束时间",allowEmptyValue=true,example="",allowableValues="")
Date maxEndTime;
/**迭代编号**/ /**迭代编号**/
public XmIterationState(String iterationId) { public XmIterationState(String iterationId) {
@ -263,6 +272,24 @@ public class XmIterationState implements java.io.Serializable {
public void setBugCnt(Integer bugCnt) { public void setBugCnt(Integer bugCnt) {
this.bugCnt = bugCnt; this.bugCnt = bugCnt;
} }
/**
* 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
**/
public void setEstimateWorkload(BigDecimal estimateWorkload) {
this.estimateWorkload = estimateWorkload;
}
/**
* 最早开始日期
**/
public void setMinStartTime(Date minStartTime) {
this.minStartTime = minStartTime;
}
/**
* 最晚结束时间
**/
public void setMaxEndTime(Date maxEndTime) {
this.maxEndTime = maxEndTime;
}
/** /**
* 已分配到任务的预算从任务表汇总而来 * 已分配到任务的预算从任务表汇总而来
@ -420,5 +447,23 @@ public class XmIterationState implements java.io.Serializable {
public Integer getBugCnt() { public Integer getBugCnt() {
return this.bugCnt; return this.bugCnt;
} }
/**
* 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
**/
public BigDecimal getEstimateWorkload() {
return this.estimateWorkload;
}
/**
* 最早开始日期
**/
public Date getMinStartTime() {
return this.minStartTime;
}
/**
* 最晚结束时间
**/
public Date getMaxEndTime() {
return this.maxEndTime;
}
} }

34
xm-core/src/main/java/com/xm/core/entity/XmProductState.java
View File

@ -8,9 +8,9 @@ import java.math.BigDecimal;
/** /**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br> * 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmProductState所有属性名: <br> * 实体 XmProductState所有属性名: <br>
* planStartTime,planEndTime,actStartTime,actEndTime,planWorkload,actWorkload,planCostAmount,actCostAmount,finishRate,demandRate,designRate,devRate,uatRate,sitRate,ctime,ltime,cuserid,cusername,calcTime,planWorkhours,planWorkerCnt,closedBugs,activeBugs,confirmedBugs,resolvedBugs,productId,productName,testCases,execCases,designCases,finishCases,projectCnt,iterationCnt,taskCnt,finishTaskCnt,bizDate,branchId,bugCnt,menuCnt;<br>
* planStartTime,planEndTime,actStartTime,actEndTime,planWorkload,actWorkload,planCostAmount,actCostAmount,finishRate,demandRate,designRate,devRate,uatRate,sitRate,ctime,ltime,cuserid,cusername,calcTime,planWorkhours,planWorkerCnt,closedBugs,activeBugs,confirmedBugs,resolvedBugs,productId,productName,testCases,execCases,designCases,finishCases,projectCnt,iterationCnt,taskCnt,finishTaskCnt,bizDate,branchId,bugCnt,menuCnt,menuFinishCnt,estimateWorkload;<br>
* 表 xm_product_state 功能状态表,无需前端维护，所有数据由汇总统计得出的所有字段名: <br> * 表 xm_product_state 功能状态表,无需前端维护，所有数据由汇总统计得出的所有字段名: <br>
* plan_start_time,plan_end_time,act_start_time,act_end_time,plan_workload,act_workload,plan_cost_amount,act_cost_amount,finish_rate,demand_rate,design_rate,dev_rate,uat_rate,sit_rate,ctime,ltime,cuserid,cusername,calc_time,plan_workhours,plan_worker_cnt,closed_bugs,active_bugs,confirmed_bugs,resolved_bugs,product_id,product_name,test_cases,exec_cases,design_cases,finish_cases,project_cnt,iteration_cnt,task_cnt,finish_task_cnt,biz_date,branch_id,bug_cnt,menu_cnt;<br>
* plan_start_time,plan_end_time,act_start_time,act_end_time,plan_workload,act_workload,plan_cost_amount,act_cost_amount,finish_rate,demand_rate,design_rate,dev_rate,uat_rate,sit_rate,ctime,ltime,cuserid,cusername,calc_time,plan_workhours,plan_worker_cnt,closed_bugs,active_bugs,confirmed_bugs,resolved_bugs,product_id,product_name,test_cases,exec_cases,design_cases,finish_cases,project_cnt,iteration_cnt,task_cnt,finish_task_cnt,biz_date,branch_id,bug_cnt,menu_cnt,menu_finish_cnt,estimate_workload;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* product_id;<br> * product_id;<br>
*/ */
@ -136,6 +136,12 @@ public class XmProductState 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 menuFinishCnt;
@ApiModelProperty(notes="预估工时=计划结束时间在计算当日前完成的任务的预算工时总和",allowEmptyValue=true,example="",allowableValues="")
BigDecimal estimateWorkload;
/**产品编号**/ /**产品编号**/
public XmProductState(String productId) { public XmProductState(String productId) {
@ -380,6 +386,18 @@ public class XmProductState implements java.io.Serializable {
public void setMenuCnt(Integer menuCnt) { public void setMenuCnt(Integer menuCnt) {
this.menuCnt = menuCnt; this.menuCnt = menuCnt;
} }
/**
* 需求完成数
**/
public void setMenuFinishCnt(Integer menuFinishCnt) {
this.menuFinishCnt = menuFinishCnt;
}
/**
* 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
**/
public void setEstimateWorkload(BigDecimal estimateWorkload) {
this.estimateWorkload = estimateWorkload;
}
/** /**
* 开始时间 * 开始时间
@ -615,5 +633,17 @@ public class XmProductState implements java.io.Serializable {
public Integer getMenuCnt() { public Integer getMenuCnt() {
return this.menuCnt; return this.menuCnt;
} }
/**
* 需求完成数
**/
public Integer getMenuFinishCnt() {
return this.menuFinishCnt;
}
/**
* 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
**/
public BigDecimal getEstimateWorkload() {
return this.estimateWorkload;
}
} }

34
xm-core/src/main/java/com/xm/core/entity/XmProjectState.java
View File

@ -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,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>
* 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,minStartTime,maxEndTime;<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_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>
* 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,min_start_time,max_end_time;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* project_id;<br> * project_id;<br>
*/ */
@ -196,6 +196,12 @@ public class XmProjectState implements java.io.Serializable {
@ApiModelProperty(notes="待开始需求数=需求表中开始日期=当前日期+1的需求数",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="待开始需求数=需求表中开始日期=当前日期+1的需求数",allowEmptyValue=true,example="",allowableValues="")
Integer toStartMenuCnt; Integer toStartMenuCnt;
@ApiModelProperty(notes="最早开始日期",allowEmptyValue=true,example="",allowableValues="")
Date minStartTime;
@ApiModelProperty(notes="最晚结束时间",allowEmptyValue=true,example="",allowableValues="")
Date maxEndTime;
/**项目编号**/ /**项目编号**/
public XmProjectState(String projectId) { public XmProjectState(String projectId) {
@ -560,6 +566,18 @@ public class XmProjectState implements java.io.Serializable {
public void setToStartMenuCnt(Integer toStartMenuCnt) { public void setToStartMenuCnt(Integer toStartMenuCnt) {
this.toStartMenuCnt = toStartMenuCnt; this.toStartMenuCnt = toStartMenuCnt;
} }
/**
* 最早开始日期
**/
public void setMinStartTime(Date minStartTime) {
this.minStartTime = minStartTime;
}
/**
* 最晚结束时间
**/
public void setMaxEndTime(Date maxEndTime) {
this.maxEndTime = maxEndTime;
}
/** /**
* 项目编号 * 项目编号
@ -915,5 +933,17 @@ public class XmProjectState implements java.io.Serializable {
public Integer getToStartMenuCnt() { public Integer getToStartMenuCnt() {
return this.toStartMenuCnt; return this.toStartMenuCnt;
} }
/**
* 最早开始日期
**/
public Date getMinStartTime() {
return this.minStartTime;
}
/**
* 最晚结束时间
**/
public Date getMaxEndTime() {
return this.maxEndTime;
}
} }

227
xm-core/src/main/java/com/xm/core/entity/XmProjectStateHis.java
View File

@ -1,34 +1,30 @@
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>
* 实体 XmProjectStateHis所有属性名: <br> * 实体 XmProjectStateHis所有属性名: <br>
* projectId,bizDate,totalFileCnt,totalBugCnt,totalTaskCnt,totalBudgetNouserAmount,projectName,id,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;<br>
* 表 XM.xm_project_state_his 项目指标日统计表的所有字段名: <br>
* project_id,biz_date,total_file_cnt,total_bug_cnt,total_task_cnt,total_budget_nouser_amount,project_name,id,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>
* 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,minStartTime,maxEndTime;<br>
* 表 xm_project_state_his 项目指标日统计表的所有字段名: <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,min_start_time,max_end_time;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br>
* project_id,biz_date;<br>
*/ */
@ApiModel(description="项目指标日统计表") @ApiModel(description="项目指标日统计表")
public class XmProjectStateHis implements java.io.Serializable { public class XmProjectStateHis implements java.io.Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(notes="主键,主键",allowEmptyValue=true,example="",allowableValues="")
String id;
@ApiModelProperty(notes="项目编号",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="项目编号,主键",allowEmptyValue=true,example="",allowableValues="")
String projectId; String projectId;
@ApiModelProperty(notes="统计日期yyyy-mm-dd类型",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="统计日期yyyy-mm-dd类型,主键",allowEmptyValue=true,example="",allowableValues="")
String bizDate; String bizDate;
@ApiModelProperty(notes="文件数据",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="文件数据",allowEmptyValue=true,example="",allowableValues="")
Integer totalFileCnt; Integer totalFileCnt;
@ -66,10 +62,10 @@ public class XmProjectStateHis implements java.io.Serializable {
@ApiModelProperty(notes="已完成任务总数-来自任务表",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="已完成任务总数-来自任务表",allowEmptyValue=true,example="",allowableValues="")
Integer totalCompleteTaskCnt; Integer totalCompleteTaskCnt;
@ApiModelProperty(notes="项目计划数",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="项目阶段计划数",allowEmptyValue=true,example="",allowableValues="")
Integer totalPhaseCnt; Integer totalPhaseCnt;
@ApiModelProperty(notes="项目计划已完成数",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="项目阶段计划已完成数",allowEmptyValue=true,example="",allowableValues="")
Integer totalCompletePhaseCnt; Integer totalCompletePhaseCnt;
@ApiModelProperty(notes="待付款总金额",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="待付款总金额",allowEmptyValue=true,example="",allowableValues="")
@ -126,7 +122,7 @@ public class XmProjectStateHis 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="")
@ -142,24 +138,24 @@ public class XmProjectStateHis implements java.io.Serializable {
BigDecimal totalTaskBudgetCostAt; BigDecimal totalTaskBudgetCostAt;
@ApiModelProperty(notes="外购任务数，来自任务表",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="外购任务数，来自任务表",allowEmptyValue=true,example="",allowableValues="")
Integer totalTaskOutCnt;
BigDecimal totalTaskOutCnt;
@ApiModelProperty(notes="待付款笔数",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="待付款笔数",allowEmptyValue=true,example="",allowableValues="")
Integer totalNeedPayCnt;
BigDecimal totalNeedPayCnt;
@ApiModelProperty(notes="完成付款总比数",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="完成付款总比数",allowEmptyValue=true,example="",allowableValues="")
Integer totalFinishPayCnt;
BigDecimal totalFinishPayCnt;
@ApiModelProperty(notes="已付款总人数",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="已付款总人数",allowEmptyValue=true,example="",allowableValues="")
Integer totalFinishPayUserCnt;
BigDecimal totalFinishPayUserCnt;
@ApiModelProperty(notes="待付款总人数",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="待付款总人数",allowEmptyValue=true,example="",allowableValues="")
Integer totalNeedPayUserCnt;
BigDecimal totalNeedPayUserCnt;
@ApiModelProperty(notes="内部人力总工作量-应该大于或等于计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalPlanIuserWorkload; BigDecimal totalPlanIuserWorkload;
@ApiModelProperty(notes="外购人力总工作量-应该大于或等于计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
BigDecimal totalPlanOuserWorkload; BigDecimal totalPlanOuserWorkload;
@ApiModelProperty(notes="测试案例总数",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="测试案例总数",allowEmptyValue=true,example="",allowableValues="")
@ -180,12 +176,37 @@ public class XmProjectStateHis implements java.io.Serializable {
@ApiModelProperty(notes="产品数",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="产品数",allowEmptyValue=true,example="",allowableValues="")
Integer productCnt; Integer productCnt;
@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;
@ApiModelProperty(notes="最早开始日期",allowEmptyValue=true,example="",allowableValues="")
Date minStartTime;
@ApiModelProperty(notes="最晚结束时间",allowEmptyValue=true,example="",allowableValues="")
Date maxEndTime;
/**主键**/
public XmProjectStateHis(String id) {
this.id = id;
/**项目编号,统计日期yyyy-mm-dd类型**/
public XmProjectStateHis(String projectId,String bizDate) {
this.projectId = projectId;
this.bizDate = bizDate;
} }
/**项目指标日统计表**/ /**项目指标日统计表**/
@ -234,12 +255,6 @@ public class XmProjectStateHis implements java.io.Serializable {
public void setProjectName(String projectName) { public void setProjectName(String projectName) {
this.projectName = projectName; this.projectName = projectName;
} }
/**
* 主键
**/
public void setId(String id) {
this.id = id;
}
/** /**
* 总参与人数 * 总参与人数
**/ **/
@ -283,13 +298,13 @@ public class XmProjectStateHis implements java.io.Serializable {
this.totalCompleteTaskCnt = totalCompleteTaskCnt; this.totalCompleteTaskCnt = totalCompleteTaskCnt;
} }
/** /**
* 项目计划数
* 项目阶段计划数
**/ **/
public void setTotalPhaseCnt(Integer totalPhaseCnt) { public void setTotalPhaseCnt(Integer totalPhaseCnt) {
this.totalPhaseCnt = totalPhaseCnt; this.totalPhaseCnt = totalPhaseCnt;
} }
/** /**
* 项目计划已完成数
* 项目阶段计划已完成数
**/ **/
public void setTotalCompletePhaseCnt(Integer totalCompletePhaseCnt) { public void setTotalCompletePhaseCnt(Integer totalCompletePhaseCnt) {
this.totalCompletePhaseCnt = totalCompletePhaseCnt; this.totalCompletePhaseCnt = totalCompletePhaseCnt;
@ -403,7 +418,7 @@ public class XmProjectStateHis 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;
@ -435,41 +450,41 @@ public class XmProjectStateHis implements java.io.Serializable {
/** /**
* 外购任务数，来自任务表 * 外购任务数，来自任务表
**/ **/
public void setTotalTaskOutCnt(Integer totalTaskOutCnt) {
public void setTotalTaskOutCnt(BigDecimal totalTaskOutCnt) {
this.totalTaskOutCnt = totalTaskOutCnt; this.totalTaskOutCnt = totalTaskOutCnt;
} }
/** /**
* 待付款笔数 * 待付款笔数
**/ **/
public void setTotalNeedPayCnt(Integer totalNeedPayCnt) {
public void setTotalNeedPayCnt(BigDecimal totalNeedPayCnt) {
this.totalNeedPayCnt = totalNeedPayCnt; this.totalNeedPayCnt = totalNeedPayCnt;
} }
/** /**
* 完成付款总比数 * 完成付款总比数
**/ **/
public void setTotalFinishPayCnt(Integer totalFinishPayCnt) {
public void setTotalFinishPayCnt(BigDecimal totalFinishPayCnt) {
this.totalFinishPayCnt = totalFinishPayCnt; this.totalFinishPayCnt = totalFinishPayCnt;
} }
/** /**
* 已付款总人数 * 已付款总人数
**/ **/
public void setTotalFinishPayUserCnt(Integer totalFinishPayUserCnt) {
public void setTotalFinishPayUserCnt(BigDecimal totalFinishPayUserCnt) {
this.totalFinishPayUserCnt = totalFinishPayUserCnt; this.totalFinishPayUserCnt = totalFinishPayUserCnt;
} }
/** /**
* 待付款总人数 * 待付款总人数
**/ **/
public void setTotalNeedPayUserCnt(Integer totalNeedPayUserCnt) {
public void setTotalNeedPayUserCnt(BigDecimal totalNeedPayUserCnt) {
this.totalNeedPayUserCnt = totalNeedPayUserCnt; this.totalNeedPayUserCnt = totalNeedPayUserCnt;
} }
/** /**
* 内部人力总工作量-应该大于或等于计划内部人力总成本
* 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
**/ **/
public void setTotalPlanIuserWorkload(BigDecimal totalPlanIuserWorkload) { public void setTotalPlanIuserWorkload(BigDecimal totalPlanIuserWorkload) {
this.totalPlanIuserWorkload = totalPlanIuserWorkload; this.totalPlanIuserWorkload = totalPlanIuserWorkload;
} }
/** /**
* 外购人力总工作量-应该大于或等于计划外购人力总成本
* 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
**/ **/
public void setTotalPlanOuserWorkload(BigDecimal totalPlanOuserWorkload) { public void setTotalPlanOuserWorkload(BigDecimal totalPlanOuserWorkload) {
this.totalPlanOuserWorkload = totalPlanOuserWorkload; this.totalPlanOuserWorkload = totalPlanOuserWorkload;
@ -511,11 +526,59 @@ public class XmProjectStateHis implements java.io.Serializable {
this.productCnt = productCnt; this.productCnt = productCnt;
} }
/** /**
* 需求数
* 故事数
**/ **/
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;
}
/**
* 最早开始日期
**/
public void setMinStartTime(Date minStartTime) {
this.minStartTime = minStartTime;
}
/**
* 最晚结束时间
**/
public void setMaxEndTime(Date maxEndTime) {
this.maxEndTime = maxEndTime;
}
/** /**
* 项目编号 * 项目编号
@ -559,12 +622,6 @@ public class XmProjectStateHis implements java.io.Serializable {
public String getProjectName() { public String getProjectName() {
return this.projectName; return this.projectName;
} }
/**
* 主键
**/
public String getId() {
return this.id;
}
/** /**
* 总参与人数 * 总参与人数
**/ **/
@ -608,13 +665,13 @@ public class XmProjectStateHis implements java.io.Serializable {
return this.totalCompleteTaskCnt; return this.totalCompleteTaskCnt;
} }
/** /**
* 项目计划数
* 项目阶段计划数
**/ **/
public Integer getTotalPhaseCnt() { public Integer getTotalPhaseCnt() {
return this.totalPhaseCnt; return this.totalPhaseCnt;
} }
/** /**
* 项目计划已完成数
* 项目阶段计划已完成数
**/ **/
public Integer getTotalCompletePhaseCnt() { public Integer getTotalCompletePhaseCnt() {
return this.totalCompletePhaseCnt; return this.totalCompletePhaseCnt;
@ -728,7 +785,7 @@ public class XmProjectStateHis 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;
@ -760,41 +817,41 @@ public class XmProjectStateHis implements java.io.Serializable {
/** /**
* 外购任务数，来自任务表 * 外购任务数，来自任务表
**/ **/
public Integer getTotalTaskOutCnt() {
public BigDecimal getTotalTaskOutCnt() {
return this.totalTaskOutCnt; return this.totalTaskOutCnt;
} }
/** /**
* 待付款笔数 * 待付款笔数
**/ **/
public Integer getTotalNeedPayCnt() {
public BigDecimal getTotalNeedPayCnt() {
return this.totalNeedPayCnt; return this.totalNeedPayCnt;
} }
/** /**
* 完成付款总比数 * 完成付款总比数
**/ **/
public Integer getTotalFinishPayCnt() {
public BigDecimal getTotalFinishPayCnt() {
return this.totalFinishPayCnt; return this.totalFinishPayCnt;
} }
/** /**
* 已付款总人数 * 已付款总人数
**/ **/
public Integer getTotalFinishPayUserCnt() {
public BigDecimal getTotalFinishPayUserCnt() {
return this.totalFinishPayUserCnt; return this.totalFinishPayUserCnt;
} }
/** /**
* 待付款总人数 * 待付款总人数
**/ **/
public Integer getTotalNeedPayUserCnt() {
public BigDecimal getTotalNeedPayUserCnt() {
return this.totalNeedPayUserCnt; return this.totalNeedPayUserCnt;
} }
/** /**
* 内部人力总工作量-应该大于或等于计划内部人力总成本
* 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
**/ **/
public BigDecimal getTotalPlanIuserWorkload() { public BigDecimal getTotalPlanIuserWorkload() {
return this.totalPlanIuserWorkload; return this.totalPlanIuserWorkload;
} }
/** /**
* 外购人力总工作量-应该大于或等于计划外购人力总成本
* 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
**/ **/
public BigDecimal getTotalPlanOuserWorkload() { public BigDecimal getTotalPlanOuserWorkload() {
return this.totalPlanOuserWorkload; return this.totalPlanOuserWorkload;
@ -836,10 +893,58 @@ public class XmProjectStateHis implements java.io.Serializable {
return this.productCnt; return this.productCnt;
} }
/** /**
* 需求数
* 故事数
**/ **/
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;
}
/**
* 最早开始日期
**/
public Date getMinStartTime() {
return this.minStartTime;
}
/**
* 最晚结束时间
**/
public Date getMaxEndTime() {
return this.maxEndTime;
}
} }

16
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml
View File

@ -126,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},#{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}
#{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},#{minStartTime},#{maxEndTime}
) )
</insert> </insert>
@ -189,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_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
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,min_start_time,max_end_time
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -253,6 +253,8 @@
<if test="toStartTaskCnt != null and toStartTaskCnt != ''"> and res.to_start_task_cnt = #{toStartTaskCnt} </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="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> <if test="toStartMenuCnt != null and toStartMenuCnt != ''"> and res.to_start_menu_cnt = #{toStartMenuCnt} </if>
<if test="minStartTime != null"> and date_format(res.min_start_time,'%Y-%m-%d') = date_format(#{minStartTime},'%Y-%m-%d') </if>
<if test="maxEndTime != null"> and date_format(res.max_end_time,'%Y-%m-%d') = date_format(#{maxEndTime},'%Y-%m-%d') </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -313,7 +315,9 @@
exec_task_cnt = #{execTaskCnt}, exec_task_cnt = #{execTaskCnt},
to_start_task_cnt = #{toStartTaskCnt}, to_start_task_cnt = #{toStartTaskCnt},
exec_menu_cnt = #{execMenuCnt}, exec_menu_cnt = #{execMenuCnt},
to_start_menu_cnt = #{toStartMenuCnt}
to_start_menu_cnt = #{toStartMenuCnt},
min_start_time = #{minStartTime},
max_end_time = #{maxEndTime}
</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>
@ -374,6 +378,8 @@
<if test="toStartTaskCnt != null and toStartTaskCnt != ''"> to_start_task_cnt = #{toStartTaskCnt}, </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="execMenuCnt != null and execMenuCnt != ''"> exec_menu_cnt = #{execMenuCnt}, </if>
<if test="toStartMenuCnt != null and toStartMenuCnt != ''"> to_start_menu_cnt = #{toStartMenuCnt}, </if> <if test="toStartMenuCnt != null and toStartMenuCnt != ''"> to_start_menu_cnt = #{toStartMenuCnt}, </if>
<if test="minStartTime != null"> min_start_time = #{minStartTime}, </if>
<if test="maxEndTime != null"> max_end_time = #{maxEndTime}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -434,6 +440,8 @@
exec_task_cnt = #{item.execTaskCnt}, exec_task_cnt = #{item.execTaskCnt},
to_start_task_cnt = #{item.toStartTaskCnt}, to_start_task_cnt = #{item.toStartTaskCnt},
exec_menu_cnt = #{item.execMenuCnt}, exec_menu_cnt = #{item.execMenuCnt},
to_start_menu_cnt = #{item.toStartMenuCnt}
to_start_menu_cnt = #{item.toStartMenuCnt},
min_start_time = #{item.minStartTime},
max_end_time = #{item.maxEndTime}
</sql> </sql>
</mapper> </mapper>

20
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationStateMapper.xml
View File

@ -70,7 +70,7 @@
insert into xm_iteration_state( insert into xm_iteration_state(
<include refid="columns"/> <include refid="columns"/>
) values ( ) values (
#{distBudgetCost},#{distBudgetWorkload},#{actCost},#{actWorkload},#{actStaffNum},#{finishRate},#{testCases},#{execCases},#{designCases},#{finishCases},#{projectCnt},#{productCnt},#{menuCnt},#{taskCnt},#{finishTaskCnt},#{calcTime},#{iterationName},#{budgetCost},#{budgetWorkload},#{iterationId},#{bizDate},#{closedBugCnt},#{resolvedBugCnt},#{activeBugCnt},#{confirmedBugCnt},#{bugCnt}
#{distBudgetCost},#{distBudgetWorkload},#{actCost},#{actWorkload},#{actStaffNum},#{finishRate},#{testCases},#{execCases},#{designCases},#{finishCases},#{projectCnt},#{productCnt},#{menuCnt},#{taskCnt},#{finishTaskCnt},#{calcTime},#{iterationName},#{budgetCost},#{budgetWorkload},#{iterationId},#{bizDate},#{closedBugCnt},#{resolvedBugCnt},#{activeBugCnt},#{confirmedBugCnt},#{bugCnt},#{estimateWorkload},#{minStartTime},#{maxEndTime}
) )
</insert> </insert>
@ -133,7 +133,7 @@
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <sql id="columns">
dist_budget_cost,dist_budget_workload,act_cost,act_workload,act_staff_num,finish_rate,test_cases,exec_cases,design_cases,finish_cases,project_cnt,product_cnt,menu_cnt,task_cnt,finish_task_cnt,calc_time,iteration_name,budget_cost,budget_workload,iteration_id,biz_date,closed_bug_cnt,resolved_bug_cnt,active_bug_cnt,confirmed_bug_cnt,bug_cnt
dist_budget_cost,dist_budget_workload,act_cost,act_workload,act_staff_num,finish_rate,test_cases,exec_cases,design_cases,finish_cases,project_cnt,product_cnt,menu_cnt,task_cnt,finish_task_cnt,calc_time,iteration_name,budget_cost,budget_workload,iteration_id,biz_date,closed_bug_cnt,resolved_bug_cnt,active_bug_cnt,confirmed_bug_cnt,bug_cnt,estimate_workload,min_start_time,max_end_time
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -164,6 +164,9 @@
<if test="activeBugCnt != null and activeBugCnt != ''"> and res.active_bug_cnt = #{activeBugCnt} </if> <if test="activeBugCnt != null and activeBugCnt != ''"> and res.active_bug_cnt = #{activeBugCnt} </if>
<if test="confirmedBugCnt != null and confirmedBugCnt != ''"> and res.confirmed_bug_cnt = #{confirmedBugCnt} </if> <if test="confirmedBugCnt != null and confirmedBugCnt != ''"> and res.confirmed_bug_cnt = #{confirmedBugCnt} </if>
<if test="bugCnt != null and bugCnt != ''"> and res.bug_cnt = #{bugCnt} </if> <if test="bugCnt != null and bugCnt != ''"> and res.bug_cnt = #{bugCnt} </if>
<if test="estimateWorkload != null and estimateWorkload != ''"> and res.estimate_workload = #{estimateWorkload} </if>
<if test="minStartTime != null"> and date_format(res.min_start_time,'%Y-%m-%d') = date_format(#{minStartTime},'%Y-%m-%d') </if>
<if test="maxEndTime != null"> and date_format(res.max_end_time,'%Y-%m-%d') = date_format(#{maxEndTime},'%Y-%m-%d') </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -191,7 +194,10 @@
resolved_bug_cnt = #{resolvedBugCnt}, resolved_bug_cnt = #{resolvedBugCnt},
active_bug_cnt = #{activeBugCnt}, active_bug_cnt = #{activeBugCnt},
confirmed_bug_cnt = #{confirmedBugCnt}, confirmed_bug_cnt = #{confirmedBugCnt},
bug_cnt = #{bugCnt}
bug_cnt = #{bugCnt},
estimate_workload = #{estimateWorkload},
min_start_time = #{minStartTime},
max_end_time = #{maxEndTime}
</sql> </sql>
<sql id="someFieldSet"> <sql id="someFieldSet">
<if test="distBudgetCost != null and distBudgetCost != ''"> dist_budget_cost = #{distBudgetCost}, </if> <if test="distBudgetCost != null and distBudgetCost != ''"> dist_budget_cost = #{distBudgetCost}, </if>
@ -219,6 +225,9 @@
<if test="activeBugCnt != null and activeBugCnt != ''"> active_bug_cnt = #{activeBugCnt}, </if> <if test="activeBugCnt != null and activeBugCnt != ''"> active_bug_cnt = #{activeBugCnt}, </if>
<if test="confirmedBugCnt != null and confirmedBugCnt != ''"> confirmed_bug_cnt = #{confirmedBugCnt}, </if> <if test="confirmedBugCnt != null and confirmedBugCnt != ''"> confirmed_bug_cnt = #{confirmedBugCnt}, </if>
<if test="bugCnt != null and bugCnt != ''"> bug_cnt = #{bugCnt}, </if> <if test="bugCnt != null and bugCnt != ''"> bug_cnt = #{bugCnt}, </if>
<if test="estimateWorkload != null and estimateWorkload != ''"> estimate_workload = #{estimateWorkload}, </if>
<if test="minStartTime != null"> min_start_time = #{minStartTime}, </if>
<if test="maxEndTime != null"> max_end_time = #{maxEndTime}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -246,6 +255,9 @@
resolved_bug_cnt = #{item.resolvedBugCnt}, resolved_bug_cnt = #{item.resolvedBugCnt},
active_bug_cnt = #{item.activeBugCnt}, active_bug_cnt = #{item.activeBugCnt},
confirmed_bug_cnt = #{item.confirmedBugCnt}, confirmed_bug_cnt = #{item.confirmedBugCnt},
bug_cnt = #{item.bugCnt}
bug_cnt = #{item.bugCnt},
estimate_workload = #{item.estimateWorkload},
min_start_time = #{item.minStartTime},
max_end_time = #{item.maxEndTime}
</sql> </sql>
</mapper> </mapper>

16
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductStateMapper.xml
View File

@ -70,7 +70,7 @@
insert into xm_product_state( insert into xm_product_state(
<include refid="columns"/> <include refid="columns"/>
) values ( ) values (
#{planStartTime},#{planEndTime},#{actStartTime},#{actEndTime},#{planWorkload},#{actWorkload},#{planCostAmount},#{actCostAmount},#{finishRate},#{demandRate},#{designRate},#{devRate},#{uatRate},#{sitRate},#{ctime},#{ltime},#{cuserid},#{cusername},#{calcTime},#{planWorkhours},#{planWorkerCnt},#{closedBugs},#{activeBugs},#{confirmedBugs},#{resolvedBugs},#{productId},#{productName},#{testCases},#{execCases},#{designCases},#{finishCases},#{projectCnt},#{iterationCnt},#{taskCnt},#{finishTaskCnt},#{bizDate},#{branchId},#{bugCnt},#{menuCnt}
#{planStartTime},#{planEndTime},#{actStartTime},#{actEndTime},#{planWorkload},#{actWorkload},#{planCostAmount},#{actCostAmount},#{finishRate},#{demandRate},#{designRate},#{devRate},#{uatRate},#{sitRate},#{ctime},#{ltime},#{cuserid},#{cusername},#{calcTime},#{planWorkhours},#{planWorkerCnt},#{closedBugs},#{activeBugs},#{confirmedBugs},#{resolvedBugs},#{productId},#{productName},#{testCases},#{execCases},#{designCases},#{finishCases},#{projectCnt},#{iterationCnt},#{taskCnt},#{finishTaskCnt},#{bizDate},#{branchId},#{bugCnt},#{menuCnt},#{menuFinishCnt},#{estimateWorkload}
) )
</insert> </insert>
@ -133,7 +133,7 @@
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <sql id="columns">
plan_start_time,plan_end_time,act_start_time,act_end_time,plan_workload,act_workload,plan_cost_amount,act_cost_amount,finish_rate,demand_rate,design_rate,dev_rate,uat_rate,sit_rate,ctime,ltime,cuserid,cusername,calc_time,plan_workhours,plan_worker_cnt,closed_bugs,active_bugs,confirmed_bugs,resolved_bugs,product_id,product_name,test_cases,exec_cases,design_cases,finish_cases,project_cnt,iteration_cnt,task_cnt,finish_task_cnt,biz_date,branch_id,bug_cnt,menu_cnt
plan_start_time,plan_end_time,act_start_time,act_end_time,plan_workload,act_workload,plan_cost_amount,act_cost_amount,finish_rate,demand_rate,design_rate,dev_rate,uat_rate,sit_rate,ctime,ltime,cuserid,cusername,calc_time,plan_workhours,plan_worker_cnt,closed_bugs,active_bugs,confirmed_bugs,resolved_bugs,product_id,product_name,test_cases,exec_cases,design_cases,finish_cases,project_cnt,iteration_cnt,task_cnt,finish_task_cnt,biz_date,branch_id,bug_cnt,menu_cnt,menu_finish_cnt,estimate_workload
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -177,6 +177,8 @@
<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="bugCnt != null and bugCnt != ''"> and res.bug_cnt = #{bugCnt} </if> <if test="bugCnt != null and bugCnt != ''"> and res.bug_cnt = #{bugCnt} </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="menuFinishCnt != null and menuFinishCnt != ''"> and res.menu_finish_cnt = #{menuFinishCnt} </if>
<if test="estimateWorkload != null and estimateWorkload != ''"> and res.estimate_workload = #{estimateWorkload} </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -217,7 +219,9 @@
biz_date = #{bizDate}, biz_date = #{bizDate},
branch_id = #{branchId}, branch_id = #{branchId},
bug_cnt = #{bugCnt}, bug_cnt = #{bugCnt},
menu_cnt = #{menuCnt}
menu_cnt = #{menuCnt},
menu_finish_cnt = #{menuFinishCnt},
estimate_workload = #{estimateWorkload}
</sql> </sql>
<sql id="someFieldSet"> <sql id="someFieldSet">
<if test="planStartTime != null"> plan_start_time = #{planStartTime}, </if> <if test="planStartTime != null"> plan_start_time = #{planStartTime}, </if>
@ -258,6 +262,8 @@
<if test="branchId != null and branchId != ''"> branch_id = #{branchId}, </if> <if test="branchId != null and branchId != ''"> branch_id = #{branchId}, </if>
<if test="bugCnt != null and bugCnt != ''"> bug_cnt = #{bugCnt}, </if> <if test="bugCnt != null and bugCnt != ''"> bug_cnt = #{bugCnt}, </if>
<if test="menuCnt != null and menuCnt != ''"> menu_cnt = #{menuCnt}, </if> <if test="menuCnt != null and menuCnt != ''"> menu_cnt = #{menuCnt}, </if>
<if test="menuFinishCnt != null and menuFinishCnt != ''"> menu_finish_cnt = #{menuFinishCnt}, </if>
<if test="estimateWorkload != null and estimateWorkload != ''"> estimate_workload = #{estimateWorkload}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -298,6 +304,8 @@
biz_date = #{item.bizDate}, biz_date = #{item.bizDate},
branch_id = #{item.branchId}, branch_id = #{item.branchId},
bug_cnt = #{item.bugCnt}, bug_cnt = #{item.bugCnt},
menu_cnt = #{item.menuCnt}
menu_cnt = #{item.menuCnt},
menu_finish_cnt = #{item.menuFinishCnt},
estimate_workload = #{item.estimateWorkload}
</sql> </sql>
</mapper> </mapper>

123
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateHisMapper.xml
View File

@ -3,11 +3,18 @@
<mapper namespace="com.xm.core.entity.XmProjectStateHis"> <mapper namespace="com.xm.core.entity.XmProjectStateHis">
<!--开始 自定sql函数区域 -->
<!--请在此区域添加自定义函数-->
<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 -->
<sql id="whereForMap">
<if test=" pkList != null"> and (res.project_id, res.biz_date) in
<foreach collection="pkList" item="item" index="index" open="(" separator="," close=")" >
( #{item.projectId}, #{item.bizDate})
</foreach>
</if>
<if test="key != null and key !='' "> </if>
</sql>
<!--结束 自定义sql函数区域--> <!--结束 自定义sql函数区域-->
@ -15,15 +22,9 @@
<!-- 通过条件查询获取数据列表 返回list<map> --> <!-- 通过条件查询获取数据列表 返回list<map> -->
<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap"> <select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
select * from xm_project_state_his res select * from xm_project_state_his 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>
@ -39,14 +40,22 @@
<select id="selectOneObject" parameterType="com.xm.core.entity.XmProjectStateHis" resultType="com.xm.core.entity.XmProjectStateHis"> <select id="selectOneObject" parameterType="com.xm.core.entity.XmProjectStateHis" resultType="com.xm.core.entity.XmProjectStateHis">
select * from xm_project_state_his res select * from xm_project_state_his res
where where
res.id = #{id}
res.project_id = #{projectId}
and res.biz_date = #{bizDate}
</select> </select>
<select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmProjectStateHis">
select * from xm_project_state_his res
where (res.project_id, res.biz_date) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item.projectId}, #{item.bizDate})
</foreach>
</select>
<!-- 通过主键查询获取数据对象 返回map--> <!-- 通过主键查询获取数据对象 返回map-->
<select id="selectOneMap" parameterType="HashMap" resultType="HashMap"> <select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
select * from xm_project_state_his res select * from xm_project_state_his res
where where
res.id = #{id}
res.project_id = #{projectId}
and res.biz_date = #{bizDate}
</select> </select>
<!-- 获取数据条目 返回long --> <!-- 获取数据条目 返回long -->
<select id="countByWhere" parameterType="com.xm.core.entity.XmProjectStateHis" resultType="long"> <select id="countByWhere" parameterType="com.xm.core.entity.XmProjectStateHis" resultType="long">
@ -55,12 +64,12 @@
<include refid="where"/> <include refid="where"/>
</where> </where>
</select> </select>
<!-- 新增一条记录 主键id,-->
<insert id="insert" parameterType="com.xm.core.entity.XmProjectStateHis" useGeneratedKeys="false" keyProperty="id">
<!-- 新增一条记录 主键project_id,biz_date,-->
<insert id="insert" parameterType="com.xm.core.entity.XmProjectStateHis" useGeneratedKeys="false" >
insert into xm_project_state_his( insert into xm_project_state_his(
<include refid="columns"/> <include refid="columns"/>
) values ( ) values (
#{projectId},#{bizDate},#{totalFileCnt},#{totalBugCnt},#{totalTaskCnt},#{totalBudgetNouserAmount},#{projectName},#{id},#{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}
#{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},#{minStartTime},#{maxEndTime}
) )
</insert> </insert>
@ -74,26 +83,26 @@
<!-- 按主键删除一条记录--> <!-- 按主键删除一条记录-->
<delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectStateHis"> <delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectStateHis">
delete from xm_project_state_his
where id = #{id}
delete from xm_project_state_his
where project_id = #{projectId} and biz_date = #{bizDate}
</delete> </delete>
<!-- 根据条件修改若干条记录 --> <!-- 根据条件修改若干条记录 -->
<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectStateHis"> <update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectStateHis">
update xm_project_state_his
update xm_project_state_his
<set> <set>
<include refid="someFieldSet"/> <include refid="someFieldSet"/>
</set> </set>
where id = #{id}
where project_id = #{projectId} and biz_date = #{bizDate}
</update> </update>
<!-- 根据主键修改一条记录 --> <!-- 根据主键修改一条记录 -->
<update id="updateByPk" parameterType="com.xm.core.entity.XmProjectStateHis"> <update id="updateByPk" parameterType="com.xm.core.entity.XmProjectStateHis">
update xm_project_state_his
update xm_project_state_his
<set> <set>
<include refid="set"/> <include refid="set"/>
</set> </set>
where id = #{id}
where project_id = #{projectId} and biz_date = #{bizDate}
</update> </update>
<!-- 批量新增 批量插入 借用insert 循环插入实现 <!-- 批量新增 批量插入 借用insert 循环插入实现
@ -104,27 +113,28 @@
<!-- 批量更新 --> <!-- 批量更新 -->
<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_state_his
update xm_project_state_his
set set
<include refid="batchSet"/> <include refid="batchSet"/>
where id = #{item.id}
where project_id = #{item.projectId} and biz_date = #{item.bizDate}
</foreach> </foreach>
</update> </update>
<!-- 批量删除 --> <!-- 批量删除 -->
<delete id="batchDelete" parameterType="List"> <delete id="batchDelete" parameterType="List">
delete from xm_project_state_his
where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
#{item.id }
</foreach>
delete from xm_project_state_his
where
(project_id, biz_date) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item.projectId}, #{item.bizDate} )
</foreach>
</delete> </delete>
<!--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,id,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_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,min_start_time,max_end_time
</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>
@ -134,9 +144,8 @@
<if test="totalTaskCnt != null and totalTaskCnt != ''"> and res.total_task_cnt = #{totalTaskCnt} </if> <if test="totalTaskCnt != null and totalTaskCnt != ''"> and res.total_task_cnt = #{totalTaskCnt} </if>
<if test="totalBudgetNouserAmount != null and totalBudgetNouserAmount != ''"> and res.total_budget_nouser_amount = #{totalBudgetNouserAmount} </if> <if test="totalBudgetNouserAmount != null and totalBudgetNouserAmount != ''"> and res.total_budget_nouser_amount = #{totalBudgetNouserAmount} </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="id != null and id != ''"> and res.id = #{id} </if>
<if test="totalStaffCnt != null and totalStaffCnt != ''"> and res.total_staff_cnt = #{totalStaffCnt} </if> <if test="totalStaffCnt != null and totalStaffCnt != ''"> and res.total_staff_cnt = #{totalStaffCnt} </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="calcStatus != null and calcStatus != ''"> and res.calc_status = #{calcStatus} </if> <if test="calcStatus != null and calcStatus != ''"> and res.calc_status = #{calcStatus} </if>
<if test="totalCostNouserAmount != null and totalCostNouserAmount != ''"> and res.total_cost_nouser_amount = #{totalCostNouserAmount} </if> <if test="totalCostNouserAmount != null and totalCostNouserAmount != ''"> and res.total_cost_nouser_amount = #{totalCostNouserAmount} </if>
<if test="totalClosedBugCnt != null and totalClosedBugCnt != ''"> and res.total_closed_bug_cnt = #{totalClosedBugCnt} </if> <if test="totalClosedBugCnt != null and totalClosedBugCnt != ''"> and res.total_closed_bug_cnt = #{totalClosedBugCnt} </if>
@ -181,11 +190,17 @@
<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>
<if test="minStartTime != null"> and date_format(res.min_start_time,'%Y-%m-%d') = date_format(#{minStartTime},'%Y-%m-%d') </if>
<if test="maxEndTime != null"> and date_format(res.max_end_time,'%Y-%m-%d') = date_format(#{maxEndTime},'%Y-%m-%d') </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
project_id = #{projectId},
biz_date = #{bizDate},
total_file_cnt = #{totalFileCnt}, total_file_cnt = #{totalFileCnt},
total_bug_cnt = #{totalBugCnt}, total_bug_cnt = #{totalBugCnt},
total_task_cnt = #{totalTaskCnt}, total_task_cnt = #{totalTaskCnt},
@ -236,11 +251,17 @@
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},
min_start_time = #{minStartTime},
max_end_time = #{maxEndTime}
</sql> </sql>
<sql id="someFieldSet"> <sql id="someFieldSet">
<if test="projectId != null and projectId != ''"> project_id = #{projectId}, </if>
<if test="bizDate != null and bizDate != ''"> biz_date = #{bizDate}, </if>
<if test="totalFileCnt != null and totalFileCnt != ''"> total_file_cnt = #{totalFileCnt}, </if> <if test="totalFileCnt != null and totalFileCnt != ''"> total_file_cnt = #{totalFileCnt}, </if>
<if test="totalBugCnt != null and totalBugCnt != ''"> total_bug_cnt = #{totalBugCnt}, </if> <if test="totalBugCnt != null and totalBugCnt != ''"> total_bug_cnt = #{totalBugCnt}, </if>
<if test="totalTaskCnt != null and totalTaskCnt != ''"> total_task_cnt = #{totalTaskCnt}, </if> <if test="totalTaskCnt != null and totalTaskCnt != ''"> total_task_cnt = #{totalTaskCnt}, </if>
@ -292,11 +313,17 @@
<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>
<if test="minStartTime != null"> min_start_time = #{minStartTime}, </if>
<if test="maxEndTime != null"> max_end_time = #{maxEndTime}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
project_id = #{item.projectId},
biz_date = #{item.bizDate},
total_file_cnt = #{item.totalFileCnt}, total_file_cnt = #{item.totalFileCnt},
total_bug_cnt = #{item.totalBugCnt}, total_bug_cnt = #{item.totalBugCnt},
total_task_cnt = #{item.totalTaskCnt}, total_task_cnt = #{item.totalTaskCnt},
@ -347,6 +374,14 @@
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},
min_start_time = #{item.minStartTime},
max_end_time = #{item.maxEndTime}
</sql> </sql>
</mapper> </mapper>

16
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateMapper.xml
View File

@ -73,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},#{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}
#{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},#{minStartTime},#{maxEndTime}
) )
</insert> </insert>
@ -136,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_iuser_amount,total_plan_workload,total_risk_cnt,total_complete_risk_cnt,branch_id,branch_name,total_budget_ouser_amount,total_complete_workload,total_cost_iuser_amount,total_cost_ouser_amount,total_progress,total_active_bug_cnt,total_confirmed_bug_cnt,project_status,total_act_workload,total_act_out_workload,total_act_inner_workload,total_task_budget_cost_at,total_task_out_cnt,total_need_pay_cnt,total_finish_pay_cnt,total_finish_pay_user_cnt,total_need_pay_user_cnt,total_plan_iuser_workload,total_plan_ouser_workload,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,menu_cnt,finish_menu_cnt,estimate_workload,exec_task_cnt,to_start_task_cnt,exec_menu_cnt,to_start_menu_cnt
project_id,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,min_start_time,max_end_time
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -200,6 +200,8 @@
<if test="toStartTaskCnt != null and toStartTaskCnt != ''"> and res.to_start_task_cnt = #{toStartTaskCnt} </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="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> <if test="toStartMenuCnt != null and toStartMenuCnt != ''"> and res.to_start_menu_cnt = #{toStartMenuCnt} </if>
<if test="minStartTime != null"> and date_format(res.min_start_time,'%Y-%m-%d') = date_format(#{minStartTime},'%Y-%m-%d') </if>
<if test="maxEndTime != null"> and date_format(res.max_end_time,'%Y-%m-%d') = date_format(#{maxEndTime},'%Y-%m-%d') </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -260,7 +262,9 @@
exec_task_cnt = #{execTaskCnt}, exec_task_cnt = #{execTaskCnt},
to_start_task_cnt = #{toStartTaskCnt}, to_start_task_cnt = #{toStartTaskCnt},
exec_menu_cnt = #{execMenuCnt}, exec_menu_cnt = #{execMenuCnt},
to_start_menu_cnt = #{toStartMenuCnt}
to_start_menu_cnt = #{toStartMenuCnt},
min_start_time = #{minStartTime},
max_end_time = #{maxEndTime}
</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>
@ -321,6 +325,8 @@
<if test="toStartTaskCnt != null and toStartTaskCnt != ''"> to_start_task_cnt = #{toStartTaskCnt}, </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="execMenuCnt != null and execMenuCnt != ''"> exec_menu_cnt = #{execMenuCnt}, </if>
<if test="toStartMenuCnt != null and toStartMenuCnt != ''"> to_start_menu_cnt = #{toStartMenuCnt}, </if> <if test="toStartMenuCnt != null and toStartMenuCnt != ''"> to_start_menu_cnt = #{toStartMenuCnt}, </if>
<if test="minStartTime != null"> min_start_time = #{minStartTime}, </if>
<if test="maxEndTime != null"> max_end_time = #{maxEndTime}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -381,6 +387,8 @@
exec_task_cnt = #{item.execTaskCnt}, exec_task_cnt = #{item.execTaskCnt},
to_start_task_cnt = #{item.toStartTaskCnt}, to_start_task_cnt = #{item.toStartTaskCnt},
exec_menu_cnt = #{item.execMenuCnt}, exec_menu_cnt = #{item.execMenuCnt},
to_start_menu_cnt = #{item.toStartMenuCnt}
to_start_menu_cnt = #{item.toStartMenuCnt},
min_start_time = #{item.minStartTime},
max_end_time = #{item.maxEndTime}
</sql> </sql>
</mapper> </mapper>
Write Preview
Loading…
Cancel
Save