diff --git a/xm-core/src/main/java/com/xm/core/entity/XmBranchState.java b/xm-core/src/main/java/com/xm/core/entity/XmBranchState.java
index 69283ec6..7040f279 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmBranchState.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmBranchState.java
@@ -2,15 +2,15 @@ package  com.xm.core.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
 import java.util.Date;
+import java.math.BigDecimal;
 
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <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,minStartTime,maxEndTime;<br>
+ *	projectCnt,bizDate,fileCnt,calcTime,calcStatus,phaseCnt,phaseFinishCnt,needPayAt,finishPayAt,needColAt,finishColAt,riskCnt,riskFinishCnt,branchId,branchName,budgetNouserAt,budgetOuserAt,budgetIuserAt,actUserAt,actIuserAt,actOuserAt,actNouserAt,finishRate,budgetWorkload,budgetOuserWorkload,budgetIuserWorkload,estimateWorkload,actWorkload,actOuserWorkload,actIuserWorkload,needPayCnt,finishPayCnt,finishPayUserCnt,needPayUserCnt,testCases,execCases,designCases,finishCases,iterationCnt,productCnt,minStartTime,maxEndTime,menuCnt,menuFinishCnt,menuExecCnt,menuUnstartCnt,menuCloseCnt,taskCnt,taskUnstartCnt,taskExecCnt,taskFinishCnt,taskSetCnt,taskOutCnt,taskCloseCnt,bugCnt,closedBugs,resolvedBugs,activeBugs,confirmedBugs,planWorkhours,planWorkerCnt,actWorkerCnt,budgetAt,actAt;<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,min_start_time,max_end_time;<br>
+ *	project_cnt,biz_date,file_cnt,calc_time,calc_status,phase_cnt,phase_finish_cnt,need_pay_at,finish_pay_at,need_col_at,finish_col_at,risk_cnt,risk_finish_cnt,branch_id,branch_name,budget_nouser_at,budget_ouser_at,budget_iuser_at,act_user_at,act_iuser_at,act_ouser_at,act_nouser_at,finish_rate,budget_workload,budget_ouser_workload,budget_iuser_workload,estimate_workload,act_workload,act_ouser_workload,act_iuser_workload,need_pay_cnt,finish_pay_cnt,finish_pay_user_cnt,need_pay_user_cnt,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,min_start_time,max_end_time,menu_cnt,menu_finish_cnt,menu_exec_cnt,menu_unstart_cnt,menu_close_cnt,task_cnt,task_unstart_cnt,task_exec_cnt,task_finish_cnt,task_set_cnt,task_out_cnt,task_close_cnt,bug_cnt,closed_bugs,resolved_bugs,active_bugs,confirmed_bugs,plan_workhours,plan_worker_cnt,act_worker_cnt,budget_at,act_at;<br>
  * 当前主键(包括多主键):<br>
  *	branch_id;<br>
  */
@@ -23,23 +23,14 @@ public class XmBranchState  implements java.io.Serializable {
 	String branchId;
   	
 	
+	@ApiModelProperty(notes="项目数",allowEmptyValue=true,example="",allowableValues="")
+	Integer projectCnt;
+	
 	@ApiModelProperty(notes="统计日期yyyy-mm-dd类型",allowEmptyValue=true,example="",allowableValues="")
 	String bizDate;
 	
 	@ApiModelProperty(notes="文件数据",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalFileCnt;
-	
-	@ApiModelProperty(notes="bug数目",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalBugCnt;
-	
-	@ApiModelProperty(notes="任务数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalTaskCnt;
-	
-	@ApiModelProperty(notes="项目总非人力预算-来自项目表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalBudgetNouserAmount;
-	
-	@ApiModelProperty(notes="总参与人数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalStaffCnt;
+	Integer fileCnt;
 	
 	@ApiModelProperty(notes="统计执行日期",allowEmptyValue=true,example="",allowableValues="")
 	Date calcTime;
@@ -47,110 +38,89 @@ public class XmBranchState  implements java.io.Serializable {
 	@ApiModelProperty(notes="0-暂时的1稳定的，暂时的可以被覆盖，稳定的不允许覆盖",allowEmptyValue=true,example="",allowableValues="")
 	String calcStatus;
 	
-	@ApiModelProperty(notes="项目总非人力成本",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalCostNouserAmount;
-	
-	@ApiModelProperty(notes="已关闭bug总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalClosedBugCnt;
-	
-	@ApiModelProperty(notes="已解决bug总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalResolvedBugCnt;
-	
-	@ApiModelProperty(notes="已完成任务总数-来自任务表",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalCompleteTaskCnt;
-	
 	@ApiModelProperty(notes="项目阶段计划数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalPhaseCnt;
+	Integer phaseCnt;
 	
 	@ApiModelProperty(notes="项目阶段计划已完成数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalCompletePhaseCnt;
+	Integer phaseFinishCnt;
 	
 	@ApiModelProperty(notes="待付款总金额",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalNeedPayAmount;
+	BigDecimal needPayAt;
 	
 	@ApiModelProperty(notes="已付款总金额",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalFinishPayAmount;
+	BigDecimal finishPayAt;
 	
 	@ApiModelProperty(notes="待收款总金额",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalNeedColAmount;
+	BigDecimal needColAt;
 	
 	@ApiModelProperty(notes="已收款总金额",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalFinishColAmount;
-	
-	@ApiModelProperty(notes="项目总人力成本",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalCostUserAmount;
-	
-	@ApiModelProperty(notes="项目总内部人力预算-来自项目表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalBudgetIuserAmount;
-	
-	@ApiModelProperty(notes="项目总预算工作量-来自项目表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalPlanWorkload;
+	BigDecimal finishColAt;
 	
 	@ApiModelProperty(notes="项目风险总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalRiskCnt;
+	Integer riskCnt;
 	
 	@ApiModelProperty(notes="已完成风险总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalCompleteRiskCnt;
+	Integer riskFinishCnt;
 	
 	@ApiModelProperty(notes="机构名称",allowEmptyValue=true,example="",allowableValues="")
 	String branchName;
 	
-	@ApiModelProperty(notes="项目总外购人力预算-来自项目表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalBudgetOuserAmount;
+	@ApiModelProperty(notes="项目总非人力预算-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetNouserAt;
 	
-	@ApiModelProperty(notes="已完成工作量-来自计划中实际完成工作量",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalCompleteWorkload;
+	@ApiModelProperty(notes="项目总外购人力预算-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetOuserAt;
+	
+	@ApiModelProperty(notes="项目总内部人力预算-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetIuserAt;
+	
+	@ApiModelProperty(notes="项目总人力成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actUserAt;
 	
 	@ApiModelProperty(notes="项目总内部人力成本金额",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalCostIuserAmount;
+	BigDecimal actIuserAt;
 	
 	@ApiModelProperty(notes="项目总外购人力成本金额",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalCostOuserAmount;
+	BigDecimal actOuserAt;
+	
+	@ApiModelProperty(notes="项目总非人力成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actNouserAt;
 	
 	@ApiModelProperty(notes="项目进度0~100之间，来自任务表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalProgress;
+	BigDecimal finishRate;
 	
-	@ApiModelProperty(notes="激活的bug总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalActiveBugCnt;
+	@ApiModelProperty(notes="项目总预算工作量-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetWorkload;
 	
-	@ApiModelProperty(notes="已解决bug总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalConfirmedBugCnt;
+	@ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetOuserWorkload;
 	
-	@ApiModelProperty(notes="项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停",allowEmptyValue=true,example="",allowableValues="")
-	String projectStatus;
+	@ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetIuserWorkload;
 	
-	@ApiModelProperty(notes="实际总工作量，来自任务表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalActWorkload;
+	@ApiModelProperty(notes="预估工时=计划结束时间在计算当日前完成的任务的预算工时总和",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal estimateWorkload;
+	
+	@ApiModelProperty(notes="已完成工作量-来自计划中实际完成工作量",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actWorkload;
 	
 	@ApiModelProperty(notes="实际外购总工作量，来自任务表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalActOutWorkload;
+	BigDecimal actOuserWorkload;
 	
 	@ApiModelProperty(notes="实际内部总工作量，来自任务表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalActInnerWorkload;
-	
-	@ApiModelProperty(notes="已经分配到任务的总预算",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalTaskBudgetCostAt;
-	
-	@ApiModelProperty(notes="外购任务数，来自任务表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalTaskOutCnt;
+	BigDecimal actIuserWorkload;
 	
 	@ApiModelProperty(notes="待付款笔数",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalNeedPayCnt;
+	BigDecimal needPayCnt;
 	
 	@ApiModelProperty(notes="完成付款总比数",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalFinishPayCnt;
+	BigDecimal finishPayCnt;
 	
 	@ApiModelProperty(notes="已付款总人数",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalFinishPayUserCnt;
+	BigDecimal finishPayUserCnt;
 	
 	@ApiModelProperty(notes="待付款总人数",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalNeedPayUserCnt;
-	
-	@ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalPlanIuserWorkload;
-	
-	@ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalPlanOuserWorkload;
+	BigDecimal needPayUserCnt;
 	
 	@ApiModelProperty(notes="测试案例总数",allowEmptyValue=true,example="",allowableValues="")
 	Integer testCases;
@@ -170,38 +140,77 @@ public class XmBranchState  implements java.io.Serializable {
 	@ApiModelProperty(notes="产品数",allowEmptyValue=true,example="",allowableValues="")
 	Integer productCnt;
 	
+	@ApiModelProperty(notes="最早开始日期",allowEmptyValue=true,example="",allowableValues="")
+	Date minStartTime;
+	
+	@ApiModelProperty(notes="最晚结束时间",allowEmptyValue=true,example="",allowableValues="")
+	Date maxEndTime;
+	
 	@ApiModelProperty(notes="故事数",allowEmptyValue=true,example="",allowableValues="")
 	Integer menuCnt;
 	
-	@ApiModelProperty(notes="项目数量",allowEmptyValue=true,example="",allowableValues="")
-	Integer projectCnt;
+	@ApiModelProperty(notes="已完成需求数，2状态需求",allowEmptyValue=true,example="",allowableValues="")
+	Integer menuFinishCnt;
 	
-	@ApiModelProperty(notes="产品总工时",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal productBudgetWorkload;
+	@ApiModelProperty(notes="执行中需求数，1状态的需求",allowEmptyValue=true,example="",allowableValues="")
+	Integer menuExecCnt;
 	
-	@ApiModelProperty(notes="产品实际完成总工作量",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal productActWorkload;
+	@ApiModelProperty(notes="未开始需求数，0状态数据",allowEmptyValue=true,example="",allowableValues="")
+	Integer menuUnstartCnt;
 	
-	@ApiModelProperty(notes="预估完成工作量",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal estimateWorkload;
+	@ApiModelProperty(notes="已关闭需求数，3状态数据",allowEmptyValue=true,example="",allowableValues="")
+	Integer menuCloseCnt;
+	
+	@ApiModelProperty(notes="任务总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskCnt;
 	
-	@ApiModelProperty(notes="执行中任务数=任务表开始日期小于当前日期，进度<100的任务",allowEmptyValue=true,example="",allowableValues="")
-	Integer execTaskCnt;
+	@ApiModelProperty(notes="待开始任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskUnstartCnt;
 	
-	@ApiModelProperty(notes="待开始的任务数=任务表中开始日期大于当前日期的任务数",allowEmptyValue=true,example="",allowableValues="")
-	Integer toStartTaskCnt;
+	@ApiModelProperty(notes="执行中任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskExecCnt;
 	
-	@ApiModelProperty(notes="执行中需求=需求表中开始日期小于小于当前日期，进度<100的需求",allowEmptyValue=true,example="",allowableValues="")
-	Integer execMenuCnt;
+	@ApiModelProperty(notes="已完成任务总数-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskFinishCnt;
 	
-	@ApiModelProperty(notes="待开始需求数=需求表中开始日期大于当前日期的需求数",allowEmptyValue=true,example="",allowableValues="")
-	Integer toStartMenuCnt;
+	@ApiModelProperty(notes="已结算任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskSetCnt;
 	
-	@ApiModelProperty(notes="最早开始日期",allowEmptyValue=true,example="",allowableValues="")
-	Date minStartTime;
+	@ApiModelProperty(notes="外购任务数，来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal taskOutCnt;
 	
-	@ApiModelProperty(notes="最晚结束时间",allowEmptyValue=true,example="",allowableValues="")
-	Date maxEndTime;
+	@ApiModelProperty(notes="已关闭任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskCloseCnt;
+	
+	@ApiModelProperty(notes="bug数目",allowEmptyValue=true,example="",allowableValues="")
+	Integer bugCnt;
+	
+	@ApiModelProperty(notes="已关闭bug总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer closedBugs;
+	
+	@ApiModelProperty(notes="已解决bug总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer resolvedBugs;
+	
+	@ApiModelProperty(notes="激活的bug总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer activeBugs;
+	
+	@ApiModelProperty(notes="已解决bug总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer confirmedBugs;
+	
+	@ApiModelProperty(notes="工期（小时）",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal planWorkhours;
+	
+	@ApiModelProperty(notes="总人数",allowEmptyValue=true,example="",allowableValues="")
+	Integer planWorkerCnt;
+	
+	@ApiModelProperty(notes="实际投入人员数",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actWorkerCnt;
+	
+	@ApiModelProperty(notes="预算金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetAt;
+	
+	@ApiModelProperty(notes="实际金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actAt;
 
 	/**机构编号**/
 	public XmBranchState(String branchId) {
@@ -212,6 +221,12 @@ public class XmBranchState  implements java.io.Serializable {
 	public XmBranchState() {
 	}
 	
+	/**
+	 * 项目数
+	 **/
+	public void setProjectCnt(Integer projectCnt) {
+		this.projectCnt = projectCnt;
+	}
 	/**
 	 * 统计日期yyyy-mm-dd类型
 	 **/
@@ -221,32 +236,8 @@ public class XmBranchState  implements java.io.Serializable {
 	/**
 	 * 文件数据
 	 **/
-	public void setTotalFileCnt(Integer totalFileCnt) {
-		this.totalFileCnt = totalFileCnt;
-	}
-	/**
-	 * bug数目
-	 **/
-	public void setTotalBugCnt(Integer totalBugCnt) {
-		this.totalBugCnt = totalBugCnt;
-	}
-	/**
-	 * 任务数
-	 **/
-	public void setTotalTaskCnt(Integer totalTaskCnt) {
-		this.totalTaskCnt = totalTaskCnt;
-	}
-	/**
-	 * 项目总非人力预算-来自项目表
-	 **/
-	public void setTotalBudgetNouserAmount(BigDecimal totalBudgetNouserAmount) {
-		this.totalBudgetNouserAmount = totalBudgetNouserAmount;
-	}
-	/**
-	 * 总参与人数
-	 **/
-	public void setTotalStaffCnt(Integer totalStaffCnt) {
-		this.totalStaffCnt = totalStaffCnt;
+	public void setFileCnt(Integer fileCnt) {
+		this.fileCnt = fileCnt;
 	}
 	/**
 	 * 统计执行日期
@@ -260,95 +251,53 @@ public class XmBranchState  implements java.io.Serializable {
 	public void setCalcStatus(String calcStatus) {
 		this.calcStatus = calcStatus;
 	}
-	/**
-	 * 项目总非人力成本
-	 **/
-	public void setTotalCostNouserAmount(BigDecimal totalCostNouserAmount) {
-		this.totalCostNouserAmount = totalCostNouserAmount;
-	}
-	/**
-	 * 已关闭bug总数
-	 **/
-	public void setTotalClosedBugCnt(Integer totalClosedBugCnt) {
-		this.totalClosedBugCnt = totalClosedBugCnt;
-	}
-	/**
-	 * 已解决bug总数
-	 **/
-	public void setTotalResolvedBugCnt(Integer totalResolvedBugCnt) {
-		this.totalResolvedBugCnt = totalResolvedBugCnt;
-	}
-	/**
-	 * 已完成任务总数-来自任务表
-	 **/
-	public void setTotalCompleteTaskCnt(Integer totalCompleteTaskCnt) {
-		this.totalCompleteTaskCnt = totalCompleteTaskCnt;
-	}
 	/**
 	 * 项目阶段计划数
 	 **/
-	public void setTotalPhaseCnt(Integer totalPhaseCnt) {
-		this.totalPhaseCnt = totalPhaseCnt;
+	public void setPhaseCnt(Integer phaseCnt) {
+		this.phaseCnt = phaseCnt;
 	}
 	/**
 	 * 项目阶段计划已完成数
 	 **/
-	public void setTotalCompletePhaseCnt(Integer totalCompletePhaseCnt) {
-		this.totalCompletePhaseCnt = totalCompletePhaseCnt;
+	public void setPhaseFinishCnt(Integer phaseFinishCnt) {
+		this.phaseFinishCnt = phaseFinishCnt;
 	}
 	/**
 	 * 待付款总金额
 	 **/
-	public void setTotalNeedPayAmount(BigDecimal totalNeedPayAmount) {
-		this.totalNeedPayAmount = totalNeedPayAmount;
+	public void setNeedPayAt(BigDecimal needPayAt) {
+		this.needPayAt = needPayAt;
 	}
 	/**
 	 * 已付款总金额
 	 **/
-	public void setTotalFinishPayAmount(BigDecimal totalFinishPayAmount) {
-		this.totalFinishPayAmount = totalFinishPayAmount;
+	public void setFinishPayAt(BigDecimal finishPayAt) {
+		this.finishPayAt = finishPayAt;
 	}
 	/**
 	 * 待收款总金额
 	 **/
-	public void setTotalNeedColAmount(BigDecimal totalNeedColAmount) {
-		this.totalNeedColAmount = totalNeedColAmount;
+	public void setNeedColAt(BigDecimal needColAt) {
+		this.needColAt = needColAt;
 	}
 	/**
 	 * 已收款总金额
 	 **/
-	public void setTotalFinishColAmount(BigDecimal totalFinishColAmount) {
-		this.totalFinishColAmount = totalFinishColAmount;
-	}
-	/**
-	 * 项目总人力成本
-	 **/
-	public void setTotalCostUserAmount(BigDecimal totalCostUserAmount) {
-		this.totalCostUserAmount = totalCostUserAmount;
-	}
-	/**
-	 * 项目总内部人力预算-来自项目表
-	 **/
-	public void setTotalBudgetIuserAmount(BigDecimal totalBudgetIuserAmount) {
-		this.totalBudgetIuserAmount = totalBudgetIuserAmount;
-	}
-	/**
-	 * 项目总预算工作量-来自项目表
-	 **/
-	public void setTotalPlanWorkload(BigDecimal totalPlanWorkload) {
-		this.totalPlanWorkload = totalPlanWorkload;
+	public void setFinishColAt(BigDecimal finishColAt) {
+		this.finishColAt = finishColAt;
 	}
 	/**
 	 * 项目风险总数
 	 **/
-	public void setTotalRiskCnt(Integer totalRiskCnt) {
-		this.totalRiskCnt = totalRiskCnt;
+	public void setRiskCnt(Integer riskCnt) {
+		this.riskCnt = riskCnt;
 	}
 	/**
 	 * 已完成风险总数
 	 **/
-	public void setTotalCompleteRiskCnt(Integer totalCompleteRiskCnt) {
-		this.totalCompleteRiskCnt = totalCompleteRiskCnt;
+	public void setRiskFinishCnt(Integer riskFinishCnt) {
+		this.riskFinishCnt = riskFinishCnt;
 	}
 	/**
 	 * 机构编号
@@ -363,118 +312,118 @@ public class XmBranchState  implements java.io.Serializable {
 		this.branchName = branchName;
 	}
 	/**
-	 * 项目总外购人力预算-来自项目表
+	 * 项目总非人力预算-来自任务表
 	 **/
-	public void setTotalBudgetOuserAmount(BigDecimal totalBudgetOuserAmount) {
-		this.totalBudgetOuserAmount = totalBudgetOuserAmount;
+	public void setBudgetNouserAt(BigDecimal budgetNouserAt) {
+		this.budgetNouserAt = budgetNouserAt;
 	}
 	/**
-	 * 已完成工作量-来自计划中实际完成工作量
+	 * 项目总外购人力预算-来自任务表
 	 **/
-	public void setTotalCompleteWorkload(BigDecimal totalCompleteWorkload) {
-		this.totalCompleteWorkload = totalCompleteWorkload;
+	public void setBudgetOuserAt(BigDecimal budgetOuserAt) {
+		this.budgetOuserAt = budgetOuserAt;
 	}
 	/**
-	 * 项目总内部人力成本金额
+	 * 项目总内部人力预算-来自任务表
 	 **/
-	public void setTotalCostIuserAmount(BigDecimal totalCostIuserAmount) {
-		this.totalCostIuserAmount = totalCostIuserAmount;
+	public void setBudgetIuserAt(BigDecimal budgetIuserAt) {
+		this.budgetIuserAt = budgetIuserAt;
 	}
 	/**
-	 * 项目总外购人力成本金额
+	 * 项目总人力成本
 	 **/
-	public void setTotalCostOuserAmount(BigDecimal totalCostOuserAmount) {
-		this.totalCostOuserAmount = totalCostOuserAmount;
+	public void setActUserAt(BigDecimal actUserAt) {
+		this.actUserAt = actUserAt;
 	}
 	/**
-	 * 项目进度0~100之间，来自任务表
+	 * 项目总内部人力成本金额
 	 **/
-	public void setTotalProgress(BigDecimal totalProgress) {
-		this.totalProgress = totalProgress;
+	public void setActIuserAt(BigDecimal actIuserAt) {
+		this.actIuserAt = actIuserAt;
 	}
 	/**
-	 * 激活的bug总数
+	 * 项目总外购人力成本金额
 	 **/
-	public void setTotalActiveBugCnt(Integer totalActiveBugCnt) {
-		this.totalActiveBugCnt = totalActiveBugCnt;
+	public void setActOuserAt(BigDecimal actOuserAt) {
+		this.actOuserAt = actOuserAt;
 	}
 	/**
-	 * 已解决bug总数
+	 * 项目总非人力成本
 	 **/
-	public void setTotalConfirmedBugCnt(Integer totalConfirmedBugCnt) {
-		this.totalConfirmedBugCnt = totalConfirmedBugCnt;
+	public void setActNouserAt(BigDecimal actNouserAt) {
+		this.actNouserAt = actNouserAt;
 	}
 	/**
-	 * 项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停
+	 * 项目进度0~100之间，来自任务表
 	 **/
-	public void setProjectStatus(String projectStatus) {
-		this.projectStatus = projectStatus;
+	public void setFinishRate(BigDecimal finishRate) {
+		this.finishRate = finishRate;
 	}
 	/**
-	 * 实际总工作量，来自任务表
+	 * 项目总预算工作量-来自任务表
 	 **/
-	public void setTotalActWorkload(BigDecimal totalActWorkload) {
-		this.totalActWorkload = totalActWorkload;
+	public void setBudgetWorkload(BigDecimal budgetWorkload) {
+		this.budgetWorkload = budgetWorkload;
 	}
 	/**
-	 * 实际外购总工作量，来自任务表
+	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
 	 **/
-	public void setTotalActOutWorkload(BigDecimal totalActOutWorkload) {
-		this.totalActOutWorkload = totalActOutWorkload;
+	public void setBudgetOuserWorkload(BigDecimal budgetOuserWorkload) {
+		this.budgetOuserWorkload = budgetOuserWorkload;
 	}
 	/**
-	 * 实际内部总工作量，来自任务表
+	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
 	 **/
-	public void setTotalActInnerWorkload(BigDecimal totalActInnerWorkload) {
-		this.totalActInnerWorkload = totalActInnerWorkload;
+	public void setBudgetIuserWorkload(BigDecimal budgetIuserWorkload) {
+		this.budgetIuserWorkload = budgetIuserWorkload;
 	}
 	/**
-	 * 已经分配到任务的总预算
+	 * 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
 	 **/
-	public void setTotalTaskBudgetCostAt(BigDecimal totalTaskBudgetCostAt) {
-		this.totalTaskBudgetCostAt = totalTaskBudgetCostAt;
+	public void setEstimateWorkload(BigDecimal estimateWorkload) {
+		this.estimateWorkload = estimateWorkload;
 	}
 	/**
-	 * 外购任务数，来自任务表
+	 * 已完成工作量-来自计划中实际完成工作量
 	 **/
-	public void setTotalTaskOutCnt(BigDecimal totalTaskOutCnt) {
-		this.totalTaskOutCnt = totalTaskOutCnt;
+	public void setActWorkload(BigDecimal actWorkload) {
+		this.actWorkload = actWorkload;
 	}
 	/**
-	 * 待付款笔数
+	 * 实际外购总工作量，来自任务表
 	 **/
-	public void setTotalNeedPayCnt(BigDecimal totalNeedPayCnt) {
-		this.totalNeedPayCnt = totalNeedPayCnt;
+	public void setActOuserWorkload(BigDecimal actOuserWorkload) {
+		this.actOuserWorkload = actOuserWorkload;
 	}
 	/**
-	 * 完成付款总比数
+	 * 实际内部总工作量，来自任务表
 	 **/
-	public void setTotalFinishPayCnt(BigDecimal totalFinishPayCnt) {
-		this.totalFinishPayCnt = totalFinishPayCnt;
+	public void setActIuserWorkload(BigDecimal actIuserWorkload) {
+		this.actIuserWorkload = actIuserWorkload;
 	}
 	/**
-	 * 已付款总人数
+	 * 待付款笔数
 	 **/
-	public void setTotalFinishPayUserCnt(BigDecimal totalFinishPayUserCnt) {
-		this.totalFinishPayUserCnt = totalFinishPayUserCnt;
+	public void setNeedPayCnt(BigDecimal needPayCnt) {
+		this.needPayCnt = needPayCnt;
 	}
 	/**
-	 * 待付款总人数
+	 * 完成付款总比数
 	 **/
-	public void setTotalNeedPayUserCnt(BigDecimal totalNeedPayUserCnt) {
-		this.totalNeedPayUserCnt = totalNeedPayUserCnt;
+	public void setFinishPayCnt(BigDecimal finishPayCnt) {
+		this.finishPayCnt = finishPayCnt;
 	}
 	/**
-	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
+	 * 已付款总人数
 	 **/
-	public void setTotalPlanIuserWorkload(BigDecimal totalPlanIuserWorkload) {
-		this.totalPlanIuserWorkload = totalPlanIuserWorkload;
+	public void setFinishPayUserCnt(BigDecimal finishPayUserCnt) {
+		this.finishPayUserCnt = finishPayUserCnt;
 	}
 	/**
-	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
+	 * 待付款总人数
 	 **/
-	public void setTotalPlanOuserWorkload(BigDecimal totalPlanOuserWorkload) {
-		this.totalPlanOuserWorkload = totalPlanOuserWorkload;
+	public void setNeedPayUserCnt(BigDecimal needPayUserCnt) {
+		this.needPayUserCnt = needPayUserCnt;
 	}
 	/**
 	 * 测试案例总数
@@ -512,6 +461,18 @@ public class XmBranchState  implements java.io.Serializable {
 	public void setProductCnt(Integer productCnt) {
 		this.productCnt = productCnt;
 	}
+	/**
+	 * 最早开始日期
+	 **/
+	public void setMinStartTime(Date minStartTime) {
+		this.minStartTime = minStartTime;
+	}
+	/**
+	 * 最晚结束时间
+	 **/
+	public void setMaxEndTime(Date maxEndTime) {
+		this.maxEndTime = maxEndTime;
+	}
 	/**
 	 * 故事数
 	 **/
@@ -519,203 +480,209 @@ public class XmBranchState  implements java.io.Serializable {
 		this.menuCnt = menuCnt;
 	}
 	/**
-	 * 项目数量
+	 * 已完成需求数，2状态需求
 	 **/
-	public void setProjectCnt(Integer projectCnt) {
-		this.projectCnt = projectCnt;
+	public void setMenuFinishCnt(Integer menuFinishCnt) {
+		this.menuFinishCnt = menuFinishCnt;
 	}
 	/**
-	 * 产品总工时
+	 * 执行中需求数，1状态的需求
 	 **/
-	public void setProductBudgetWorkload(BigDecimal productBudgetWorkload) {
-		this.productBudgetWorkload = productBudgetWorkload;
+	public void setMenuExecCnt(Integer menuExecCnt) {
+		this.menuExecCnt = menuExecCnt;
 	}
 	/**
-	 * 产品实际完成总工作量
+	 * 未开始需求数，0状态数据
 	 **/
-	public void setProductActWorkload(BigDecimal productActWorkload) {
-		this.productActWorkload = productActWorkload;
+	public void setMenuUnstartCnt(Integer menuUnstartCnt) {
+		this.menuUnstartCnt = menuUnstartCnt;
 	}
 	/**
-	 * 预估完成工作量
+	 * 已关闭需求数，3状态数据
 	 **/
-	public void setEstimateWorkload(BigDecimal estimateWorkload) {
-		this.estimateWorkload = estimateWorkload;
+	public void setMenuCloseCnt(Integer menuCloseCnt) {
+		this.menuCloseCnt = menuCloseCnt;
 	}
 	/**
-	 * 执行中任务数=任务表开始日期小于当前日期，进度<100的任务
+	 * 任务总数
 	 **/
-	public void setExecTaskCnt(Integer execTaskCnt) {
-		this.execTaskCnt = execTaskCnt;
+	public void setTaskCnt(Integer taskCnt) {
+		this.taskCnt = taskCnt;
 	}
 	/**
-	 * 待开始的任务数=任务表中开始日期大于当前日期的任务数
+	 * 待开始任务
 	 **/
-	public void setToStartTaskCnt(Integer toStartTaskCnt) {
-		this.toStartTaskCnt = toStartTaskCnt;
+	public void setTaskUnstartCnt(Integer taskUnstartCnt) {
+		this.taskUnstartCnt = taskUnstartCnt;
 	}
 	/**
-	 * 执行中需求=需求表中开始日期小于小于当前日期，进度<100的需求
+	 * 执行中任务
 	 **/
-	public void setExecMenuCnt(Integer execMenuCnt) {
-		this.execMenuCnt = execMenuCnt;
+	public void setTaskExecCnt(Integer taskExecCnt) {
+		this.taskExecCnt = taskExecCnt;
 	}
 	/**
-	 * 待开始需求数=需求表中开始日期大于当前日期的需求数
+	 * 已完成任务总数-来自任务表
 	 **/
-	public void setToStartMenuCnt(Integer toStartMenuCnt) {
-		this.toStartMenuCnt = toStartMenuCnt;
+	public void setTaskFinishCnt(Integer taskFinishCnt) {
+		this.taskFinishCnt = taskFinishCnt;
 	}
 	/**
-	 * 最早开始日期
+	 * 已结算任务
 	 **/
-	public void setMinStartTime(Date minStartTime) {
-		this.minStartTime = minStartTime;
+	public void setTaskSetCnt(Integer taskSetCnt) {
+		this.taskSetCnt = taskSetCnt;
 	}
 	/**
-	 * 最晚结束时间
+	 * 外购任务数，来自任务表
 	 **/
-	public void setMaxEndTime(Date maxEndTime) {
-		this.maxEndTime = maxEndTime;
+	public void setTaskOutCnt(BigDecimal taskOutCnt) {
+		this.taskOutCnt = taskOutCnt;
 	}
-	
 	/**
-	 * 统计日期yyyy-mm-dd类型
+	 * 已关闭任务
 	 **/
-	public String getBizDate() {
-		return this.bizDate;
+	public void setTaskCloseCnt(Integer taskCloseCnt) {
+		this.taskCloseCnt = taskCloseCnt;
 	}
 	/**
-	 * 文件数据
+	 * bug数目
 	 **/
-	public Integer getTotalFileCnt() {
-		return this.totalFileCnt;
+	public void setBugCnt(Integer bugCnt) {
+		this.bugCnt = bugCnt;
 	}
 	/**
-	 * bug数目
+	 * 已关闭bug总数
 	 **/
-	public Integer getTotalBugCnt() {
-		return this.totalBugCnt;
+	public void setClosedBugs(Integer closedBugs) {
+		this.closedBugs = closedBugs;
 	}
 	/**
-	 * 任务数
+	 * 已解决bug总数
 	 **/
-	public Integer getTotalTaskCnt() {
-		return this.totalTaskCnt;
+	public void setResolvedBugs(Integer resolvedBugs) {
+		this.resolvedBugs = resolvedBugs;
 	}
 	/**
-	 * 项目总非人力预算-来自项目表
+	 * 激活的bug总数
 	 **/
-	public BigDecimal getTotalBudgetNouserAmount() {
-		return this.totalBudgetNouserAmount;
+	public void setActiveBugs(Integer activeBugs) {
+		this.activeBugs = activeBugs;
 	}
 	/**
-	 * 总参与人数
+	 * 已解决bug总数
 	 **/
-	public Integer getTotalStaffCnt() {
-		return this.totalStaffCnt;
+	public void setConfirmedBugs(Integer confirmedBugs) {
+		this.confirmedBugs = confirmedBugs;
 	}
 	/**
-	 * 统计执行日期
+	 * 工期（小时）
 	 **/
-	public Date getCalcTime() {
-		return this.calcTime;
+	public void setPlanWorkhours(BigDecimal planWorkhours) {
+		this.planWorkhours = planWorkhours;
 	}
 	/**
-	 * 0-暂时的1稳定的，暂时的可以被覆盖，稳定的不允许覆盖
+	 * 总人数
 	 **/
-	public String getCalcStatus() {
-		return this.calcStatus;
+	public void setPlanWorkerCnt(Integer planWorkerCnt) {
+		this.planWorkerCnt = planWorkerCnt;
 	}
 	/**
-	 * 项目总非人力成本
+	 * 实际投入人员数
 	 **/
-	public BigDecimal getTotalCostNouserAmount() {
-		return this.totalCostNouserAmount;
+	public void setActWorkerCnt(BigDecimal actWorkerCnt) {
+		this.actWorkerCnt = actWorkerCnt;
 	}
 	/**
-	 * 已关闭bug总数
+	 * 预算金额
 	 **/
-	public Integer getTotalClosedBugCnt() {
-		return this.totalClosedBugCnt;
+	public void setBudgetAt(BigDecimal budgetAt) {
+		this.budgetAt = budgetAt;
 	}
 	/**
-	 * 已解决bug总数
+	 * 实际金额
 	 **/
-	public Integer getTotalResolvedBugCnt() {
-		return this.totalResolvedBugCnt;
+	public void setActAt(BigDecimal actAt) {
+		this.actAt = actAt;
 	}
+	
 	/**
-	 * 已完成任务总数-来自任务表
+	 * 项目数
 	 **/
-	public Integer getTotalCompleteTaskCnt() {
-		return this.totalCompleteTaskCnt;
+	public Integer getProjectCnt() {
+		return this.projectCnt;
 	}
 	/**
-	 * 项目阶段计划数
+	 * 统计日期yyyy-mm-dd类型
 	 **/
-	public Integer getTotalPhaseCnt() {
-		return this.totalPhaseCnt;
+	public String getBizDate() {
+		return this.bizDate;
 	}
 	/**
-	 * 项目阶段计划已完成数
+	 * 文件数据
 	 **/
-	public Integer getTotalCompletePhaseCnt() {
-		return this.totalCompletePhaseCnt;
+	public Integer getFileCnt() {
+		return this.fileCnt;
 	}
 	/**
-	 * 待付款总金额
+	 * 统计执行日期
 	 **/
-	public BigDecimal getTotalNeedPayAmount() {
-		return this.totalNeedPayAmount;
+	public Date getCalcTime() {
+		return this.calcTime;
 	}
 	/**
-	 * 已付款总金额
+	 * 0-暂时的1稳定的，暂时的可以被覆盖，稳定的不允许覆盖
 	 **/
-	public BigDecimal getTotalFinishPayAmount() {
-		return this.totalFinishPayAmount;
+	public String getCalcStatus() {
+		return this.calcStatus;
 	}
 	/**
-	 * 待收款总金额
+	 * 项目阶段计划数
 	 **/
-	public BigDecimal getTotalNeedColAmount() {
-		return this.totalNeedColAmount;
+	public Integer getPhaseCnt() {
+		return this.phaseCnt;
 	}
 	/**
-	 * 已收款总金额
+	 * 项目阶段计划已完成数
 	 **/
-	public BigDecimal getTotalFinishColAmount() {
-		return this.totalFinishColAmount;
+	public Integer getPhaseFinishCnt() {
+		return this.phaseFinishCnt;
 	}
 	/**
-	 * 项目总人力成本
+	 * 待付款总金额
 	 **/
-	public BigDecimal getTotalCostUserAmount() {
-		return this.totalCostUserAmount;
+	public BigDecimal getNeedPayAt() {
+		return this.needPayAt;
 	}
 	/**
-	 * 项目总内部人力预算-来自项目表
+	 * 已付款总金额
 	 **/
-	public BigDecimal getTotalBudgetIuserAmount() {
-		return this.totalBudgetIuserAmount;
+	public BigDecimal getFinishPayAt() {
+		return this.finishPayAt;
 	}
 	/**
-	 * 项目总预算工作量-来自项目表
+	 * 待收款总金额
 	 **/
-	public BigDecimal getTotalPlanWorkload() {
-		return this.totalPlanWorkload;
+	public BigDecimal getNeedColAt() {
+		return this.needColAt;
+	}
+	/**
+	 * 已收款总金额
+	 **/
+	public BigDecimal getFinishColAt() {
+		return this.finishColAt;
 	}
 	/**
 	 * 项目风险总数
 	 **/
-	public Integer getTotalRiskCnt() {
-		return this.totalRiskCnt;
+	public Integer getRiskCnt() {
+		return this.riskCnt;
 	}
 	/**
 	 * 已完成风险总数
 	 **/
-	public Integer getTotalCompleteRiskCnt() {
-		return this.totalCompleteRiskCnt;
+	public Integer getRiskFinishCnt() {
+		return this.riskFinishCnt;
 	}
 	/**
 	 * 机构编号
@@ -730,118 +697,118 @@ public class XmBranchState  implements java.io.Serializable {
 		return this.branchName;
 	}
 	/**
-	 * 项目总外购人力预算-来自项目表
+	 * 项目总非人力预算-来自任务表
 	 **/
-	public BigDecimal getTotalBudgetOuserAmount() {
-		return this.totalBudgetOuserAmount;
+	public BigDecimal getBudgetNouserAt() {
+		return this.budgetNouserAt;
 	}
 	/**
-	 * 已完成工作量-来自计划中实际完成工作量
+	 * 项目总外购人力预算-来自任务表
 	 **/
-	public BigDecimal getTotalCompleteWorkload() {
-		return this.totalCompleteWorkload;
+	public BigDecimal getBudgetOuserAt() {
+		return this.budgetOuserAt;
 	}
 	/**
-	 * 项目总内部人力成本金额
+	 * 项目总内部人力预算-来自任务表
 	 **/
-	public BigDecimal getTotalCostIuserAmount() {
-		return this.totalCostIuserAmount;
+	public BigDecimal getBudgetIuserAt() {
+		return this.budgetIuserAt;
 	}
 	/**
-	 * 项目总外购人力成本金额
+	 * 项目总人力成本
 	 **/
-	public BigDecimal getTotalCostOuserAmount() {
-		return this.totalCostOuserAmount;
+	public BigDecimal getActUserAt() {
+		return this.actUserAt;
 	}
 	/**
-	 * 项目进度0~100之间，来自任务表
+	 * 项目总内部人力成本金额
 	 **/
-	public BigDecimal getTotalProgress() {
-		return this.totalProgress;
+	public BigDecimal getActIuserAt() {
+		return this.actIuserAt;
 	}
 	/**
-	 * 激活的bug总数
+	 * 项目总外购人力成本金额
 	 **/
-	public Integer getTotalActiveBugCnt() {
-		return this.totalActiveBugCnt;
+	public BigDecimal getActOuserAt() {
+		return this.actOuserAt;
 	}
 	/**
-	 * 已解决bug总数
+	 * 项目总非人力成本
 	 **/
-	public Integer getTotalConfirmedBugCnt() {
-		return this.totalConfirmedBugCnt;
+	public BigDecimal getActNouserAt() {
+		return this.actNouserAt;
 	}
 	/**
-	 * 项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停
+	 * 项目进度0~100之间，来自任务表
 	 **/
-	public String getProjectStatus() {
-		return this.projectStatus;
+	public BigDecimal getFinishRate() {
+		return this.finishRate;
 	}
 	/**
-	 * 实际总工作量，来自任务表
+	 * 项目总预算工作量-来自任务表
 	 **/
-	public BigDecimal getTotalActWorkload() {
-		return this.totalActWorkload;
+	public BigDecimal getBudgetWorkload() {
+		return this.budgetWorkload;
 	}
 	/**
-	 * 实际外购总工作量，来自任务表
+	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
 	 **/
-	public BigDecimal getTotalActOutWorkload() {
-		return this.totalActOutWorkload;
+	public BigDecimal getBudgetOuserWorkload() {
+		return this.budgetOuserWorkload;
 	}
 	/**
-	 * 实际内部总工作量，来自任务表
+	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
 	 **/
-	public BigDecimal getTotalActInnerWorkload() {
-		return this.totalActInnerWorkload;
+	public BigDecimal getBudgetIuserWorkload() {
+		return this.budgetIuserWorkload;
 	}
 	/**
-	 * 已经分配到任务的总预算
+	 * 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
 	 **/
-	public BigDecimal getTotalTaskBudgetCostAt() {
-		return this.totalTaskBudgetCostAt;
+	public BigDecimal getEstimateWorkload() {
+		return this.estimateWorkload;
 	}
 	/**
-	 * 外购任务数，来自任务表
+	 * 已完成工作量-来自计划中实际完成工作量
 	 **/
-	public BigDecimal getTotalTaskOutCnt() {
-		return this.totalTaskOutCnt;
+	public BigDecimal getActWorkload() {
+		return this.actWorkload;
 	}
 	/**
-	 * 待付款笔数
+	 * 实际外购总工作量，来自任务表
 	 **/
-	public BigDecimal getTotalNeedPayCnt() {
-		return this.totalNeedPayCnt;
+	public BigDecimal getActOuserWorkload() {
+		return this.actOuserWorkload;
 	}
 	/**
-	 * 完成付款总比数
+	 * 实际内部总工作量，来自任务表
 	 **/
-	public BigDecimal getTotalFinishPayCnt() {
-		return this.totalFinishPayCnt;
+	public BigDecimal getActIuserWorkload() {
+		return this.actIuserWorkload;
 	}
 	/**
-	 * 已付款总人数
+	 * 待付款笔数
 	 **/
-	public BigDecimal getTotalFinishPayUserCnt() {
-		return this.totalFinishPayUserCnt;
+	public BigDecimal getNeedPayCnt() {
+		return this.needPayCnt;
 	}
 	/**
-	 * 待付款总人数
+	 * 完成付款总比数
 	 **/
-	public BigDecimal getTotalNeedPayUserCnt() {
-		return this.totalNeedPayUserCnt;
+	public BigDecimal getFinishPayCnt() {
+		return this.finishPayCnt;
 	}
 	/**
-	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
+	 * 已付款总人数
 	 **/
-	public BigDecimal getTotalPlanIuserWorkload() {
-		return this.totalPlanIuserWorkload;
+	public BigDecimal getFinishPayUserCnt() {
+		return this.finishPayUserCnt;
 	}
 	/**
-	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
+	 * 待付款总人数
 	 **/
-	public BigDecimal getTotalPlanOuserWorkload() {
-		return this.totalPlanOuserWorkload;
+	public BigDecimal getNeedPayUserCnt() {
+		return this.needPayUserCnt;
 	}
 	/**
 	 * 测试案例总数
@@ -879,6 +846,18 @@ public class XmBranchState  implements java.io.Serializable {
 	public Integer getProductCnt() {
 		return this.productCnt;
 	}
+	/**
+	 * 最早开始日期
+	 **/
+	public Date getMinStartTime() {
+		return this.minStartTime;
+	}
+	/**
+	 * 最晚结束时间
+	 **/
+	public Date getMaxEndTime() {
+		return this.maxEndTime;
+	}
 	/**
 	 * 故事数
 	 **/
@@ -886,64 +865,130 @@ public class XmBranchState  implements java.io.Serializable {
 		return this.menuCnt;
 	}
 	/**
-	 * 项目数量
+	 * 已完成需求数，2状态需求
 	 **/
-	public Integer getProjectCnt() {
-		return this.projectCnt;
+	public Integer getMenuFinishCnt() {
+		return this.menuFinishCnt;
 	}
 	/**
-	 * 产品总工时
+	 * 执行中需求数，1状态的需求
 	 **/
-	public BigDecimal getProductBudgetWorkload() {
-		return this.productBudgetWorkload;
+	public Integer getMenuExecCnt() {
+		return this.menuExecCnt;
 	}
 	/**
-	 * 产品实际完成总工作量
+	 * 未开始需求数，0状态数据
 	 **/
-	public BigDecimal getProductActWorkload() {
-		return this.productActWorkload;
+	public Integer getMenuUnstartCnt() {
+		return this.menuUnstartCnt;
 	}
 	/**
-	 * 预估完成工作量
+	 * 已关闭需求数，3状态数据
 	 **/
-	public BigDecimal getEstimateWorkload() {
-		return this.estimateWorkload;
+	public Integer getMenuCloseCnt() {
+		return this.menuCloseCnt;
 	}
 	/**
-	 * 执行中任务数=任务表开始日期小于当前日期，进度<100的任务
+	 * 任务总数
 	 **/
-	public Integer getExecTaskCnt() {
-		return this.execTaskCnt;
+	public Integer getTaskCnt() {
+		return this.taskCnt;
 	}
 	/**
-	 * 待开始的任务数=任务表中开始日期大于当前日期的任务数
+	 * 待开始任务
 	 **/
-	public Integer getToStartTaskCnt() {
-		return this.toStartTaskCnt;
+	public Integer getTaskUnstartCnt() {
+		return this.taskUnstartCnt;
 	}
 	/**
-	 * 执行中需求=需求表中开始日期小于小于当前日期，进度<100的需求
+	 * 执行中任务
 	 **/
-	public Integer getExecMenuCnt() {
-		return this.execMenuCnt;
+	public Integer getTaskExecCnt() {
+		return this.taskExecCnt;
 	}
 	/**
-	 * 待开始需求数=需求表中开始日期大于当前日期的需求数
+	 * 已完成任务总数-来自任务表
 	 **/
-	public Integer getToStartMenuCnt() {
-		return this.toStartMenuCnt;
+	public Integer getTaskFinishCnt() {
+		return this.taskFinishCnt;
 	}
 	/**
-	 * 最早开始日期
+	 * 已结算任务
 	 **/
-	public Date getMinStartTime() {
-		return this.minStartTime;
+	public Integer getTaskSetCnt() {
+		return this.taskSetCnt;
 	}
 	/**
-	 * 最晚结束时间
+	 * 外购任务数，来自任务表
 	 **/
-	public Date getMaxEndTime() {
-		return this.maxEndTime;
+	public BigDecimal getTaskOutCnt() {
+		return this.taskOutCnt;
+	}
+	/**
+	 * 已关闭任务
+	 **/
+	public Integer getTaskCloseCnt() {
+		return this.taskCloseCnt;
+	}
+	/**
+	 * bug数目
+	 **/
+	public Integer getBugCnt() {
+		return this.bugCnt;
+	}
+	/**
+	 * 已关闭bug总数
+	 **/
+	public Integer getClosedBugs() {
+		return this.closedBugs;
+	}
+	/**
+	 * 已解决bug总数
+	 **/
+	public Integer getResolvedBugs() {
+		return this.resolvedBugs;
+	}
+	/**
+	 * 激活的bug总数
+	 **/
+	public Integer getActiveBugs() {
+		return this.activeBugs;
+	}
+	/**
+	 * 已解决bug总数
+	 **/
+	public Integer getConfirmedBugs() {
+		return this.confirmedBugs;
+	}
+	/**
+	 * 工期（小时）
+	 **/
+	public BigDecimal getPlanWorkhours() {
+		return this.planWorkhours;
+	}
+	/**
+	 * 总人数
+	 **/
+	public Integer getPlanWorkerCnt() {
+		return this.planWorkerCnt;
+	}
+	/**
+	 * 实际投入人员数
+	 **/
+	public BigDecimal getActWorkerCnt() {
+		return this.actWorkerCnt;
+	}
+	/**
+	 * 预算金额
+	 **/
+	public BigDecimal getBudgetAt() {
+		return this.budgetAt;
+	}
+	/**
+	 * 实际金额
+	 **/
+	public BigDecimal getActAt() {
+		return this.actAt;
 	}
 
 }
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmIterationState.java b/xm-core/src/main/java/com/xm/core/entity/XmIterationState.java
index f48b679f..829d2eaa 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmIterationState.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmIterationState.java
@@ -2,19 +2,19 @@ package  com.xm.core.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
 import java.util.Date;
+import java.math.BigDecimal;
 
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <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,estimateWorkload,minStartTime,maxEndTime;<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,estimate_workload,min_start_time,max_end_time;<br>
+ *	iterationId,bizDate,fileCnt,iterationName,calcTime,calcStatus,phaseCnt,phaseFinishCnt,needPayAt,finishPayAt,needColAt,finishColAt,riskCnt,riskFinishCnt,branchId,branchName,budgetNouserAt,budgetOuserAt,budgetIuserAt,actUserAt,actIuserAt,actOuserAt,actNouserAt,finishRate,budgetWorkload,budgetOuserWorkload,budgetIuserWorkload,estimateWorkload,actWorkload,projectStatus,actOuserWorkload,actIuserWorkload,needPayCnt,finishPayCnt,finishPayUserCnt,needPayUserCnt,testCases,execCases,designCases,finishCases,iterationCnt,productCnt,minStartTime,maxEndTime,menuCnt,menuFinishCnt,menuExecCnt,menuUnstartCnt,menuCloseCnt,taskCnt,taskUnstartCnt,taskExecCnt,taskFinishCnt,taskSetCnt,taskOutCnt,taskCloseCnt,bugCnt,closedBugs,resolvedBugs,activeBugs,confirmedBugs,planWorkhours,planWorkerCnt,actWorkerCnt,projectCnt,budgetAt,actAt;<br>
+ * 表 xm_iteration_state 项目指标日统计表的所有字段名: <br>
+ *	iteration_id,biz_date,file_cnt,iteration_name,calc_time,calc_status,phase_cnt,phase_finish_cnt,need_pay_at,finish_pay_at,need_col_at,finish_col_at,risk_cnt,risk_finish_cnt,branch_id,branch_name,budget_nouser_at,budget_ouser_at,budget_iuser_at,act_user_at,act_iuser_at,act_ouser_at,act_nouser_at,finish_rate,budget_workload,budget_ouser_workload,budget_iuser_workload,estimate_workload,act_workload,project_status,act_ouser_workload,act_iuser_workload,need_pay_cnt,finish_pay_cnt,finish_pay_user_cnt,need_pay_user_cnt,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,min_start_time,max_end_time,menu_cnt,menu_finish_cnt,menu_exec_cnt,menu_unstart_cnt,menu_close_cnt,task_cnt,task_unstart_cnt,task_exec_cnt,task_finish_cnt,task_set_cnt,task_out_cnt,task_close_cnt,bug_cnt,closed_bugs,resolved_bugs,active_bugs,confirmed_bugs,plan_workhours,plan_worker_cnt,act_worker_cnt,project_cnt,budget_at,act_at;<br>
  * 当前主键(包括多主键):<br>
  *	iteration_id;<br>
  */
-@ApiModel(description="迭代定义")
+@ApiModel(description="项目指标日统计表")
 public class XmIterationState  implements java.io.Serializable {
 	
 	private static final long serialVersionUID = 1L;
@@ -23,24 +23,111 @@ public class XmIterationState  implements java.io.Serializable {
 	String iterationId;
   	
 	
-	@ApiModelProperty(notes="已分配到任务的预算从任务表汇总而来",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal distBudgetCost;
+	@ApiModelProperty(notes="统计日期yyyy-mm-dd类型",allowEmptyValue=true,example="",allowableValues="")
+	String bizDate;
 	
-	@ApiModelProperty(notes="已分配到任务的预算工作量从任务表汇总而来",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal distBudgetWorkload;
+	@ApiModelProperty(notes="文件数据",allowEmptyValue=true,example="",allowableValues="")
+	Integer fileCnt;
 	
-	@ApiModelProperty(notes="实际成本从任务表汇总而来",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal actCost;
+	@ApiModelProperty(notes="迭代名称",allowEmptyValue=true,example="",allowableValues="")
+	String iterationName;
 	
-	@ApiModelProperty(notes="实际工作量从任务表汇总而来",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal actWorkload;
+	@ApiModelProperty(notes="统计执行日期",allowEmptyValue=true,example="",allowableValues="")
+	Date calcTime;
 	
-	@ApiModelProperty(notes="实际投入人员数",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal actStaffNum;
+	@ApiModelProperty(notes="0-暂时的1稳定的，暂时的可以被覆盖，稳定的不允许覆盖",allowEmptyValue=true,example="",allowableValues="")
+	String calcStatus;
+	
+	@ApiModelProperty(notes="项目阶段计划数",allowEmptyValue=true,example="",allowableValues="")
+	Integer phaseCnt;
+	
+	@ApiModelProperty(notes="项目阶段计划已完成数",allowEmptyValue=true,example="",allowableValues="")
+	Integer phaseFinishCnt;
+	
+	@ApiModelProperty(notes="待付款总金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal needPayAt;
+	
+	@ApiModelProperty(notes="已付款总金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal finishPayAt;
+	
+	@ApiModelProperty(notes="待收款总金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal needColAt;
 	
-	@ApiModelProperty(notes="进度",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="已收款总金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal finishColAt;
+	
+	@ApiModelProperty(notes="项目风险总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer riskCnt;
+	
+	@ApiModelProperty(notes="已完成风险总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer riskFinishCnt;
+	
+	@ApiModelProperty(notes="机构编号",allowEmptyValue=true,example="",allowableValues="")
+	String branchId;
+	
+	@ApiModelProperty(notes="机构名称",allowEmptyValue=true,example="",allowableValues="")
+	String branchName;
+	
+	@ApiModelProperty(notes="项目总非人力预算-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetNouserAt;
+	
+	@ApiModelProperty(notes="项目总外购人力预算-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetOuserAt;
+	
+	@ApiModelProperty(notes="项目总内部人力预算-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetIuserAt;
+	
+	@ApiModelProperty(notes="项目总人力成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actUserAt;
+	
+	@ApiModelProperty(notes="项目总内部人力成本金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actIuserAt;
+	
+	@ApiModelProperty(notes="项目总外购人力成本金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actOuserAt;
+	
+	@ApiModelProperty(notes="项目总非人力成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actNouserAt;
+	
+	@ApiModelProperty(notes="项目进度0~100之间，来自任务表",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal finishRate;
 	
+	@ApiModelProperty(notes="项目总预算工作量-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetWorkload;
+	
+	@ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetOuserWorkload;
+	
+	@ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetIuserWorkload;
+	
+	@ApiModelProperty(notes="预估工时=计划结束时间在计算当日前完成的任务的预算工时总和",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal estimateWorkload;
+	
+	@ApiModelProperty(notes="已完成工作量-来自计划中实际完成工作量",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actWorkload;
+	
+	@ApiModelProperty(notes="0|初始",allowEmptyValue=true,example="",allowableValues="")
+	String projectStatus;
+	
+	@ApiModelProperty(notes="实际外购总工作量，来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actOuserWorkload;
+	
+	@ApiModelProperty(notes="实际内部总工作量，来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actIuserWorkload;
+	
+	@ApiModelProperty(notes="待付款笔数",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal needPayCnt;
+	
+	@ApiModelProperty(notes="完成付款总比数",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal finishPayCnt;
+	
+	@ApiModelProperty(notes="已付款总人数",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal finishPayUserCnt;
+	
+	@ApiModelProperty(notes="待付款总人数",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal needPayUserCnt;
+	
 	@ApiModelProperty(notes="测试案例总数",allowEmptyValue=true,example="",allowableValues="")
 	Integer testCases;
 	
@@ -53,105 +140,312 @@ public class XmIterationState  implements java.io.Serializable {
 	@ApiModelProperty(notes="完成案例总数",allowEmptyValue=true,example="",allowableValues="")
 	Integer finishCases;
 	
-	@ApiModelProperty(notes="关联项目数",allowEmptyValue=true,example="",allowableValues="")
-	Integer projectCnt;
+	@ApiModelProperty(notes="迭代数",allowEmptyValue=true,example="",allowableValues="")
+	Integer iterationCnt;
 	
-	@ApiModelProperty(notes="关联产品数",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="产品数",allowEmptyValue=true,example="",allowableValues="")
 	Integer productCnt;
 	
-	@ApiModelProperty(notes="关联故事数",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="最早开始日期",allowEmptyValue=true,example="",allowableValues="")
+	Date minStartTime;
+	
+	@ApiModelProperty(notes="最晚结束时间",allowEmptyValue=true,example="",allowableValues="")
+	Date maxEndTime;
+	
+	@ApiModelProperty(notes="故事数",allowEmptyValue=true,example="",allowableValues="")
 	Integer menuCnt;
 	
-	@ApiModelProperty(notes="关联任务数",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="已完成需求数，2状态需求",allowEmptyValue=true,example="",allowableValues="")
+	Integer menuFinishCnt;
+	
+	@ApiModelProperty(notes="执行中需求数，1状态的需求",allowEmptyValue=true,example="",allowableValues="")
+	Integer menuExecCnt;
+	
+	@ApiModelProperty(notes="未开始需求数，0状态数据",allowEmptyValue=true,example="",allowableValues="")
+	Integer menuUnstartCnt;
+	
+	@ApiModelProperty(notes="已关闭需求数，3状态数据",allowEmptyValue=true,example="",allowableValues="")
+	Integer menuCloseCnt;
+	
+	@ApiModelProperty(notes="任务总数",allowEmptyValue=true,example="",allowableValues="")
 	Integer taskCnt;
 	
-	@ApiModelProperty(notes="已完成的任务数",allowEmptyValue=true,example="",allowableValues="")
-	Integer finishTaskCnt;
+	@ApiModelProperty(notes="待开始任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskUnstartCnt;
 	
-	@ApiModelProperty(notes="计算日期",allowEmptyValue=true,example="",allowableValues="")
-	Date calcTime;
+	@ApiModelProperty(notes="执行中任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskExecCnt;
 	
-	@ApiModelProperty(notes="迭代名称",allowEmptyValue=true,example="",allowableValues="")
-	String iterationName;
+	@ApiModelProperty(notes="已完成任务总数-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskFinishCnt;
 	
-	@ApiModelProperty(notes="预算成本",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal budgetCost;
+	@ApiModelProperty(notes="已结算任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskSetCnt;
 	
-	@ApiModelProperty(notes="预算工作量",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal budgetWorkload;
+	@ApiModelProperty(notes="外购任务数，来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal taskOutCnt;
 	
-	@ApiModelProperty(notes="业务日期yyyy-MM-dd字符串",allowEmptyValue=true,example="",allowableValues="")
-	String bizDate;
+	@ApiModelProperty(notes="已关闭任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskCloseCnt;
+	
+	@ApiModelProperty(notes="bug数目",allowEmptyValue=true,example="",allowableValues="")
+	Integer bugCnt;
 	
 	@ApiModelProperty(notes="已关闭bug总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer closedBugCnt;
+	Integer closedBugs;
 	
 	@ApiModelProperty(notes="已解决bug总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer resolvedBugCnt;
+	Integer resolvedBugs;
 	
 	@ApiModelProperty(notes="激活的bug总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer activeBugCnt;
+	Integer activeBugs;
 	
 	@ApiModelProperty(notes="已解决bug总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer confirmedBugCnt;
+	Integer confirmedBugs;
 	
-	@ApiModelProperty(notes="bug总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer bugCnt;
+	@ApiModelProperty(notes="工期（小时）",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal planWorkhours;
 	
-	@ApiModelProperty(notes="预估工时=计划结束时间在计算当日前完成的任务的预算工时总和",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal estimateWorkload;
+	@ApiModelProperty(notes="总人数",allowEmptyValue=true,example="",allowableValues="")
+	Integer planWorkerCnt;
 	
-	@ApiModelProperty(notes="最早开始日期",allowEmptyValue=true,example="",allowableValues="")
-	Date minStartTime;
+	@ApiModelProperty(notes="实际投入人员数",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actWorkerCnt;
 	
-	@ApiModelProperty(notes="最晚结束时间",allowEmptyValue=true,example="",allowableValues="")
-	Date maxEndTime;
+	@ApiModelProperty(notes="项目数",allowEmptyValue=true,example="",allowableValues="")
+	Integer projectCnt;
+	
+	@ApiModelProperty(notes="预算总金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetAt;
+	
+	@ApiModelProperty(notes="实际总金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actAt;
 
 	/**迭代编号**/
 	public XmIterationState(String iterationId) {
 		this.iterationId = iterationId;
 	}
     
-    /**迭代定义**/
+    /**项目指标日统计表**/
 	public XmIterationState() {
 	}
 	
 	/**
-	 * 已分配到任务的预算从任务表汇总而来
+	 * 迭代编号
 	 **/
-	public void setDistBudgetCost(BigDecimal distBudgetCost) {
-		this.distBudgetCost = distBudgetCost;
+	public void setIterationId(String iterationId) {
+		this.iterationId = iterationId;
 	}
 	/**
-	 * 已分配到任务的预算工作量从任务表汇总而来
+	 * 统计日期yyyy-mm-dd类型
 	 **/
-	public void setDistBudgetWorkload(BigDecimal distBudgetWorkload) {
-		this.distBudgetWorkload = distBudgetWorkload;
+	public void setBizDate(String bizDate) {
+		this.bizDate = bizDate;
 	}
 	/**
-	 * 实际成本从任务表汇总而来
+	 * 文件数据
 	 **/
-	public void setActCost(BigDecimal actCost) {
-		this.actCost = actCost;
+	public void setFileCnt(Integer fileCnt) {
+		this.fileCnt = fileCnt;
 	}
 	/**
-	 * 实际工作量从任务表汇总而来
+	 * 迭代名称
 	 **/
-	public void setActWorkload(BigDecimal actWorkload) {
-		this.actWorkload = actWorkload;
+	public void setIterationName(String iterationName) {
+		this.iterationName = iterationName;
 	}
 	/**
-	 * 实际投入人员数
+	 * 统计执行日期
 	 **/
-	public void setActStaffNum(BigDecimal actStaffNum) {
-		this.actStaffNum = actStaffNum;
+	public void setCalcTime(Date calcTime) {
+		this.calcTime = calcTime;
 	}
 	/**
-	 * 进度
+	 * 0-暂时的1稳定的，暂时的可以被覆盖，稳定的不允许覆盖
+	 **/
+	public void setCalcStatus(String calcStatus) {
+		this.calcStatus = calcStatus;
+	}
+	/**
+	 * 项目阶段计划数
+	 **/
+	public void setPhaseCnt(Integer phaseCnt) {
+		this.phaseCnt = phaseCnt;
+	}
+	/**
+	 * 项目阶段计划已完成数
+	 **/
+	public void setPhaseFinishCnt(Integer phaseFinishCnt) {
+		this.phaseFinishCnt = phaseFinishCnt;
+	}
+	/**
+	 * 待付款总金额
+	 **/
+	public void setNeedPayAt(BigDecimal needPayAt) {
+		this.needPayAt = needPayAt;
+	}
+	/**
+	 * 已付款总金额
+	 **/
+	public void setFinishPayAt(BigDecimal finishPayAt) {
+		this.finishPayAt = finishPayAt;
+	}
+	/**
+	 * 待收款总金额
+	 **/
+	public void setNeedColAt(BigDecimal needColAt) {
+		this.needColAt = needColAt;
+	}
+	/**
+	 * 已收款总金额
+	 **/
+	public void setFinishColAt(BigDecimal finishColAt) {
+		this.finishColAt = finishColAt;
+	}
+	/**
+	 * 项目风险总数
+	 **/
+	public void setRiskCnt(Integer riskCnt) {
+		this.riskCnt = riskCnt;
+	}
+	/**
+	 * 已完成风险总数
+	 **/
+	public void setRiskFinishCnt(Integer riskFinishCnt) {
+		this.riskFinishCnt = riskFinishCnt;
+	}
+	/**
+	 * 机构编号
+	 **/
+	public void setBranchId(String branchId) {
+		this.branchId = branchId;
+	}
+	/**
+	 * 机构名称
+	 **/
+	public void setBranchName(String branchName) {
+		this.branchName = branchName;
+	}
+	/**
+	 * 项目总非人力预算-来自任务表
+	 **/
+	public void setBudgetNouserAt(BigDecimal budgetNouserAt) {
+		this.budgetNouserAt = budgetNouserAt;
+	}
+	/**
+	 * 项目总外购人力预算-来自任务表
+	 **/
+	public void setBudgetOuserAt(BigDecimal budgetOuserAt) {
+		this.budgetOuserAt = budgetOuserAt;
+	}
+	/**
+	 * 项目总内部人力预算-来自任务表
+	 **/
+	public void setBudgetIuserAt(BigDecimal budgetIuserAt) {
+		this.budgetIuserAt = budgetIuserAt;
+	}
+	/**
+	 * 项目总人力成本
+	 **/
+	public void setActUserAt(BigDecimal actUserAt) {
+		this.actUserAt = actUserAt;
+	}
+	/**
+	 * 项目总内部人力成本金额
+	 **/
+	public void setActIuserAt(BigDecimal actIuserAt) {
+		this.actIuserAt = actIuserAt;
+	}
+	/**
+	 * 项目总外购人力成本金额
+	 **/
+	public void setActOuserAt(BigDecimal actOuserAt) {
+		this.actOuserAt = actOuserAt;
+	}
+	/**
+	 * 项目总非人力成本
+	 **/
+	public void setActNouserAt(BigDecimal actNouserAt) {
+		this.actNouserAt = actNouserAt;
+	}
+	/**
+	 * 项目进度0~100之间，来自任务表
 	 **/
 	public void setFinishRate(BigDecimal finishRate) {
 		this.finishRate = finishRate;
 	}
+	/**
+	 * 项目总预算工作量-来自任务表
+	 **/
+	public void setBudgetWorkload(BigDecimal budgetWorkload) {
+		this.budgetWorkload = budgetWorkload;
+	}
+	/**
+	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
+	 **/
+	public void setBudgetOuserWorkload(BigDecimal budgetOuserWorkload) {
+		this.budgetOuserWorkload = budgetOuserWorkload;
+	}
+	/**
+	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
+	 **/
+	public void setBudgetIuserWorkload(BigDecimal budgetIuserWorkload) {
+		this.budgetIuserWorkload = budgetIuserWorkload;
+	}
+	/**
+	 * 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
+	 **/
+	public void setEstimateWorkload(BigDecimal estimateWorkload) {
+		this.estimateWorkload = estimateWorkload;
+	}
+	/**
+	 * 已完成工作量-来自计划中实际完成工作量
+	 **/
+	public void setActWorkload(BigDecimal actWorkload) {
+		this.actWorkload = actWorkload;
+	}
+	/**
+	 * 0|初始
+	 **/
+	public void setProjectStatus(String projectStatus) {
+		this.projectStatus = projectStatus;
+	}
+	/**
+	 * 实际外购总工作量，来自任务表
+	 **/
+	public void setActOuserWorkload(BigDecimal actOuserWorkload) {
+		this.actOuserWorkload = actOuserWorkload;
+	}
+	/**
+	 * 实际内部总工作量，来自任务表
+	 **/
+	public void setActIuserWorkload(BigDecimal actIuserWorkload) {
+		this.actIuserWorkload = actIuserWorkload;
+	}
+	/**
+	 * 待付款笔数
+	 **/
+	public void setNeedPayCnt(BigDecimal needPayCnt) {
+		this.needPayCnt = needPayCnt;
+	}
+	/**
+	 * 完成付款总比数
+	 **/
+	public void setFinishPayCnt(BigDecimal finishPayCnt) {
+		this.finishPayCnt = finishPayCnt;
+	}
+	/**
+	 * 已付款总人数
+	 **/
+	public void setFinishPayUserCnt(BigDecimal finishPayUserCnt) {
+		this.finishPayUserCnt = finishPayUserCnt;
+	}
+	/**
+	 * 待付款总人数
+	 **/
+	public void setNeedPayUserCnt(BigDecimal needPayUserCnt) {
+		this.needPayUserCnt = needPayUserCnt;
+	}
 	/**
 	 * 测试案例总数
 	 **/
@@ -177,156 +471,384 @@ public class XmIterationState  implements java.io.Serializable {
 		this.finishCases = finishCases;
 	}
 	/**
-	 * 关联项目数
+	 * 迭代数
 	 **/
-	public void setProjectCnt(Integer projectCnt) {
-		this.projectCnt = projectCnt;
+	public void setIterationCnt(Integer iterationCnt) {
+		this.iterationCnt = iterationCnt;
 	}
 	/**
-	 * 关联产品数
+	 * 产品数
 	 **/
 	public void setProductCnt(Integer productCnt) {
 		this.productCnt = productCnt;
 	}
 	/**
-	 * 关联故事数
+	 * 最早开始日期
+	 **/
+	public void setMinStartTime(Date minStartTime) {
+		this.minStartTime = minStartTime;
+	}
+	/**
+	 * 最晚结束时间
+	 **/
+	public void setMaxEndTime(Date maxEndTime) {
+		this.maxEndTime = maxEndTime;
+	}
+	/**
+	 * 故事数
 	 **/
 	public void setMenuCnt(Integer menuCnt) {
 		this.menuCnt = menuCnt;
 	}
 	/**
-	 * 关联任务数
+	 * 已完成需求数，2状态需求
+	 **/
+	public void setMenuFinishCnt(Integer menuFinishCnt) {
+		this.menuFinishCnt = menuFinishCnt;
+	}
+	/**
+	 * 执行中需求数，1状态的需求
+	 **/
+	public void setMenuExecCnt(Integer menuExecCnt) {
+		this.menuExecCnt = menuExecCnt;
+	}
+	/**
+	 * 未开始需求数，0状态数据
+	 **/
+	public void setMenuUnstartCnt(Integer menuUnstartCnt) {
+		this.menuUnstartCnt = menuUnstartCnt;
+	}
+	/**
+	 * 已关闭需求数，3状态数据
+	 **/
+	public void setMenuCloseCnt(Integer menuCloseCnt) {
+		this.menuCloseCnt = menuCloseCnt;
+	}
+	/**
+	 * 任务总数
 	 **/
 	public void setTaskCnt(Integer taskCnt) {
 		this.taskCnt = taskCnt;
 	}
 	/**
-	 * 已完成的任务数
+	 * 待开始任务
 	 **/
-	public void setFinishTaskCnt(Integer finishTaskCnt) {
-		this.finishTaskCnt = finishTaskCnt;
+	public void setTaskUnstartCnt(Integer taskUnstartCnt) {
+		this.taskUnstartCnt = taskUnstartCnt;
 	}
 	/**
-	 * 计算日期
+	 * 执行中任务
 	 **/
-	public void setCalcTime(Date calcTime) {
-		this.calcTime = calcTime;
+	public void setTaskExecCnt(Integer taskExecCnt) {
+		this.taskExecCnt = taskExecCnt;
 	}
 	/**
-	 * 迭代名称
+	 * 已完成任务总数-来自任务表
 	 **/
-	public void setIterationName(String iterationName) {
-		this.iterationName = iterationName;
+	public void setTaskFinishCnt(Integer taskFinishCnt) {
+		this.taskFinishCnt = taskFinishCnt;
 	}
 	/**
-	 * 预算成本
+	 * 已结算任务
 	 **/
-	public void setBudgetCost(BigDecimal budgetCost) {
-		this.budgetCost = budgetCost;
+	public void setTaskSetCnt(Integer taskSetCnt) {
+		this.taskSetCnt = taskSetCnt;
 	}
 	/**
-	 * 预算工作量
+	 * 外购任务数，来自任务表
 	 **/
-	public void setBudgetWorkload(BigDecimal budgetWorkload) {
-		this.budgetWorkload = budgetWorkload;
+	public void setTaskOutCnt(BigDecimal taskOutCnt) {
+		this.taskOutCnt = taskOutCnt;
 	}
 	/**
-	 * 迭代编号
+	 * 已关闭任务
 	 **/
-	public void setIterationId(String iterationId) {
-		this.iterationId = iterationId;
+	public void setTaskCloseCnt(Integer taskCloseCnt) {
+		this.taskCloseCnt = taskCloseCnt;
 	}
 	/**
-	 * 业务日期yyyy-MM-dd字符串
+	 * bug数目
 	 **/
-	public void setBizDate(String bizDate) {
-		this.bizDate = bizDate;
+	public void setBugCnt(Integer bugCnt) {
+		this.bugCnt = bugCnt;
 	}
 	/**
 	 * 已关闭bug总数
 	 **/
-	public void setClosedBugCnt(Integer closedBugCnt) {
-		this.closedBugCnt = closedBugCnt;
+	public void setClosedBugs(Integer closedBugs) {
+		this.closedBugs = closedBugs;
 	}
 	/**
 	 * 已解决bug总数
 	 **/
-	public void setResolvedBugCnt(Integer resolvedBugCnt) {
-		this.resolvedBugCnt = resolvedBugCnt;
+	public void setResolvedBugs(Integer resolvedBugs) {
+		this.resolvedBugs = resolvedBugs;
 	}
 	/**
 	 * 激活的bug总数
 	 **/
-	public void setActiveBugCnt(Integer activeBugCnt) {
-		this.activeBugCnt = activeBugCnt;
+	public void setActiveBugs(Integer activeBugs) {
+		this.activeBugs = activeBugs;
 	}
 	/**
 	 * 已解决bug总数
 	 **/
-	public void setConfirmedBugCnt(Integer confirmedBugCnt) {
-		this.confirmedBugCnt = confirmedBugCnt;
+	public void setConfirmedBugs(Integer confirmedBugs) {
+		this.confirmedBugs = confirmedBugs;
 	}
 	/**
-	 * bug总数
+	 * 工期（小时）
 	 **/
-	public void setBugCnt(Integer bugCnt) {
-		this.bugCnt = bugCnt;
+	public void setPlanWorkhours(BigDecimal planWorkhours) {
+		this.planWorkhours = planWorkhours;
 	}
 	/**
-	 * 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
+	 * 总人数
 	 **/
-	public void setEstimateWorkload(BigDecimal estimateWorkload) {
-		this.estimateWorkload = estimateWorkload;
+	public void setPlanWorkerCnt(Integer planWorkerCnt) {
+		this.planWorkerCnt = planWorkerCnt;
 	}
 	/**
-	 * 最早开始日期
+	 * 实际投入人员数
 	 **/
-	public void setMinStartTime(Date minStartTime) {
-		this.minStartTime = minStartTime;
+	public void setActWorkerCnt(BigDecimal actWorkerCnt) {
+		this.actWorkerCnt = actWorkerCnt;
 	}
 	/**
-	 * 最晚结束时间
+	 * 项目数
 	 **/
-	public void setMaxEndTime(Date maxEndTime) {
-		this.maxEndTime = maxEndTime;
+	public void setProjectCnt(Integer projectCnt) {
+		this.projectCnt = projectCnt;
+	}
+	/**
+	 * 预算总金额
+	 **/
+	public void setBudgetAt(BigDecimal budgetAt) {
+		this.budgetAt = budgetAt;
+	}
+	/**
+	 * 实际总金额
+	 **/
+	public void setActAt(BigDecimal actAt) {
+		this.actAt = actAt;
 	}
 	
 	/**
-	 * 已分配到任务的预算从任务表汇总而来
+	 * 迭代编号
+	 **/
+	public String getIterationId() {
+		return this.iterationId;
+	}
+	/**
+	 * 统计日期yyyy-mm-dd类型
 	 **/
-	public BigDecimal getDistBudgetCost() {
-		return this.distBudgetCost;
+	public String getBizDate() {
+		return this.bizDate;
 	}
 	/**
-	 * 已分配到任务的预算工作量从任务表汇总而来
+	 * 文件数据
 	 **/
-	public BigDecimal getDistBudgetWorkload() {
-		return this.distBudgetWorkload;
+	public Integer getFileCnt() {
+		return this.fileCnt;
 	}
 	/**
-	 * 实际成本从任务表汇总而来
+	 * 迭代名称
 	 **/
-	public BigDecimal getActCost() {
-		return this.actCost;
+	public String getIterationName() {
+		return this.iterationName;
 	}
 	/**
-	 * 实际工作量从任务表汇总而来
+	 * 统计执行日期
 	 **/
-	public BigDecimal getActWorkload() {
-		return this.actWorkload;
+	public Date getCalcTime() {
+		return this.calcTime;
 	}
 	/**
-	 * 实际投入人员数
+	 * 0-暂时的1稳定的，暂时的可以被覆盖，稳定的不允许覆盖
 	 **/
-	public BigDecimal getActStaffNum() {
-		return this.actStaffNum;
+	public String getCalcStatus() {
+		return this.calcStatus;
 	}
 	/**
-	 * 进度
+	 * 项目阶段计划数
+	 **/
+	public Integer getPhaseCnt() {
+		return this.phaseCnt;
+	}
+	/**
+	 * 项目阶段计划已完成数
+	 **/
+	public Integer getPhaseFinishCnt() {
+		return this.phaseFinishCnt;
+	}
+	/**
+	 * 待付款总金额
+	 **/
+	public BigDecimal getNeedPayAt() {
+		return this.needPayAt;
+	}
+	/**
+	 * 已付款总金额
+	 **/
+	public BigDecimal getFinishPayAt() {
+		return this.finishPayAt;
+	}
+	/**
+	 * 待收款总金额
+	 **/
+	public BigDecimal getNeedColAt() {
+		return this.needColAt;
+	}
+	/**
+	 * 已收款总金额
+	 **/
+	public BigDecimal getFinishColAt() {
+		return this.finishColAt;
+	}
+	/**
+	 * 项目风险总数
+	 **/
+	public Integer getRiskCnt() {
+		return this.riskCnt;
+	}
+	/**
+	 * 已完成风险总数
+	 **/
+	public Integer getRiskFinishCnt() {
+		return this.riskFinishCnt;
+	}
+	/**
+	 * 机构编号
+	 **/
+	public String getBranchId() {
+		return this.branchId;
+	}
+	/**
+	 * 机构名称
+	 **/
+	public String getBranchName() {
+		return this.branchName;
+	}
+	/**
+	 * 项目总非人力预算-来自任务表
+	 **/
+	public BigDecimal getBudgetNouserAt() {
+		return this.budgetNouserAt;
+	}
+	/**
+	 * 项目总外购人力预算-来自任务表
+	 **/
+	public BigDecimal getBudgetOuserAt() {
+		return this.budgetOuserAt;
+	}
+	/**
+	 * 项目总内部人力预算-来自任务表
+	 **/
+	public BigDecimal getBudgetIuserAt() {
+		return this.budgetIuserAt;
+	}
+	/**
+	 * 项目总人力成本
+	 **/
+	public BigDecimal getActUserAt() {
+		return this.actUserAt;
+	}
+	/**
+	 * 项目总内部人力成本金额
+	 **/
+	public BigDecimal getActIuserAt() {
+		return this.actIuserAt;
+	}
+	/**
+	 * 项目总外购人力成本金额
+	 **/
+	public BigDecimal getActOuserAt() {
+		return this.actOuserAt;
+	}
+	/**
+	 * 项目总非人力成本
+	 **/
+	public BigDecimal getActNouserAt() {
+		return this.actNouserAt;
+	}
+	/**
+	 * 项目进度0~100之间，来自任务表
 	 **/
 	public BigDecimal getFinishRate() {
 		return this.finishRate;
 	}
+	/**
+	 * 项目总预算工作量-来自任务表
+	 **/
+	public BigDecimal getBudgetWorkload() {
+		return this.budgetWorkload;
+	}
+	/**
+	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
+	 **/
+	public BigDecimal getBudgetOuserWorkload() {
+		return this.budgetOuserWorkload;
+	}
+	/**
+	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
+	 **/
+	public BigDecimal getBudgetIuserWorkload() {
+		return this.budgetIuserWorkload;
+	}
+	/**
+	 * 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
+	 **/
+	public BigDecimal getEstimateWorkload() {
+		return this.estimateWorkload;
+	}
+	/**
+	 * 已完成工作量-来自计划中实际完成工作量
+	 **/
+	public BigDecimal getActWorkload() {
+		return this.actWorkload;
+	}
+	/**
+	 * 0|初始
+	 **/
+	public String getProjectStatus() {
+		return this.projectStatus;
+	}
+	/**
+	 * 实际外购总工作量，来自任务表
+	 **/
+	public BigDecimal getActOuserWorkload() {
+		return this.actOuserWorkload;
+	}
+	/**
+	 * 实际内部总工作量，来自任务表
+	 **/
+	public BigDecimal getActIuserWorkload() {
+		return this.actIuserWorkload;
+	}
+	/**
+	 * 待付款笔数
+	 **/
+	public BigDecimal getNeedPayCnt() {
+		return this.needPayCnt;
+	}
+	/**
+	 * 完成付款总比数
+	 **/
+	public BigDecimal getFinishPayCnt() {
+		return this.finishPayCnt;
+	}
+	/**
+	 * 已付款总人数
+	 **/
+	public BigDecimal getFinishPayUserCnt() {
+		return this.finishPayUserCnt;
+	}
+	/**
+	 * 待付款总人数
+	 **/
+	public BigDecimal getNeedPayUserCnt() {
+		return this.needPayUserCnt;
+	}
 	/**
 	 * 测试案例总数
 	 **/
@@ -352,118 +874,166 @@ public class XmIterationState  implements java.io.Serializable {
 		return this.finishCases;
 	}
 	/**
-	 * 关联项目数
+	 * 迭代数
 	 **/
-	public Integer getProjectCnt() {
-		return this.projectCnt;
+	public Integer getIterationCnt() {
+		return this.iterationCnt;
 	}
 	/**
-	 * 关联产品数
+	 * 产品数
 	 **/
 	public Integer getProductCnt() {
 		return this.productCnt;
 	}
 	/**
-	 * 关联故事数
+	 * 最早开始日期
+	 **/
+	public Date getMinStartTime() {
+		return this.minStartTime;
+	}
+	/**
+	 * 最晚结束时间
+	 **/
+	public Date getMaxEndTime() {
+		return this.maxEndTime;
+	}
+	/**
+	 * 故事数
 	 **/
 	public Integer getMenuCnt() {
 		return this.menuCnt;
 	}
 	/**
-	 * 关联任务数
+	 * 已完成需求数，2状态需求
+	 **/
+	public Integer getMenuFinishCnt() {
+		return this.menuFinishCnt;
+	}
+	/**
+	 * 执行中需求数，1状态的需求
+	 **/
+	public Integer getMenuExecCnt() {
+		return this.menuExecCnt;
+	}
+	/**
+	 * 未开始需求数，0状态数据
+	 **/
+	public Integer getMenuUnstartCnt() {
+		return this.menuUnstartCnt;
+	}
+	/**
+	 * 已关闭需求数，3状态数据
+	 **/
+	public Integer getMenuCloseCnt() {
+		return this.menuCloseCnt;
+	}
+	/**
+	 * 任务总数
 	 **/
 	public Integer getTaskCnt() {
 		return this.taskCnt;
 	}
 	/**
-	 * 已完成的任务数
+	 * 待开始任务
 	 **/
-	public Integer getFinishTaskCnt() {
-		return this.finishTaskCnt;
+	public Integer getTaskUnstartCnt() {
+		return this.taskUnstartCnt;
 	}
 	/**
-	 * 计算日期
+	 * 执行中任务
 	 **/
-	public Date getCalcTime() {
-		return this.calcTime;
+	public Integer getTaskExecCnt() {
+		return this.taskExecCnt;
 	}
 	/**
-	 * 迭代名称
+	 * 已完成任务总数-来自任务表
 	 **/
-	public String getIterationName() {
-		return this.iterationName;
+	public Integer getTaskFinishCnt() {
+		return this.taskFinishCnt;
 	}
 	/**
-	 * 预算成本
+	 * 已结算任务
 	 **/
-	public BigDecimal getBudgetCost() {
-		return this.budgetCost;
+	public Integer getTaskSetCnt() {
+		return this.taskSetCnt;
 	}
 	/**
-	 * 预算工作量
+	 * 外购任务数，来自任务表
 	 **/
-	public BigDecimal getBudgetWorkload() {
-		return this.budgetWorkload;
+	public BigDecimal getTaskOutCnt() {
+		return this.taskOutCnt;
 	}
 	/**
-	 * 迭代编号
+	 * 已关闭任务
 	 **/
-	public String getIterationId() {
-		return this.iterationId;
+	public Integer getTaskCloseCnt() {
+		return this.taskCloseCnt;
 	}
 	/**
-	 * 业务日期yyyy-MM-dd字符串
+	 * bug数目
 	 **/
-	public String getBizDate() {
-		return this.bizDate;
+	public Integer getBugCnt() {
+		return this.bugCnt;
 	}
 	/**
 	 * 已关闭bug总数
 	 **/
-	public Integer getClosedBugCnt() {
-		return this.closedBugCnt;
+	public Integer getClosedBugs() {
+		return this.closedBugs;
 	}
 	/**
 	 * 已解决bug总数
 	 **/
-	public Integer getResolvedBugCnt() {
-		return this.resolvedBugCnt;
+	public Integer getResolvedBugs() {
+		return this.resolvedBugs;
 	}
 	/**
 	 * 激活的bug总数
 	 **/
-	public Integer getActiveBugCnt() {
-		return this.activeBugCnt;
+	public Integer getActiveBugs() {
+		return this.activeBugs;
 	}
 	/**
 	 * 已解决bug总数
 	 **/
-	public Integer getConfirmedBugCnt() {
-		return this.confirmedBugCnt;
+	public Integer getConfirmedBugs() {
+		return this.confirmedBugs;
 	}
 	/**
-	 * bug总数
+	 * 工期（小时）
 	 **/
-	public Integer getBugCnt() {
-		return this.bugCnt;
+	public BigDecimal getPlanWorkhours() {
+		return this.planWorkhours;
 	}
 	/**
-	 * 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
+	 * 总人数
 	 **/
-	public BigDecimal getEstimateWorkload() {
-		return this.estimateWorkload;
+	public Integer getPlanWorkerCnt() {
+		return this.planWorkerCnt;
 	}
 	/**
-	 * 最早开始日期
+	 * 实际投入人员数
 	 **/
-	public Date getMinStartTime() {
-		return this.minStartTime;
+	public BigDecimal getActWorkerCnt() {
+		return this.actWorkerCnt;
 	}
 	/**
-	 * 最晚结束时间
+	 * 项目数
 	 **/
-	public Date getMaxEndTime() {
-		return this.maxEndTime;
+	public Integer getProjectCnt() {
+		return this.projectCnt;
+	}
+	/**
+	 * 预算总金额
+	 **/
+	public BigDecimal getBudgetAt() {
+		return this.budgetAt;
+	}
+	/**
+	 * 实际总金额
+	 **/
+	public BigDecimal getActAt() {
+		return this.actAt;
 	}
 
 }
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmMenuState.java b/xm-core/src/main/java/com/xm/core/entity/XmMenuState.java
index 9fa3646a..31820e39 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmMenuState.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmMenuState.java
@@ -2,15 +2,15 @@ package  com.xm.core.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmMenuState所有属性名: <br>
- *	menuId,planStartTime,planEndTime,actStartTime,actEndTime,planWorkload,actWorkload,planCostAmount,actCostAmount,finishRate,demandRate,designRate,devRate,uatRate,sitRate,onlineStatus,onlineTime,planStatus,chargeUserid,chargeUsername,menuStatus,ctime,ltime,cuserid,cusername,calcTime,menuName,planWorkhours,planWorkerCnt,closedBugs,activeBugs,confirmedBugs,resolvedBugs,productId,productName,testCases,execCases,designCases,finishCases,projectCnt,iterationCnt,taskCnt,finishTaskCnt,bizDate,bugCnt;<br>
+ *	menuId,finishRate,menuStatus,ctime,calcTime,menuName,planWorkhours,planWorkerCnt,closedBugs,activeBugs,confirmedBugs,resolvedBugs,productId,testCases,execCases,designCases,finishCases,bizDate,bugCnt,taskCnt,taskUnstartCnt,taskExecCnt,taskFinishCnt,taskSetCnt,taskOutCnt,taskCloseCnt,budgetNouserAt,budgetOuserAt,budgetIuserAt,actUserAt,actIuserAt,actOuserAt,actNouserAt,budgetWorkload,budgetOuserWorkload,budgetIuserWorkload,actWorkload,actOuserWorkload,actIuserWorkload,estimateWorkload,budgetAt,actAt,minStartTime,maxEndTime,productCnt,iterationCnt,projectCnt;<br>
  * 表 xm_menu_state 功能状态表,无需前端维护，所有数据由汇总统计得出的所有字段名: <br>
- *	menu_id,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,online_status,online_time,plan_status,charge_userid,charge_username,menu_status,ctime,ltime,cuserid,cusername,calc_time,menu_name,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,bug_cnt;<br>
+ *	menu_id,finish_rate,menu_status,ctime,calc_time,menu_name,plan_workhours,plan_worker_cnt,closed_bugs,active_bugs,confirmed_bugs,resolved_bugs,product_id,test_cases,exec_cases,design_cases,finish_cases,biz_date,bug_cnt,task_cnt,task_unstart_cnt,task_exec_cnt,task_finish_cnt,task_set_cnt,task_out_cnt,task_close_cnt,budget_nouser_at,budget_ouser_at,budget_iuser_at,act_user_at,act_iuser_at,act_ouser_at,act_nouser_at,budget_workload,budget_ouser_workload,budget_iuser_workload,act_workload,act_ouser_workload,act_iuser_workload,estimate_workload,budget_at,act_at,min_start_time,max_end_time,product_cnt,iteration_cnt,project_cnt;<br>
  * 当前主键(包括多主键):<br>
  *	menu_id;<br>
  */
@@ -23,78 +23,15 @@ public class XmMenuState  implements java.io.Serializable {
 	String menuId;
   	
 	
-	@ApiModelProperty(notes="开始时间",allowEmptyValue=true,example="",allowableValues="")
-	Date planStartTime;
-	
-	@ApiModelProperty(notes="结束时间",allowEmptyValue=true,example="",allowableValues="")
-	Date planEndTime;
-	
-	@ApiModelProperty(notes="实际开始时间",allowEmptyValue=true,example="",allowableValues="")
-	Date actStartTime;
-	
-	@ApiModelProperty(notes="实际结束时间",allowEmptyValue=true,example="",allowableValues="")
-	Date actEndTime;
-	
-	@ApiModelProperty(notes="计划工作量，根据关联任务汇总",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal planWorkload;
-	
-	@ApiModelProperty(notes="实际工作量，根据关联任务汇总",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal actWorkload;
-	
-	@ApiModelProperty(notes="计划成本，根据关联任务汇总",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal planCostAmount;
-	
-	@ApiModelProperty(notes="实际成本金额根据关联任务汇总",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal actCostAmount;
-	
 	@ApiModelProperty(notes="总体完成比例0-100之间,根据taskType进行汇总",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal finishRate;
 	
-	@ApiModelProperty(notes="需求完成率0-100之间,根据taskType进行汇总",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal demandRate;
-	
-	@ApiModelProperty(notes="设计完成率0-100之间,根据taskType进行汇总",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal designRate;
-	
-	@ApiModelProperty(notes="开发完成率0-100之间,根据taskType进行汇总",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal devRate;
-	
-	@ApiModelProperty(notes="uat测试完成率0-100之间,根据taskType进行汇总",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal uatRate;
-	
-	@ApiModelProperty(notes="sit测试完成率0-100之间,根据taskType进行汇总",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal sitRate;
-	
-	@ApiModelProperty(notes="上线状态0未上线1上线成功",allowEmptyValue=true,example="",allowableValues="")
-	String onlineStatus;
-	
-	@ApiModelProperty(notes="上线时间",allowEmptyValue=true,example="",allowableValues="")
-	Date onlineTime;
-	
-	@ApiModelProperty(notes="计划状态0初始1正常2暂停3延误4结束5关闭",allowEmptyValue=true,example="",allowableValues="")
-	String planStatus;
-	
-	@ApiModelProperty(notes="负责人编号",allowEmptyValue=true,example="",allowableValues="")
-	String chargeUserid;
-	
-	@ApiModelProperty(notes="负责人姓名",allowEmptyValue=true,example="",allowableValues="")
-	String chargeUsername;
-	
 	@ApiModelProperty(notes="状态0初始1设计中2开发中3测试中4uat测试2已上线3已下线4已删除",allowEmptyValue=true,example="",allowableValues="")
 	String menuStatus;
 	
 	@ApiModelProperty(notes="创建时间",allowEmptyValue=true,example="",allowableValues="")
 	Date ctime;
 	
-	@ApiModelProperty(notes="更新时间",allowEmptyValue=true,example="",allowableValues="")
-	Date ltime;
-	
-	@ApiModelProperty(notes="创建人编号",allowEmptyValue=true,example="",allowableValues="")
-	String cuserid;
-	
-	@ApiModelProperty(notes="创建人姓名",allowEmptyValue=true,example="",allowableValues="")
-	String cusername;
-	
 	@ApiModelProperty(notes="汇总时间",allowEmptyValue=true,example="",allowableValues="")
 	Date calcTime;
 	
@@ -122,9 +59,6 @@ public class XmMenuState  implements java.io.Serializable {
 	@ApiModelProperty(notes="产品编号",allowEmptyValue=true,example="",allowableValues="")
 	String productId;
 	
-	@ApiModelProperty(notes="产品名称",allowEmptyValue=true,example="",allowableValues="")
-	String productName;
-	
 	@ApiModelProperty(notes="测试案例总数",allowEmptyValue=true,example="",allowableValues="")
 	Integer testCases;
 	
@@ -137,23 +71,95 @@ public class XmMenuState  implements java.io.Serializable {
 	@ApiModelProperty(notes="完成案例总数",allowEmptyValue=true,example="",allowableValues="")
 	Integer finishCases;
 	
-	@ApiModelProperty(notes="关联项目数",allowEmptyValue=true,example="",allowableValues="")
-	Integer projectCnt;
+	@ApiModelProperty(notes="业务日期yyyy-MM-dd字符串",allowEmptyValue=true,example="",allowableValues="")
+	String bizDate;
 	
-	@ApiModelProperty(notes="关联迭代数",allowEmptyValue=true,example="",allowableValues="")
-	Integer iterationCnt;
+	@ApiModelProperty(notes="bug总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer bugCnt;
 	
-	@ApiModelProperty(notes="任务数",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="任务总数",allowEmptyValue=true,example="",allowableValues="")
 	Integer taskCnt;
 	
-	@ApiModelProperty(notes="完成的任务数",allowEmptyValue=true,example="",allowableValues="")
-	Integer finishTaskCnt;
+	@ApiModelProperty(notes="待开始任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskUnstartCnt;
 	
-	@ApiModelProperty(notes="业务日期yyyy-MM-dd字符串",allowEmptyValue=true,example="",allowableValues="")
-	String bizDate;
+	@ApiModelProperty(notes="执行中任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskExecCnt;
 	
-	@ApiModelProperty(notes="bug总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer bugCnt;
+	@ApiModelProperty(notes="已完成任务总数-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskFinishCnt;
+	
+	@ApiModelProperty(notes="已结算任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskSetCnt;
+	
+	@ApiModelProperty(notes="外购任务数，来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal taskOutCnt;
+	
+	@ApiModelProperty(notes="已关闭任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskCloseCnt;
+	
+	@ApiModelProperty(notes="项目总非人力预算-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetNouserAt;
+	
+	@ApiModelProperty(notes="项目总外购人力预算-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetOuserAt;
+	
+	@ApiModelProperty(notes="项目总内部人力预算-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetIuserAt;
+	
+	@ApiModelProperty(notes="项目总人力成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actUserAt;
+	
+	@ApiModelProperty(notes="项目总内部人力成本金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actIuserAt;
+	
+	@ApiModelProperty(notes="项目总外购人力成本金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actOuserAt;
+	
+	@ApiModelProperty(notes="项目总非人力成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actNouserAt;
+	
+	@ApiModelProperty(notes="项目总预算工作量-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetWorkload;
+	
+	@ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetOuserWorkload;
+	
+	@ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetIuserWorkload;
+	
+	@ApiModelProperty(notes="已完成工作量-来自计划中实际完成工作量",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actWorkload;
+	
+	@ApiModelProperty(notes="实际外购总工作量，来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actOuserWorkload;
+	
+	@ApiModelProperty(notes="实际内部总工作量，来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actIuserWorkload;
+	
+	@ApiModelProperty(notes="预估工时",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal estimateWorkload;
+	
+	@ApiModelProperty(notes="预算金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetAt;
+	
+	@ApiModelProperty(notes="实际金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actAt;
+	
+	@ApiModelProperty(notes="最早开始日期",allowEmptyValue=true,example="",allowableValues="")
+	Date minStartTime;
+	
+	@ApiModelProperty(notes="最晚结束时间",allowEmptyValue=true,example="",allowableValues="")
+	Date maxEndTime;
+	
+	@ApiModelProperty(notes="关联产品数（主要是指子节点关联）",allowEmptyValue=true,example="",allowableValues="")
+	Integer productCnt;
+	
+	@ApiModelProperty(notes="关联迭代数（主要是指子节点关联）",allowEmptyValue=true,example="",allowableValues="")
+	Integer iterationCnt;
+	
+	@ApiModelProperty(notes="关联项目数（主要是指子节点关联）",allowEmptyValue=true,example="",allowableValues="")
+	Integer projectCnt;
 
 	/**功能编号**/
 	public XmMenuState(String menuId) {
@@ -170,120 +176,12 @@ public class XmMenuState  implements java.io.Serializable {
 	public void setMenuId(String menuId) {
 		this.menuId = menuId;
 	}
-	/**
-	 * 开始时间
-	 **/
-	public void setPlanStartTime(Date planStartTime) {
-		this.planStartTime = planStartTime;
-	}
-	/**
-	 * 结束时间
-	 **/
-	public void setPlanEndTime(Date planEndTime) {
-		this.planEndTime = planEndTime;
-	}
-	/**
-	 * 实际开始时间
-	 **/
-	public void setActStartTime(Date actStartTime) {
-		this.actStartTime = actStartTime;
-	}
-	/**
-	 * 实际结束时间
-	 **/
-	public void setActEndTime(Date actEndTime) {
-		this.actEndTime = actEndTime;
-	}
-	/**
-	 * 计划工作量，根据关联任务汇总
-	 **/
-	public void setPlanWorkload(BigDecimal planWorkload) {
-		this.planWorkload = planWorkload;
-	}
-	/**
-	 * 实际工作量，根据关联任务汇总
-	 **/
-	public void setActWorkload(BigDecimal actWorkload) {
-		this.actWorkload = actWorkload;
-	}
-	/**
-	 * 计划成本，根据关联任务汇总
-	 **/
-	public void setPlanCostAmount(BigDecimal planCostAmount) {
-		this.planCostAmount = planCostAmount;
-	}
-	/**
-	 * 实际成本金额根据关联任务汇总
-	 **/
-	public void setActCostAmount(BigDecimal actCostAmount) {
-		this.actCostAmount = actCostAmount;
-	}
 	/**
 	 * 总体完成比例0-100之间,根据taskType进行汇总
 	 **/
 	public void setFinishRate(BigDecimal finishRate) {
 		this.finishRate = finishRate;
 	}
-	/**
-	 * 需求完成率0-100之间,根据taskType进行汇总
-	 **/
-	public void setDemandRate(BigDecimal demandRate) {
-		this.demandRate = demandRate;
-	}
-	/**
-	 * 设计完成率0-100之间,根据taskType进行汇总
-	 **/
-	public void setDesignRate(BigDecimal designRate) {
-		this.designRate = designRate;
-	}
-	/**
-	 * 开发完成率0-100之间,根据taskType进行汇总
-	 **/
-	public void setDevRate(BigDecimal devRate) {
-		this.devRate = devRate;
-	}
-	/**
-	 * uat测试完成率0-100之间,根据taskType进行汇总
-	 **/
-	public void setUatRate(BigDecimal uatRate) {
-		this.uatRate = uatRate;
-	}
-	/**
-	 * sit测试完成率0-100之间,根据taskType进行汇总
-	 **/
-	public void setSitRate(BigDecimal sitRate) {
-		this.sitRate = sitRate;
-	}
-	/**
-	 * 上线状态0未上线1上线成功
-	 **/
-	public void setOnlineStatus(String onlineStatus) {
-		this.onlineStatus = onlineStatus;
-	}
-	/**
-	 * 上线时间
-	 **/
-	public void setOnlineTime(Date onlineTime) {
-		this.onlineTime = onlineTime;
-	}
-	/**
-	 * 计划状态0初始1正常2暂停3延误4结束5关闭
-	 **/
-	public void setPlanStatus(String planStatus) {
-		this.planStatus = planStatus;
-	}
-	/**
-	 * 负责人编号
-	 **/
-	public void setChargeUserid(String chargeUserid) {
-		this.chargeUserid = chargeUserid;
-	}
-	/**
-	 * 负责人姓名
-	 **/
-	public void setChargeUsername(String chargeUsername) {
-		this.chargeUsername = chargeUsername;
-	}
 	/**
 	 * 状态0初始1设计中2开发中3测试中4uat测试2已上线3已下线4已删除
 	 **/
@@ -296,24 +194,6 @@ public class XmMenuState  implements java.io.Serializable {
 	public void setCtime(Date ctime) {
 		this.ctime = ctime;
 	}
-	/**
-	 * 更新时间
-	 **/
-	public void setLtime(Date ltime) {
-		this.ltime = ltime;
-	}
-	/**
-	 * 创建人编号
-	 **/
-	public void setCuserid(String cuserid) {
-		this.cuserid = cuserid;
-	}
-	/**
-	 * 创建人姓名
-	 **/
-	public void setCusername(String cusername) {
-		this.cusername = cusername;
-	}
 	/**
 	 * 汇总时间
 	 **/
@@ -368,12 +248,6 @@ public class XmMenuState  implements java.io.Serializable {
 	public void setProductId(String productId) {
 		this.productId = productId;
 	}
-	/**
-	 * 产品名称
-	 **/
-	public void setProductName(String productName) {
-		this.productName = productName;
-	}
 	/**
 	 * 测试案例总数
 	 **/
@@ -399,191 +273,209 @@ public class XmMenuState  implements java.io.Serializable {
 		this.finishCases = finishCases;
 	}
 	/**
-	 * 关联项目数
+	 * 业务日期yyyy-MM-dd字符串
 	 **/
-	public void setProjectCnt(Integer projectCnt) {
-		this.projectCnt = projectCnt;
+	public void setBizDate(String bizDate) {
+		this.bizDate = bizDate;
 	}
 	/**
-	 * 关联迭代数
+	 * bug总数
 	 **/
-	public void setIterationCnt(Integer iterationCnt) {
-		this.iterationCnt = iterationCnt;
+	public void setBugCnt(Integer bugCnt) {
+		this.bugCnt = bugCnt;
 	}
 	/**
-	 * 任务数
+	 * 任务总数
 	 **/
 	public void setTaskCnt(Integer taskCnt) {
 		this.taskCnt = taskCnt;
 	}
 	/**
-	 * 完成的任务数
+	 * 待开始任务
 	 **/
-	public void setFinishTaskCnt(Integer finishTaskCnt) {
-		this.finishTaskCnt = finishTaskCnt;
+	public void setTaskUnstartCnt(Integer taskUnstartCnt) {
+		this.taskUnstartCnt = taskUnstartCnt;
 	}
 	/**
-	 * 业务日期yyyy-MM-dd字符串
+	 * 执行中任务
 	 **/
-	public void setBizDate(String bizDate) {
-		this.bizDate = bizDate;
+	public void setTaskExecCnt(Integer taskExecCnt) {
+		this.taskExecCnt = taskExecCnt;
 	}
 	/**
-	 * bug总数
+	 * 已完成任务总数-来自任务表
 	 **/
-	public void setBugCnt(Integer bugCnt) {
-		this.bugCnt = bugCnt;
+	public void setTaskFinishCnt(Integer taskFinishCnt) {
+		this.taskFinishCnt = taskFinishCnt;
 	}
-	
 	/**
-	 * 功能编号
+	 * 已结算任务
 	 **/
-	public String getMenuId() {
-		return this.menuId;
+	public void setTaskSetCnt(Integer taskSetCnt) {
+		this.taskSetCnt = taskSetCnt;
 	}
 	/**
-	 * 开始时间
+	 * 外购任务数，来自任务表
 	 **/
-	public Date getPlanStartTime() {
-		return this.planStartTime;
+	public void setTaskOutCnt(BigDecimal taskOutCnt) {
+		this.taskOutCnt = taskOutCnt;
 	}
 	/**
-	 * 结束时间
+	 * 已关闭任务
 	 **/
-	public Date getPlanEndTime() {
-		return this.planEndTime;
+	public void setTaskCloseCnt(Integer taskCloseCnt) {
+		this.taskCloseCnt = taskCloseCnt;
 	}
 	/**
-	 * 实际开始时间
+	 * 项目总非人力预算-来自任务表
 	 **/
-	public Date getActStartTime() {
-		return this.actStartTime;
+	public void setBudgetNouserAt(BigDecimal budgetNouserAt) {
+		this.budgetNouserAt = budgetNouserAt;
 	}
 	/**
-	 * 实际结束时间
+	 * 项目总外购人力预算-来自任务表
 	 **/
-	public Date getActEndTime() {
-		return this.actEndTime;
+	public void setBudgetOuserAt(BigDecimal budgetOuserAt) {
+		this.budgetOuserAt = budgetOuserAt;
 	}
 	/**
-	 * 计划工作量，根据关联任务汇总
+	 * 项目总内部人力预算-来自任务表
 	 **/
-	public BigDecimal getPlanWorkload() {
-		return this.planWorkload;
+	public void setBudgetIuserAt(BigDecimal budgetIuserAt) {
+		this.budgetIuserAt = budgetIuserAt;
 	}
 	/**
-	 * 实际工作量，根据关联任务汇总
+	 * 项目总人力成本
 	 **/
-	public BigDecimal getActWorkload() {
-		return this.actWorkload;
+	public void setActUserAt(BigDecimal actUserAt) {
+		this.actUserAt = actUserAt;
 	}
 	/**
-	 * 计划成本，根据关联任务汇总
+	 * 项目总内部人力成本金额
 	 **/
-	public BigDecimal getPlanCostAmount() {
-		return this.planCostAmount;
+	public void setActIuserAt(BigDecimal actIuserAt) {
+		this.actIuserAt = actIuserAt;
 	}
 	/**
-	 * 实际成本金额根据关联任务汇总
+	 * 项目总外购人力成本金额
 	 **/
-	public BigDecimal getActCostAmount() {
-		return this.actCostAmount;
+	public void setActOuserAt(BigDecimal actOuserAt) {
+		this.actOuserAt = actOuserAt;
 	}
 	/**
-	 * 总体完成比例0-100之间,根据taskType进行汇总
+	 * 项目总非人力成本
 	 **/
-	public BigDecimal getFinishRate() {
-		return this.finishRate;
+	public void setActNouserAt(BigDecimal actNouserAt) {
+		this.actNouserAt = actNouserAt;
 	}
 	/**
-	 * 需求完成率0-100之间,根据taskType进行汇总
+	 * 项目总预算工作量-来自任务表
 	 **/
-	public BigDecimal getDemandRate() {
-		return this.demandRate;
+	public void setBudgetWorkload(BigDecimal budgetWorkload) {
+		this.budgetWorkload = budgetWorkload;
 	}
 	/**
-	 * 设计完成率0-100之间,根据taskType进行汇总
+	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
 	 **/
-	public BigDecimal getDesignRate() {
-		return this.designRate;
+	public void setBudgetOuserWorkload(BigDecimal budgetOuserWorkload) {
+		this.budgetOuserWorkload = budgetOuserWorkload;
 	}
 	/**
-	 * 开发完成率0-100之间,根据taskType进行汇总
+	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
 	 **/
-	public BigDecimal getDevRate() {
-		return this.devRate;
+	public void setBudgetIuserWorkload(BigDecimal budgetIuserWorkload) {
+		this.budgetIuserWorkload = budgetIuserWorkload;
 	}
 	/**
-	 * uat测试完成率0-100之间,根据taskType进行汇总
+	 * 已完成工作量-来自计划中实际完成工作量
 	 **/
-	public BigDecimal getUatRate() {
-		return this.uatRate;
+	public void setActWorkload(BigDecimal actWorkload) {
+		this.actWorkload = actWorkload;
 	}
 	/**
-	 * sit测试完成率0-100之间,根据taskType进行汇总
+	 * 实际外购总工作量，来自任务表
 	 **/
-	public BigDecimal getSitRate() {
-		return this.sitRate;
+	public void setActOuserWorkload(BigDecimal actOuserWorkload) {
+		this.actOuserWorkload = actOuserWorkload;
 	}
 	/**
-	 * 上线状态0未上线1上线成功
+	 * 实际内部总工作量，来自任务表
 	 **/
-	public String getOnlineStatus() {
-		return this.onlineStatus;
+	public void setActIuserWorkload(BigDecimal actIuserWorkload) {
+		this.actIuserWorkload = actIuserWorkload;
 	}
 	/**
-	 * 上线时间
+	 * 预估工时
 	 **/
-	public Date getOnlineTime() {
-		return this.onlineTime;
+	public void setEstimateWorkload(BigDecimal estimateWorkload) {
+		this.estimateWorkload = estimateWorkload;
 	}
 	/**
-	 * 计划状态0初始1正常2暂停3延误4结束5关闭
+	 * 预算金额
 	 **/
-	public String getPlanStatus() {
-		return this.planStatus;
+	public void setBudgetAt(BigDecimal budgetAt) {
+		this.budgetAt = budgetAt;
 	}
 	/**
-	 * 负责人编号
+	 * 实际金额
 	 **/
-	public String getChargeUserid() {
-		return this.chargeUserid;
+	public void setActAt(BigDecimal actAt) {
+		this.actAt = actAt;
 	}
 	/**
-	 * 负责人姓名
+	 * 最早开始日期
 	 **/
-	public String getChargeUsername() {
-		return this.chargeUsername;
+	public void setMinStartTime(Date minStartTime) {
+		this.minStartTime = minStartTime;
 	}
 	/**
-	 * 状态0初始1设计中2开发中3测试中4uat测试2已上线3已下线4已删除
+	 * 最晚结束时间
 	 **/
-	public String getMenuStatus() {
-		return this.menuStatus;
+	public void setMaxEndTime(Date maxEndTime) {
+		this.maxEndTime = maxEndTime;
 	}
 	/**
-	 * 创建时间
+	 * 关联产品数（主要是指子节点关联）
 	 **/
-	public Date getCtime() {
-		return this.ctime;
+	public void setProductCnt(Integer productCnt) {
+		this.productCnt = productCnt;
+	}
+	/**
+	 * 关联迭代数（主要是指子节点关联）
+	 **/
+	public void setIterationCnt(Integer iterationCnt) {
+		this.iterationCnt = iterationCnt;
+	}
+	/**
+	 * 关联项目数（主要是指子节点关联）
+	 **/
+	public void setProjectCnt(Integer projectCnt) {
+		this.projectCnt = projectCnt;
+	}
+	
+	/**
+	 * 功能编号
+	 **/
+	public String getMenuId() {
+		return this.menuId;
 	}
 	/**
-	 * 更新时间
+	 * 总体完成比例0-100之间,根据taskType进行汇总
 	 **/
-	public Date getLtime() {
-		return this.ltime;
+	public BigDecimal getFinishRate() {
+		return this.finishRate;
 	}
 	/**
-	 * 创建人编号
+	 * 状态0初始1设计中2开发中3测试中4uat测试2已上线3已下线4已删除
 	 **/
-	public String getCuserid() {
-		return this.cuserid;
+	public String getMenuStatus() {
+		return this.menuStatus;
 	}
 	/**
-	 * 创建人姓名
+	 * 创建时间
 	 **/
-	public String getCusername() {
-		return this.cusername;
+	public Date getCtime() {
+		return this.ctime;
 	}
 	/**
 	 * 汇总时间
@@ -639,12 +531,6 @@ public class XmMenuState  implements java.io.Serializable {
 	public String getProductId() {
 		return this.productId;
 	}
-	/**
-	 * 产品名称
-	 **/
-	public String getProductName() {
-		return this.productName;
-	}
 	/**
 	 * 测试案例总数
 	 **/
@@ -670,40 +556,184 @@ public class XmMenuState  implements java.io.Serializable {
 		return this.finishCases;
 	}
 	/**
-	 * 关联项目数
+	 * 业务日期yyyy-MM-dd字符串
 	 **/
-	public Integer getProjectCnt() {
-		return this.projectCnt;
+	public String getBizDate() {
+		return this.bizDate;
 	}
 	/**
-	 * 关联迭代数
+	 * bug总数
 	 **/
-	public Integer getIterationCnt() {
-		return this.iterationCnt;
+	public Integer getBugCnt() {
+		return this.bugCnt;
 	}
 	/**
-	 * 任务数
+	 * 任务总数
 	 **/
 	public Integer getTaskCnt() {
 		return this.taskCnt;
 	}
 	/**
-	 * 完成的任务数
+	 * 待开始任务
 	 **/
-	public Integer getFinishTaskCnt() {
-		return this.finishTaskCnt;
+	public Integer getTaskUnstartCnt() {
+		return this.taskUnstartCnt;
 	}
 	/**
-	 * 业务日期yyyy-MM-dd字符串
+	 * 执行中任务
 	 **/
-	public String getBizDate() {
-		return this.bizDate;
+	public Integer getTaskExecCnt() {
+		return this.taskExecCnt;
 	}
 	/**
-	 * bug总数
+	 * 已完成任务总数-来自任务表
 	 **/
-	public Integer getBugCnt() {
-		return this.bugCnt;
+	public Integer getTaskFinishCnt() {
+		return this.taskFinishCnt;
+	}
+	/**
+	 * 已结算任务
+	 **/
+	public Integer getTaskSetCnt() {
+		return this.taskSetCnt;
+	}
+	/**
+	 * 外购任务数，来自任务表
+	 **/
+	public BigDecimal getTaskOutCnt() {
+		return this.taskOutCnt;
+	}
+	/**
+	 * 已关闭任务
+	 **/
+	public Integer getTaskCloseCnt() {
+		return this.taskCloseCnt;
+	}
+	/**
+	 * 项目总非人力预算-来自任务表
+	 **/
+	public BigDecimal getBudgetNouserAt() {
+		return this.budgetNouserAt;
+	}
+	/**
+	 * 项目总外购人力预算-来自任务表
+	 **/
+	public BigDecimal getBudgetOuserAt() {
+		return this.budgetOuserAt;
+	}
+	/**
+	 * 项目总内部人力预算-来自任务表
+	 **/
+	public BigDecimal getBudgetIuserAt() {
+		return this.budgetIuserAt;
+	}
+	/**
+	 * 项目总人力成本
+	 **/
+	public BigDecimal getActUserAt() {
+		return this.actUserAt;
+	}
+	/**
+	 * 项目总内部人力成本金额
+	 **/
+	public BigDecimal getActIuserAt() {
+		return this.actIuserAt;
+	}
+	/**
+	 * 项目总外购人力成本金额
+	 **/
+	public BigDecimal getActOuserAt() {
+		return this.actOuserAt;
+	}
+	/**
+	 * 项目总非人力成本
+	 **/
+	public BigDecimal getActNouserAt() {
+		return this.actNouserAt;
+	}
+	/**
+	 * 项目总预算工作量-来自任务表
+	 **/
+	public BigDecimal getBudgetWorkload() {
+		return this.budgetWorkload;
+	}
+	/**
+	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
+	 **/
+	public BigDecimal getBudgetOuserWorkload() {
+		return this.budgetOuserWorkload;
+	}
+	/**
+	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
+	 **/
+	public BigDecimal getBudgetIuserWorkload() {
+		return this.budgetIuserWorkload;
+	}
+	/**
+	 * 已完成工作量-来自计划中实际完成工作量
+	 **/
+	public BigDecimal getActWorkload() {
+		return this.actWorkload;
+	}
+	/**
+	 * 实际外购总工作量，来自任务表
+	 **/
+	public BigDecimal getActOuserWorkload() {
+		return this.actOuserWorkload;
+	}
+	/**
+	 * 实际内部总工作量，来自任务表
+	 **/
+	public BigDecimal getActIuserWorkload() {
+		return this.actIuserWorkload;
+	}
+	/**
+	 * 预估工时
+	 **/
+	public BigDecimal getEstimateWorkload() {
+		return this.estimateWorkload;
+	}
+	/**
+	 * 预算金额
+	 **/
+	public BigDecimal getBudgetAt() {
+		return this.budgetAt;
+	}
+	/**
+	 * 实际金额
+	 **/
+	public BigDecimal getActAt() {
+		return this.actAt;
+	}
+	/**
+	 * 最早开始日期
+	 **/
+	public Date getMinStartTime() {
+		return this.minStartTime;
+	}
+	/**
+	 * 最晚结束时间
+	 **/
+	public Date getMaxEndTime() {
+		return this.maxEndTime;
+	}
+	/**
+	 * 关联产品数（主要是指子节点关联）
+	 **/
+	public Integer getProductCnt() {
+		return this.productCnt;
+	}
+	/**
+	 * 关联迭代数（主要是指子节点关联）
+	 **/
+	public Integer getIterationCnt() {
+		return this.iterationCnt;
+	}
+	/**
+	 * 关联项目数（主要是指子节点关联）
+	 **/
+	public Integer getProjectCnt() {
+		return this.projectCnt;
 	}
 
 }
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProductState.java b/xm-core/src/main/java/com/xm/core/entity/XmProductState.java
index 41fb3454..b9f3fb93 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProductState.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProductState.java
@@ -8,13 +8,13 @@ import java.math.BigDecimal;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <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,menuFinishCnt,estimateWorkload;<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,menu_finish_cnt,estimate_workload;<br>
+ *	productId,bizDate,fileCnt,productName,calcTime,calcStatus,phaseCnt,phaseFinishCnt,needPayAt,finishPayAt,needColAt,finishColAt,riskCnt,riskFinishCnt,branchId,branchName,budgetNouserAt,budgetOuserAt,budgetIuserAt,actUserAt,actIuserAt,actOuserAt,actNouserAt,finishRate,budgetWorkload,budgetOuserWorkload,budgetIuserWorkload,estimateWorkload,actWorkload,projectStatus,actOuserWorkload,actIuserWorkload,needPayCnt,finishPayCnt,finishPayUserCnt,needPayUserCnt,testCases,execCases,designCases,finishCases,iterationCnt,productCnt,minStartTime,maxEndTime,menuCnt,menuFinishCnt,menuExecCnt,menuUnstartCnt,menuCloseCnt,taskCnt,taskUnstartCnt,taskExecCnt,taskFinishCnt,taskSetCnt,taskOutCnt,taskCloseCnt,bugCnt,closedBugs,resolvedBugs,activeBugs,confirmedBugs,planWorkhours,planWorkerCnt,actWorkerCnt,projectCnt,budgetAt,actAt;<br>
+ * 表 xm_product_state 项目指标日统计表的所有字段名: <br>
+ *	product_id,biz_date,file_cnt,product_name,calc_time,calc_status,phase_cnt,phase_finish_cnt,need_pay_at,finish_pay_at,need_col_at,finish_col_at,risk_cnt,risk_finish_cnt,branch_id,branch_name,budget_nouser_at,budget_ouser_at,budget_iuser_at,act_user_at,act_iuser_at,act_ouser_at,act_nouser_at,finish_rate,budget_workload,budget_ouser_workload,budget_iuser_workload,estimate_workload,act_workload,project_status,act_ouser_workload,act_iuser_workload,need_pay_cnt,finish_pay_cnt,finish_pay_user_cnt,need_pay_user_cnt,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,min_start_time,max_end_time,menu_cnt,menu_finish_cnt,menu_exec_cnt,menu_unstart_cnt,menu_close_cnt,task_cnt,task_unstart_cnt,task_exec_cnt,task_finish_cnt,task_set_cnt,task_out_cnt,task_close_cnt,bug_cnt,closed_bugs,resolved_bugs,active_bugs,confirmed_bugs,plan_workhours,plan_worker_cnt,act_worker_cnt,project_cnt,budget_at,act_at;<br>
  * 当前主键(包括多主键):<br>
  *	product_id;<br>
  */
-@ApiModel(description="功能状态表,无需前端维护，所有数据由汇总统计得出")
+@ApiModel(description="项目指标日统计表")
 public class XmProductState  implements java.io.Serializable {
 	
 	private static final long serialVersionUID = 1L;
@@ -23,83 +23,110 @@ public class XmProductState  implements java.io.Serializable {
 	String productId;
   	
 	
-	@ApiModelProperty(notes="开始时间",allowEmptyValue=true,example="",allowableValues="")
-	Date planStartTime;
+	@ApiModelProperty(notes="统计日期yyyy-mm-dd类型",allowEmptyValue=true,example="",allowableValues="")
+	String bizDate;
 	
-	@ApiModelProperty(notes="结束时间",allowEmptyValue=true,example="",allowableValues="")
-	Date planEndTime;
+	@ApiModelProperty(notes="文件数据",allowEmptyValue=true,example="",allowableValues="")
+	Integer fileCnt;
 	
-	@ApiModelProperty(notes="实际开始时间",allowEmptyValue=true,example="",allowableValues="")
-	Date actStartTime;
+	@ApiModelProperty(notes="产品名称",allowEmptyValue=true,example="",allowableValues="")
+	String productName;
 	
-	@ApiModelProperty(notes="实际结束时间",allowEmptyValue=true,example="",allowableValues="")
-	Date actEndTime;
+	@ApiModelProperty(notes="统计执行日期",allowEmptyValue=true,example="",allowableValues="")
+	Date calcTime;
 	
-	@ApiModelProperty(notes="计划工作量，根据关联任务汇总",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal planWorkload;
+	@ApiModelProperty(notes="0-暂时的1稳定的，暂时的可以被覆盖，稳定的不允许覆盖",allowEmptyValue=true,example="",allowableValues="")
+	String calcStatus;
 	
-	@ApiModelProperty(notes="实际工作量，根据关联任务汇总",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal actWorkload;
+	@ApiModelProperty(notes="项目阶段计划数",allowEmptyValue=true,example="",allowableValues="")
+	Integer phaseCnt;
 	
-	@ApiModelProperty(notes="计划成本，根据关联任务汇总",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal planCostAmount;
+	@ApiModelProperty(notes="项目阶段计划已完成数",allowEmptyValue=true,example="",allowableValues="")
+	Integer phaseFinishCnt;
 	
-	@ApiModelProperty(notes="实际成本金额根据关联任务汇总",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal actCostAmount;
+	@ApiModelProperty(notes="待付款总金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal needPayAt;
 	
-	@ApiModelProperty(notes="总体完成比例0-100之间,根据taskType进行汇总",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal finishRate;
+	@ApiModelProperty(notes="已付款总金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal finishPayAt;
 	
-	@ApiModelProperty(notes="需求完成率0-100之间,根据taskType进行汇总",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal demandRate;
+	@ApiModelProperty(notes="待收款总金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal needColAt;
 	
-	@ApiModelProperty(notes="设计完成率0-100之间,根据taskType进行汇总",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal designRate;
+	@ApiModelProperty(notes="已收款总金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal finishColAt;
 	
-	@ApiModelProperty(notes="开发完成率0-100之间,根据taskType进行汇总",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal devRate;
+	@ApiModelProperty(notes="项目风险总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer riskCnt;
 	
-	@ApiModelProperty(notes="uat测试完成率0-100之间,根据taskType进行汇总",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal uatRate;
+	@ApiModelProperty(notes="已完成风险总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer riskFinishCnt;
 	
-	@ApiModelProperty(notes="sit测试完成率0-100之间,根据taskType进行汇总",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal sitRate;
+	@ApiModelProperty(notes="机构编号",allowEmptyValue=true,example="",allowableValues="")
+	String branchId;
 	
-	@ApiModelProperty(notes="创建时间",allowEmptyValue=true,example="",allowableValues="")
-	Date ctime;
+	@ApiModelProperty(notes="机构名称",allowEmptyValue=true,example="",allowableValues="")
+	String branchName;
 	
-	@ApiModelProperty(notes="更新时间",allowEmptyValue=true,example="",allowableValues="")
-	Date ltime;
+	@ApiModelProperty(notes="项目总非人力预算-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetNouserAt;
 	
-	@ApiModelProperty(notes="创建人编号",allowEmptyValue=true,example="",allowableValues="")
-	String cuserid;
+	@ApiModelProperty(notes="项目总外购人力预算-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetOuserAt;
 	
-	@ApiModelProperty(notes="创建人姓名",allowEmptyValue=true,example="",allowableValues="")
-	String cusername;
+	@ApiModelProperty(notes="项目总内部人力预算-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetIuserAt;
 	
-	@ApiModelProperty(notes="汇总时间",allowEmptyValue=true,example="",allowableValues="")
-	Date calcTime;
+	@ApiModelProperty(notes="项目总人力成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actUserAt;
 	
-	@ApiModelProperty(notes="工时数",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal planWorkhours;
+	@ApiModelProperty(notes="项目总内部人力成本金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actIuserAt;
 	
-	@ApiModelProperty(notes="总人数",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal planWorkerCnt;
+	@ApiModelProperty(notes="项目总外购人力成本金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actOuserAt;
 	
-	@ApiModelProperty(notes="总关闭bugs",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal closedBugs;
+	@ApiModelProperty(notes="项目总非人力成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actNouserAt;
 	
-	@ApiModelProperty(notes="激活bugs",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal activeBugs;
+	@ApiModelProperty(notes="项目进度0~100之间，来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal finishRate;
 	
-	@ApiModelProperty(notes="已确认bugs总数",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal confirmedBugs;
+	@ApiModelProperty(notes="项目总预算工作量-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetWorkload;
 	
-	@ApiModelProperty(notes="已解决bugs总数",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal resolvedBugs;
+	@ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetOuserWorkload;
 	
-	@ApiModelProperty(notes="产品名称",allowEmptyValue=true,example="",allowableValues="")
-	String productName;
+	@ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetIuserWorkload;
+	
+	@ApiModelProperty(notes="预估工时=计划结束时间在计算当日前完成的任务的预算工时总和",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal estimateWorkload;
+	
+	@ApiModelProperty(notes="已完成工作量-来自计划中实际完成工作量",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actWorkload;
+	
+	@ApiModelProperty(notes="0|初始",allowEmptyValue=true,example="",allowableValues="")
+	String projectStatus;
+	
+	@ApiModelProperty(notes="实际外购总工作量，来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actOuserWorkload;
+	
+	@ApiModelProperty(notes="实际内部总工作量，来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actIuserWorkload;
+	
+	@ApiModelProperty(notes="待付款笔数",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal needPayCnt;
+	
+	@ApiModelProperty(notes="完成付款总比数",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal finishPayCnt;
+	
+	@ApiModelProperty(notes="已付款总人数",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal finishPayUserCnt;
+	
+	@ApiModelProperty(notes="待付款总人数",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal needPayUserCnt;
 	
 	@ApiModelProperty(notes="测试案例总数",allowEmptyValue=true,example="",allowableValues="")
 	Integer testCases;
@@ -113,206 +140,311 @@ public class XmProductState  implements java.io.Serializable {
 	@ApiModelProperty(notes="完成案例总数",allowEmptyValue=true,example="",allowableValues="")
 	Integer finishCases;
 	
-	@ApiModelProperty(notes="关联项目数",allowEmptyValue=true,example="",allowableValues="")
-	Integer projectCnt;
-	
-	@ApiModelProperty(notes="关联迭代数",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="迭代数",allowEmptyValue=true,example="",allowableValues="")
 	Integer iterationCnt;
 	
+	@ApiModelProperty(notes="产品数",allowEmptyValue=true,example="",allowableValues="")
+	Integer productCnt;
+	
+	@ApiModelProperty(notes="最早开始日期",allowEmptyValue=true,example="",allowableValues="")
+	Date minStartTime;
+	
+	@ApiModelProperty(notes="最晚结束时间",allowEmptyValue=true,example="",allowableValues="")
+	Date maxEndTime;
+	
+	@ApiModelProperty(notes="故事数",allowEmptyValue=true,example="",allowableValues="")
+	Integer menuCnt;
+	
+	@ApiModelProperty(notes="已完成需求数，2状态需求",allowEmptyValue=true,example="",allowableValues="")
+	Integer menuFinishCnt;
+	
+	@ApiModelProperty(notes="执行中需求数，1状态的需求",allowEmptyValue=true,example="",allowableValues="")
+	Integer menuExecCnt;
+	
+	@ApiModelProperty(notes="未开始需求数，0状态数据",allowEmptyValue=true,example="",allowableValues="")
+	Integer menuUnstartCnt;
+	
+	@ApiModelProperty(notes="已关闭需求数，3状态数据",allowEmptyValue=true,example="",allowableValues="")
+	Integer menuCloseCnt;
+	
 	@ApiModelProperty(notes="任务总数",allowEmptyValue=true,example="",allowableValues="")
 	Integer taskCnt;
 	
-	@ApiModelProperty(notes="已完成的任务总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer finishTaskCnt;
+	@ApiModelProperty(notes="待开始任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskUnstartCnt;
 	
-	@ApiModelProperty(notes="业务日期yyyy-MM-dd字符串",allowEmptyValue=true,example="",allowableValues="")
-	String bizDate;
+	@ApiModelProperty(notes="执行中任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskExecCnt;
 	
-	@ApiModelProperty(notes="机构号码",allowEmptyValue=true,example="",allowableValues="")
-	String branchId;
+	@ApiModelProperty(notes="已完成任务总数-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskFinishCnt;
 	
-	@ApiModelProperty(notes="bug总数",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="已结算任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskSetCnt;
+	
+	@ApiModelProperty(notes="外购任务数，来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal taskOutCnt;
+	
+	@ApiModelProperty(notes="已关闭任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskCloseCnt;
+	
+	@ApiModelProperty(notes="bug数目",allowEmptyValue=true,example="",allowableValues="")
 	Integer bugCnt;
 	
-	@ApiModelProperty(notes="故事数",allowEmptyValue=true,example="",allowableValues="")
-	Integer menuCnt;
+	@ApiModelProperty(notes="已关闭bug总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer closedBugs;
 	
-	@ApiModelProperty(notes="需求完成数",allowEmptyValue=true,example="",allowableValues="")
-	Integer menuFinishCnt;
+	@ApiModelProperty(notes="已解决bug总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer resolvedBugs;
 	
-	@ApiModelProperty(notes="预估工时=计划结束时间在计算当日前完成的任务的预算工时总和",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal estimateWorkload;
+	@ApiModelProperty(notes="激活的bug总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer activeBugs;
+	
+	@ApiModelProperty(notes="已解决bug总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer confirmedBugs;
+	
+	@ApiModelProperty(notes="工期（小时）",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal planWorkhours;
+	
+	@ApiModelProperty(notes="总人数",allowEmptyValue=true,example="",allowableValues="")
+	Integer planWorkerCnt;
+	
+	@ApiModelProperty(notes="实际投入人员数",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actWorkerCnt;
+	
+	@ApiModelProperty(notes="项目数",allowEmptyValue=true,example="",allowableValues="")
+	Integer projectCnt;
+	
+	@ApiModelProperty(notes="预算总金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetAt;
+	
+	@ApiModelProperty(notes="实际总金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actAt;
 
 	/**产品编号**/
 	public XmProductState(String productId) {
 		this.productId = productId;
 	}
     
-    /**功能状态表,无需前端维护，所有数据由汇总统计得出**/
+    /**项目指标日统计表**/
 	public XmProductState() {
 	}
 	
 	/**
-	 * 开始时间
+	 * 产品编号
 	 **/
-	public void setPlanStartTime(Date planStartTime) {
-		this.planStartTime = planStartTime;
+	public void setProductId(String productId) {
+		this.productId = productId;
 	}
 	/**
-	 * 结束时间
+	 * 统计日期yyyy-mm-dd类型
 	 **/
-	public void setPlanEndTime(Date planEndTime) {
-		this.planEndTime = planEndTime;
+	public void setBizDate(String bizDate) {
+		this.bizDate = bizDate;
 	}
 	/**
-	 * 实际开始时间
+	 * 文件数据
 	 **/
-	public void setActStartTime(Date actStartTime) {
-		this.actStartTime = actStartTime;
+	public void setFileCnt(Integer fileCnt) {
+		this.fileCnt = fileCnt;
 	}
 	/**
-	 * 实际结束时间
+	 * 产品名称
 	 **/
-	public void setActEndTime(Date actEndTime) {
-		this.actEndTime = actEndTime;
+	public void setProductName(String productName) {
+		this.productName = productName;
 	}
 	/**
-	 * 计划工作量，根据关联任务汇总
+	 * 统计执行日期
 	 **/
-	public void setPlanWorkload(BigDecimal planWorkload) {
-		this.planWorkload = planWorkload;
+	public void setCalcTime(Date calcTime) {
+		this.calcTime = calcTime;
 	}
 	/**
-	 * 实际工作量，根据关联任务汇总
+	 * 0-暂时的1稳定的，暂时的可以被覆盖，稳定的不允许覆盖
 	 **/
-	public void setActWorkload(BigDecimal actWorkload) {
-		this.actWorkload = actWorkload;
+	public void setCalcStatus(String calcStatus) {
+		this.calcStatus = calcStatus;
 	}
 	/**
-	 * 计划成本，根据关联任务汇总
+	 * 项目阶段计划数
 	 **/
-	public void setPlanCostAmount(BigDecimal planCostAmount) {
-		this.planCostAmount = planCostAmount;
+	public void setPhaseCnt(Integer phaseCnt) {
+		this.phaseCnt = phaseCnt;
 	}
 	/**
-	 * 实际成本金额根据关联任务汇总
+	 * 项目阶段计划已完成数
 	 **/
-	public void setActCostAmount(BigDecimal actCostAmount) {
-		this.actCostAmount = actCostAmount;
+	public void setPhaseFinishCnt(Integer phaseFinishCnt) {
+		this.phaseFinishCnt = phaseFinishCnt;
 	}
 	/**
-	 * 总体完成比例0-100之间,根据taskType进行汇总
+	 * 待付款总金额
 	 **/
-	public void setFinishRate(BigDecimal finishRate) {
-		this.finishRate = finishRate;
+	public void setNeedPayAt(BigDecimal needPayAt) {
+		this.needPayAt = needPayAt;
 	}
 	/**
-	 * 需求完成率0-100之间,根据taskType进行汇总
+	 * 已付款总金额
 	 **/
-	public void setDemandRate(BigDecimal demandRate) {
-		this.demandRate = demandRate;
+	public void setFinishPayAt(BigDecimal finishPayAt) {
+		this.finishPayAt = finishPayAt;
 	}
 	/**
-	 * 设计完成率0-100之间,根据taskType进行汇总
+	 * 待收款总金额
 	 **/
-	public void setDesignRate(BigDecimal designRate) {
-		this.designRate = designRate;
+	public void setNeedColAt(BigDecimal needColAt) {
+		this.needColAt = needColAt;
 	}
 	/**
-	 * 开发完成率0-100之间,根据taskType进行汇总
+	 * 已收款总金额
 	 **/
-	public void setDevRate(BigDecimal devRate) {
-		this.devRate = devRate;
+	public void setFinishColAt(BigDecimal finishColAt) {
+		this.finishColAt = finishColAt;
 	}
 	/**
-	 * uat测试完成率0-100之间,根据taskType进行汇总
+	 * 项目风险总数
 	 **/
-	public void setUatRate(BigDecimal uatRate) {
-		this.uatRate = uatRate;
+	public void setRiskCnt(Integer riskCnt) {
+		this.riskCnt = riskCnt;
 	}
 	/**
-	 * sit测试完成率0-100之间,根据taskType进行汇总
+	 * 已完成风险总数
 	 **/
-	public void setSitRate(BigDecimal sitRate) {
-		this.sitRate = sitRate;
+	public void setRiskFinishCnt(Integer riskFinishCnt) {
+		this.riskFinishCnt = riskFinishCnt;
 	}
 	/**
-	 * 创建时间
+	 * 机构编号
 	 **/
-	public void setCtime(Date ctime) {
-		this.ctime = ctime;
+	public void setBranchId(String branchId) {
+		this.branchId = branchId;
 	}
 	/**
-	 * 更新时间
+	 * 机构名称
 	 **/
-	public void setLtime(Date ltime) {
-		this.ltime = ltime;
+	public void setBranchName(String branchName) {
+		this.branchName = branchName;
 	}
 	/**
-	 * 创建人编号
+	 * 项目总非人力预算-来自任务表
 	 **/
-	public void setCuserid(String cuserid) {
-		this.cuserid = cuserid;
+	public void setBudgetNouserAt(BigDecimal budgetNouserAt) {
+		this.budgetNouserAt = budgetNouserAt;
 	}
 	/**
-	 * 创建人姓名
+	 * 项目总外购人力预算-来自任务表
 	 **/
-	public void setCusername(String cusername) {
-		this.cusername = cusername;
+	public void setBudgetOuserAt(BigDecimal budgetOuserAt) {
+		this.budgetOuserAt = budgetOuserAt;
 	}
 	/**
-	 * 汇总时间
+	 * 项目总内部人力预算-来自任务表
 	 **/
-	public void setCalcTime(Date calcTime) {
-		this.calcTime = calcTime;
+	public void setBudgetIuserAt(BigDecimal budgetIuserAt) {
+		this.budgetIuserAt = budgetIuserAt;
 	}
 	/**
-	 * 工时数
+	 * 项目总人力成本
 	 **/
-	public void setPlanWorkhours(BigDecimal planWorkhours) {
-		this.planWorkhours = planWorkhours;
+	public void setActUserAt(BigDecimal actUserAt) {
+		this.actUserAt = actUserAt;
 	}
 	/**
-	 * 总人数
+	 * 项目总内部人力成本金额
 	 **/
-	public void setPlanWorkerCnt(BigDecimal planWorkerCnt) {
-		this.planWorkerCnt = planWorkerCnt;
+	public void setActIuserAt(BigDecimal actIuserAt) {
+		this.actIuserAt = actIuserAt;
 	}
 	/**
-	 * 总关闭bugs
+	 * 项目总外购人力成本金额
 	 **/
-	public void setClosedBugs(BigDecimal closedBugs) {
-		this.closedBugs = closedBugs;
+	public void setActOuserAt(BigDecimal actOuserAt) {
+		this.actOuserAt = actOuserAt;
 	}
 	/**
-	 * 激活bugs
+	 * 项目总非人力成本
 	 **/
-	public void setActiveBugs(BigDecimal activeBugs) {
-		this.activeBugs = activeBugs;
+	public void setActNouserAt(BigDecimal actNouserAt) {
+		this.actNouserAt = actNouserAt;
 	}
 	/**
-	 * 已确认bugs总数
+	 * 项目进度0~100之间，来自任务表
 	 **/
-	public void setConfirmedBugs(BigDecimal confirmedBugs) {
-		this.confirmedBugs = confirmedBugs;
+	public void setFinishRate(BigDecimal finishRate) {
+		this.finishRate = finishRate;
 	}
 	/**
-	 * 已解决bugs总数
+	 * 项目总预算工作量-来自任务表
 	 **/
-	public void setResolvedBugs(BigDecimal resolvedBugs) {
-		this.resolvedBugs = resolvedBugs;
+	public void setBudgetWorkload(BigDecimal budgetWorkload) {
+		this.budgetWorkload = budgetWorkload;
 	}
 	/**
-	 * 产品编号
+	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
 	 **/
-	public void setProductId(String productId) {
-		this.productId = productId;
+	public void setBudgetOuserWorkload(BigDecimal budgetOuserWorkload) {
+		this.budgetOuserWorkload = budgetOuserWorkload;
 	}
 	/**
-	 * 产品名称
+	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
 	 **/
-	public void setProductName(String productName) {
-		this.productName = productName;
+	public void setBudgetIuserWorkload(BigDecimal budgetIuserWorkload) {
+		this.budgetIuserWorkload = budgetIuserWorkload;
+	}
+	/**
+	 * 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
+	 **/
+	public void setEstimateWorkload(BigDecimal estimateWorkload) {
+		this.estimateWorkload = estimateWorkload;
+	}
+	/**
+	 * 已完成工作量-来自计划中实际完成工作量
+	 **/
+	public void setActWorkload(BigDecimal actWorkload) {
+		this.actWorkload = actWorkload;
+	}
+	/**
+	 * 0|初始
+	 **/
+	public void setProjectStatus(String projectStatus) {
+		this.projectStatus = projectStatus;
+	}
+	/**
+	 * 实际外购总工作量，来自任务表
+	 **/
+	public void setActOuserWorkload(BigDecimal actOuserWorkload) {
+		this.actOuserWorkload = actOuserWorkload;
+	}
+	/**
+	 * 实际内部总工作量，来自任务表
+	 **/
+	public void setActIuserWorkload(BigDecimal actIuserWorkload) {
+		this.actIuserWorkload = actIuserWorkload;
+	}
+	/**
+	 * 待付款笔数
+	 **/
+	public void setNeedPayCnt(BigDecimal needPayCnt) {
+		this.needPayCnt = needPayCnt;
+	}
+	/**
+	 * 完成付款总比数
+	 **/
+	public void setFinishPayCnt(BigDecimal finishPayCnt) {
+		this.finishPayCnt = finishPayCnt;
+	}
+	/**
+	 * 已付款总人数
+	 **/
+	public void setFinishPayUserCnt(BigDecimal finishPayUserCnt) {
+		this.finishPayUserCnt = finishPayUserCnt;
+	}
+	/**
+	 * 待付款总人数
+	 **/
+	public void setNeedPayUserCnt(BigDecimal needPayUserCnt) {
+		this.needPayUserCnt = needPayUserCnt;
 	}
 	/**
 	 * 测试案例总数
@@ -339,16 +471,58 @@ public class XmProductState  implements java.io.Serializable {
 		this.finishCases = finishCases;
 	}
 	/**
-	 * 关联项目数
+	 * 迭代数
 	 **/
-	public void setProjectCnt(Integer projectCnt) {
-		this.projectCnt = projectCnt;
+	public void setIterationCnt(Integer iterationCnt) {
+		this.iterationCnt = iterationCnt;
 	}
 	/**
-	 * 关联迭代数
+	 * 产品数
 	 **/
-	public void setIterationCnt(Integer iterationCnt) {
-		this.iterationCnt = iterationCnt;
+	public void setProductCnt(Integer productCnt) {
+		this.productCnt = productCnt;
+	}
+	/**
+	 * 最早开始日期
+	 **/
+	public void setMinStartTime(Date minStartTime) {
+		this.minStartTime = minStartTime;
+	}
+	/**
+	 * 最晚结束时间
+	 **/
+	public void setMaxEndTime(Date maxEndTime) {
+		this.maxEndTime = maxEndTime;
+	}
+	/**
+	 * 故事数
+	 **/
+	public void setMenuCnt(Integer menuCnt) {
+		this.menuCnt = menuCnt;
+	}
+	/**
+	 * 已完成需求数，2状态需求
+	 **/
+	public void setMenuFinishCnt(Integer menuFinishCnt) {
+		this.menuFinishCnt = menuFinishCnt;
+	}
+	/**
+	 * 执行中需求数，1状态的需求
+	 **/
+	public void setMenuExecCnt(Integer menuExecCnt) {
+		this.menuExecCnt = menuExecCnt;
+	}
+	/**
+	 * 未开始需求数，0状态数据
+	 **/
+	public void setMenuUnstartCnt(Integer menuUnstartCnt) {
+		this.menuUnstartCnt = menuUnstartCnt;
+	}
+	/**
+	 * 已关闭需求数，3状态数据
+	 **/
+	public void setMenuCloseCnt(Integer menuCloseCnt) {
+		this.menuCloseCnt = menuCloseCnt;
 	}
 	/**
 	 * 任务总数
@@ -357,209 +531,323 @@ public class XmProductState  implements java.io.Serializable {
 		this.taskCnt = taskCnt;
 	}
 	/**
-	 * 已完成的任务总数
+	 * 待开始任务
 	 **/
-	public void setFinishTaskCnt(Integer finishTaskCnt) {
-		this.finishTaskCnt = finishTaskCnt;
+	public void setTaskUnstartCnt(Integer taskUnstartCnt) {
+		this.taskUnstartCnt = taskUnstartCnt;
 	}
 	/**
-	 * 业务日期yyyy-MM-dd字符串
+	 * 执行中任务
 	 **/
-	public void setBizDate(String bizDate) {
-		this.bizDate = bizDate;
+	public void setTaskExecCnt(Integer taskExecCnt) {
+		this.taskExecCnt = taskExecCnt;
 	}
 	/**
-	 * 机构号码
+	 * 已完成任务总数-来自任务表
 	 **/
-	public void setBranchId(String branchId) {
-		this.branchId = branchId;
+	public void setTaskFinishCnt(Integer taskFinishCnt) {
+		this.taskFinishCnt = taskFinishCnt;
+	}
+	/**
+	 * 已结算任务
+	 **/
+	public void setTaskSetCnt(Integer taskSetCnt) {
+		this.taskSetCnt = taskSetCnt;
+	}
+	/**
+	 * 外购任务数，来自任务表
+	 **/
+	public void setTaskOutCnt(BigDecimal taskOutCnt) {
+		this.taskOutCnt = taskOutCnt;
+	}
+	/**
+	 * 已关闭任务
+	 **/
+	public void setTaskCloseCnt(Integer taskCloseCnt) {
+		this.taskCloseCnt = taskCloseCnt;
 	}
 	/**
-	 * bug总数
+	 * bug数目
 	 **/
 	public void setBugCnt(Integer bugCnt) {
 		this.bugCnt = bugCnt;
 	}
 	/**
-	 * 故事数
+	 * 已关闭bug总数
 	 **/
-	public void setMenuCnt(Integer menuCnt) {
-		this.menuCnt = menuCnt;
+	public void setClosedBugs(Integer closedBugs) {
+		this.closedBugs = closedBugs;
 	}
 	/**
-	 * 需求完成数
+	 * 已解决bug总数
 	 **/
-	public void setMenuFinishCnt(Integer menuFinishCnt) {
-		this.menuFinishCnt = menuFinishCnt;
+	public void setResolvedBugs(Integer resolvedBugs) {
+		this.resolvedBugs = resolvedBugs;
 	}
 	/**
-	 * 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
+	 * 激活的bug总数
 	 **/
-	public void setEstimateWorkload(BigDecimal estimateWorkload) {
-		this.estimateWorkload = estimateWorkload;
+	public void setActiveBugs(Integer activeBugs) {
+		this.activeBugs = activeBugs;
+	}
+	/**
+	 * 已解决bug总数
+	 **/
+	public void setConfirmedBugs(Integer confirmedBugs) {
+		this.confirmedBugs = confirmedBugs;
+	}
+	/**
+	 * 工期（小时）
+	 **/
+	public void setPlanWorkhours(BigDecimal planWorkhours) {
+		this.planWorkhours = planWorkhours;
+	}
+	/**
+	 * 总人数
+	 **/
+	public void setPlanWorkerCnt(Integer planWorkerCnt) {
+		this.planWorkerCnt = planWorkerCnt;
+	}
+	/**
+	 * 实际投入人员数
+	 **/
+	public void setActWorkerCnt(BigDecimal actWorkerCnt) {
+		this.actWorkerCnt = actWorkerCnt;
+	}
+	/**
+	 * 项目数
+	 **/
+	public void setProjectCnt(Integer projectCnt) {
+		this.projectCnt = projectCnt;
+	}
+	/**
+	 * 预算总金额
+	 **/
+	public void setBudgetAt(BigDecimal budgetAt) {
+		this.budgetAt = budgetAt;
+	}
+	/**
+	 * 实际总金额
+	 **/
+	public void setActAt(BigDecimal actAt) {
+		this.actAt = actAt;
 	}
 	
 	/**
-	 * 开始时间
+	 * 产品编号
 	 **/
-	public Date getPlanStartTime() {
-		return this.planStartTime;
+	public String getProductId() {
+		return this.productId;
 	}
 	/**
-	 * 结束时间
+	 * 统计日期yyyy-mm-dd类型
 	 **/
-	public Date getPlanEndTime() {
-		return this.planEndTime;
+	public String getBizDate() {
+		return this.bizDate;
 	}
 	/**
-	 * 实际开始时间
+	 * 文件数据
 	 **/
-	public Date getActStartTime() {
-		return this.actStartTime;
+	public Integer getFileCnt() {
+		return this.fileCnt;
 	}
 	/**
-	 * 实际结束时间
+	 * 产品名称
 	 **/
-	public Date getActEndTime() {
-		return this.actEndTime;
+	public String getProductName() {
+		return this.productName;
 	}
 	/**
-	 * 计划工作量，根据关联任务汇总
+	 * 统计执行日期
 	 **/
-	public BigDecimal getPlanWorkload() {
-		return this.planWorkload;
+	public Date getCalcTime() {
+		return this.calcTime;
 	}
 	/**
-	 * 实际工作量，根据关联任务汇总
+	 * 0-暂时的1稳定的，暂时的可以被覆盖，稳定的不允许覆盖
 	 **/
-	public BigDecimal getActWorkload() {
-		return this.actWorkload;
+	public String getCalcStatus() {
+		return this.calcStatus;
 	}
 	/**
-	 * 计划成本，根据关联任务汇总
+	 * 项目阶段计划数
 	 **/
-	public BigDecimal getPlanCostAmount() {
-		return this.planCostAmount;
+	public Integer getPhaseCnt() {
+		return this.phaseCnt;
 	}
 	/**
-	 * 实际成本金额根据关联任务汇总
+	 * 项目阶段计划已完成数
 	 **/
-	public BigDecimal getActCostAmount() {
-		return this.actCostAmount;
+	public Integer getPhaseFinishCnt() {
+		return this.phaseFinishCnt;
 	}
 	/**
-	 * 总体完成比例0-100之间,根据taskType进行汇总
+	 * 待付款总金额
 	 **/
-	public BigDecimal getFinishRate() {
-		return this.finishRate;
+	public BigDecimal getNeedPayAt() {
+		return this.needPayAt;
+	}
+	/**
+	 * 已付款总金额
+	 **/
+	public BigDecimal getFinishPayAt() {
+		return this.finishPayAt;
 	}
 	/**
-	 * 需求完成率0-100之间,根据taskType进行汇总
+	 * 待收款总金额
 	 **/
-	public BigDecimal getDemandRate() {
-		return this.demandRate;
+	public BigDecimal getNeedColAt() {
+		return this.needColAt;
 	}
 	/**
-	 * 设计完成率0-100之间,根据taskType进行汇总
+	 * 已收款总金额
 	 **/
-	public BigDecimal getDesignRate() {
-		return this.designRate;
+	public BigDecimal getFinishColAt() {
+		return this.finishColAt;
 	}
 	/**
-	 * 开发完成率0-100之间,根据taskType进行汇总
+	 * 项目风险总数
 	 **/
-	public BigDecimal getDevRate() {
-		return this.devRate;
+	public Integer getRiskCnt() {
+		return this.riskCnt;
 	}
 	/**
-	 * uat测试完成率0-100之间,根据taskType进行汇总
+	 * 已完成风险总数
 	 **/
-	public BigDecimal getUatRate() {
-		return this.uatRate;
+	public Integer getRiskFinishCnt() {
+		return this.riskFinishCnt;
 	}
 	/**
-	 * sit测试完成率0-100之间,根据taskType进行汇总
+	 * 机构编号
 	 **/
-	public BigDecimal getSitRate() {
-		return this.sitRate;
+	public String getBranchId() {
+		return this.branchId;
 	}
 	/**
-	 * 创建时间
+	 * 机构名称
 	 **/
-	public Date getCtime() {
-		return this.ctime;
+	public String getBranchName() {
+		return this.branchName;
 	}
 	/**
-	 * 更新时间
+	 * 项目总非人力预算-来自任务表
 	 **/
-	public Date getLtime() {
-		return this.ltime;
+	public BigDecimal getBudgetNouserAt() {
+		return this.budgetNouserAt;
 	}
 	/**
-	 * 创建人编号
+	 * 项目总外购人力预算-来自任务表
 	 **/
-	public String getCuserid() {
-		return this.cuserid;
+	public BigDecimal getBudgetOuserAt() {
+		return this.budgetOuserAt;
 	}
 	/**
-	 * 创建人姓名
+	 * 项目总内部人力预算-来自任务表
 	 **/
-	public String getCusername() {
-		return this.cusername;
+	public BigDecimal getBudgetIuserAt() {
+		return this.budgetIuserAt;
 	}
 	/**
-	 * 汇总时间
+	 * 项目总人力成本
 	 **/
-	public Date getCalcTime() {
-		return this.calcTime;
+	public BigDecimal getActUserAt() {
+		return this.actUserAt;
 	}
 	/**
-	 * 工时数
+	 * 项目总内部人力成本金额
 	 **/
-	public BigDecimal getPlanWorkhours() {
-		return this.planWorkhours;
+	public BigDecimal getActIuserAt() {
+		return this.actIuserAt;
 	}
 	/**
-	 * 总人数
+	 * 项目总外购人力成本金额
 	 **/
-	public BigDecimal getPlanWorkerCnt() {
-		return this.planWorkerCnt;
+	public BigDecimal getActOuserAt() {
+		return this.actOuserAt;
 	}
 	/**
-	 * 总关闭bugs
+	 * 项目总非人力成本
 	 **/
-	public BigDecimal getClosedBugs() {
-		return this.closedBugs;
+	public BigDecimal getActNouserAt() {
+		return this.actNouserAt;
 	}
 	/**
-	 * 激活bugs
+	 * 项目进度0~100之间，来自任务表
 	 **/
-	public BigDecimal getActiveBugs() {
-		return this.activeBugs;
+	public BigDecimal getFinishRate() {
+		return this.finishRate;
 	}
 	/**
-	 * 已确认bugs总数
+	 * 项目总预算工作量-来自任务表
 	 **/
-	public BigDecimal getConfirmedBugs() {
-		return this.confirmedBugs;
+	public BigDecimal getBudgetWorkload() {
+		return this.budgetWorkload;
 	}
 	/**
-	 * 已解决bugs总数
+	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
 	 **/
-	public BigDecimal getResolvedBugs() {
-		return this.resolvedBugs;
+	public BigDecimal getBudgetOuserWorkload() {
+		return this.budgetOuserWorkload;
 	}
 	/**
-	 * 产品编号
+	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
 	 **/
-	public String getProductId() {
-		return this.productId;
+	public BigDecimal getBudgetIuserWorkload() {
+		return this.budgetIuserWorkload;
 	}
 	/**
-	 * 产品名称
+	 * 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
 	 **/
-	public String getProductName() {
-		return this.productName;
+	public BigDecimal getEstimateWorkload() {
+		return this.estimateWorkload;
+	}
+	/**
+	 * 已完成工作量-来自计划中实际完成工作量
+	 **/
+	public BigDecimal getActWorkload() {
+		return this.actWorkload;
+	}
+	/**
+	 * 0|初始
+	 **/
+	public String getProjectStatus() {
+		return this.projectStatus;
+	}
+	/**
+	 * 实际外购总工作量，来自任务表
+	 **/
+	public BigDecimal getActOuserWorkload() {
+		return this.actOuserWorkload;
+	}
+	/**
+	 * 实际内部总工作量，来自任务表
+	 **/
+	public BigDecimal getActIuserWorkload() {
+		return this.actIuserWorkload;
+	}
+	/**
+	 * 待付款笔数
+	 **/
+	public BigDecimal getNeedPayCnt() {
+		return this.needPayCnt;
+	}
+	/**
+	 * 完成付款总比数
+	 **/
+	public BigDecimal getFinishPayCnt() {
+		return this.finishPayCnt;
+	}
+	/**
+	 * 已付款总人数
+	 **/
+	public BigDecimal getFinishPayUserCnt() {
+		return this.finishPayUserCnt;
+	}
+	/**
+	 * 待付款总人数
+	 **/
+	public BigDecimal getNeedPayUserCnt() {
+		return this.needPayUserCnt;
 	}
 	/**
 	 * 测试案例总数
@@ -586,16 +874,58 @@ public class XmProductState  implements java.io.Serializable {
 		return this.finishCases;
 	}
 	/**
-	 * 关联项目数
+	 * 迭代数
 	 **/
-	public Integer getProjectCnt() {
-		return this.projectCnt;
+	public Integer getIterationCnt() {
+		return this.iterationCnt;
 	}
 	/**
-	 * 关联迭代数
+	 * 产品数
 	 **/
-	public Integer getIterationCnt() {
-		return this.iterationCnt;
+	public Integer getProductCnt() {
+		return this.productCnt;
+	}
+	/**
+	 * 最早开始日期
+	 **/
+	public Date getMinStartTime() {
+		return this.minStartTime;
+	}
+	/**
+	 * 最晚结束时间
+	 **/
+	public Date getMaxEndTime() {
+		return this.maxEndTime;
+	}
+	/**
+	 * 故事数
+	 **/
+	public Integer getMenuCnt() {
+		return this.menuCnt;
+	}
+	/**
+	 * 已完成需求数，2状态需求
+	 **/
+	public Integer getMenuFinishCnt() {
+		return this.menuFinishCnt;
+	}
+	/**
+	 * 执行中需求数，1状态的需求
+	 **/
+	public Integer getMenuExecCnt() {
+		return this.menuExecCnt;
+	}
+	/**
+	 * 未开始需求数，0状态数据
+	 **/
+	public Integer getMenuUnstartCnt() {
+		return this.menuUnstartCnt;
+	}
+	/**
+	 * 已关闭需求数，3状态数据
+	 **/
+	public Integer getMenuCloseCnt() {
+		return this.menuCloseCnt;
 	}
 	/**
 	 * 任务总数
@@ -604,46 +934,106 @@ public class XmProductState  implements java.io.Serializable {
 		return this.taskCnt;
 	}
 	/**
-	 * 已完成的任务总数
+	 * 待开始任务
 	 **/
-	public Integer getFinishTaskCnt() {
-		return this.finishTaskCnt;
+	public Integer getTaskUnstartCnt() {
+		return this.taskUnstartCnt;
 	}
 	/**
-	 * 业务日期yyyy-MM-dd字符串
+	 * 执行中任务
 	 **/
-	public String getBizDate() {
-		return this.bizDate;
+	public Integer getTaskExecCnt() {
+		return this.taskExecCnt;
 	}
 	/**
-	 * 机构号码
+	 * 已完成任务总数-来自任务表
 	 **/
-	public String getBranchId() {
-		return this.branchId;
+	public Integer getTaskFinishCnt() {
+		return this.taskFinishCnt;
 	}
 	/**
-	 * bug总数
+	 * 已结算任务
+	 **/
+	public Integer getTaskSetCnt() {
+		return this.taskSetCnt;
+	}
+	/**
+	 * 外购任务数，来自任务表
+	 **/
+	public BigDecimal getTaskOutCnt() {
+		return this.taskOutCnt;
+	}
+	/**
+	 * 已关闭任务
+	 **/
+	public Integer getTaskCloseCnt() {
+		return this.taskCloseCnt;
+	}
+	/**
+	 * bug数目
 	 **/
 	public Integer getBugCnt() {
 		return this.bugCnt;
 	}
 	/**
-	 * 故事数
+	 * 已关闭bug总数
 	 **/
-	public Integer getMenuCnt() {
-		return this.menuCnt;
+	public Integer getClosedBugs() {
+		return this.closedBugs;
 	}
 	/**
-	 * 需求完成数
+	 * 已解决bug总数
 	 **/
-	public Integer getMenuFinishCnt() {
-		return this.menuFinishCnt;
+	public Integer getResolvedBugs() {
+		return this.resolvedBugs;
 	}
 	/**
-	 * 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
+	 * 激活的bug总数
 	 **/
-	public BigDecimal getEstimateWorkload() {
-		return this.estimateWorkload;
+	public Integer getActiveBugs() {
+		return this.activeBugs;
+	}
+	/**
+	 * 已解决bug总数
+	 **/
+	public Integer getConfirmedBugs() {
+		return this.confirmedBugs;
+	}
+	/**
+	 * 工期（小时）
+	 **/
+	public BigDecimal getPlanWorkhours() {
+		return this.planWorkhours;
+	}
+	/**
+	 * 总人数
+	 **/
+	public Integer getPlanWorkerCnt() {
+		return this.planWorkerCnt;
+	}
+	/**
+	 * 实际投入人员数
+	 **/
+	public BigDecimal getActWorkerCnt() {
+		return this.actWorkerCnt;
+	}
+	/**
+	 * 项目数
+	 **/
+	public Integer getProjectCnt() {
+		return this.projectCnt;
+	}
+	/**
+	 * 预算总金额
+	 **/
+	public BigDecimal getBudgetAt() {
+		return this.budgetAt;
+	}
+	/**
+	 * 实际总金额
+	 **/
+	public BigDecimal getActAt() {
+		return this.actAt;
 	}
 
 }
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectState.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectState.java
index 4945741e..cbafa173 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProjectState.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectState.java
@@ -2,15 +2,15 @@ package  com.xm.core.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
 import java.util.Date;
+import java.math.BigDecimal;
 
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <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,minStartTime,maxEndTime;<br>
+ *	projectId,bizDate,fileCnt,projectName,calcTime,calcStatus,phaseCnt,phaseFinishCnt,needPayAt,finishPayAt,needColAt,finishColAt,riskCnt,riskFinishCnt,branchId,branchName,budgetNouserAt,budgetOuserAt,budgetIuserAt,actUserAt,actIuserAt,actOuserAt,actNouserAt,finishRate,budgetWorkload,budgetOuserWorkload,budgetIuserWorkload,estimateWorkload,actWorkload,projectStatus,actOuserWorkload,actIuserWorkload,needPayCnt,finishPayCnt,finishPayUserCnt,needPayUserCnt,testCases,execCases,designCases,finishCases,iterationCnt,productCnt,minStartTime,maxEndTime,menuCnt,menuFinishCnt,menuExecCnt,menuUnstartCnt,menuCloseCnt,taskCnt,taskUnstartCnt,taskExecCnt,taskFinishCnt,taskSetCnt,taskOutCnt,taskCloseCnt,bugCnt,closedBugs,resolvedBugs,activeBugs,confirmedBugs,planWorkhours,planWorkerCnt,actWorkerCnt,budgetAt,actAt;<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,min_start_time,max_end_time;<br>
+ *	project_id,biz_date,file_cnt,project_name,calc_time,calc_status,phase_cnt,phase_finish_cnt,need_pay_at,finish_pay_at,need_col_at,finish_col_at,risk_cnt,risk_finish_cnt,branch_id,branch_name,budget_nouser_at,budget_ouser_at,budget_iuser_at,act_user_at,act_iuser_at,act_ouser_at,act_nouser_at,finish_rate,budget_workload,budget_ouser_workload,budget_iuser_workload,estimate_workload,act_workload,project_status,act_ouser_workload,act_iuser_workload,need_pay_cnt,finish_pay_cnt,finish_pay_user_cnt,need_pay_user_cnt,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,min_start_time,max_end_time,menu_cnt,menu_finish_cnt,menu_exec_cnt,menu_unstart_cnt,menu_close_cnt,task_cnt,task_unstart_cnt,task_exec_cnt,task_finish_cnt,task_set_cnt,task_out_cnt,task_close_cnt,bug_cnt,closed_bugs,resolved_bugs,active_bugs,confirmed_bugs,plan_workhours,plan_worker_cnt,act_worker_cnt,budget_at,act_at;<br>
  * 当前主键(包括多主键):<br>
  *	project_id;<br>
  */
@@ -27,73 +27,40 @@ public class XmProjectState  implements java.io.Serializable {
 	String bizDate;
 	
 	@ApiModelProperty(notes="文件数据",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalFileCnt;
-	
-	@ApiModelProperty(notes="bug数目",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalBugCnt;
-	
-	@ApiModelProperty(notes="任务数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalTaskCnt;
-	
-	@ApiModelProperty(notes="项目总非人力预算-来自项目表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalBudgetNouserAmount;
+	Integer fileCnt;
 	
 	@ApiModelProperty(notes="项目名称",allowEmptyValue=true,example="",allowableValues="")
 	String projectName;
 	
-	@ApiModelProperty(notes="总参与人数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalStaffCnt;
-	
 	@ApiModelProperty(notes="统计执行日期",allowEmptyValue=true,example="",allowableValues="")
 	Date calcTime;
 	
 	@ApiModelProperty(notes="0-暂时的1稳定的，暂时的可以被覆盖，稳定的不允许覆盖",allowEmptyValue=true,example="",allowableValues="")
 	String calcStatus;
 	
-	@ApiModelProperty(notes="项目总非人力成本",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalCostNouserAmount;
-	
-	@ApiModelProperty(notes="已关闭bug总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalClosedBugCnt;
-	
-	@ApiModelProperty(notes="已解决bug总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalResolvedBugCnt;
-	
-	@ApiModelProperty(notes="已完成任务总数-来自任务表",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalCompleteTaskCnt;
-	
 	@ApiModelProperty(notes="项目阶段计划数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalPhaseCnt;
+	Integer phaseCnt;
 	
 	@ApiModelProperty(notes="项目阶段计划已完成数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalCompletePhaseCnt;
+	Integer phaseFinishCnt;
 	
 	@ApiModelProperty(notes="待付款总金额",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalNeedPayAmount;
+	BigDecimal needPayAt;
 	
 	@ApiModelProperty(notes="已付款总金额",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalFinishPayAmount;
+	BigDecimal finishPayAt;
 	
 	@ApiModelProperty(notes="待收款总金额",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalNeedColAmount;
+	BigDecimal needColAt;
 	
 	@ApiModelProperty(notes="已收款总金额",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalFinishColAmount;
-	
-	@ApiModelProperty(notes="项目总人力成本",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalCostUserAmount;
-	
-	@ApiModelProperty(notes="项目总内部人力预算-来自项目表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalBudgetIuserAmount;
-	
-	@ApiModelProperty(notes="项目总预算工作量-来自项目表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalPlanWorkload;
+	BigDecimal finishColAt;
 	
 	@ApiModelProperty(notes="项目风险总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalRiskCnt;
+	Integer riskCnt;
 	
 	@ApiModelProperty(notes="已完成风险总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalCompleteRiskCnt;
+	Integer riskFinishCnt;
 	
 	@ApiModelProperty(notes="机构编号",allowEmptyValue=true,example="",allowableValues="")
 	String branchId;
@@ -101,62 +68,65 @@ public class XmProjectState  implements java.io.Serializable {
 	@ApiModelProperty(notes="机构名称",allowEmptyValue=true,example="",allowableValues="")
 	String branchName;
 	
-	@ApiModelProperty(notes="项目总外购人力预算-来自项目表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalBudgetOuserAmount;
+	@ApiModelProperty(notes="项目总非人力预算-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetNouserAt;
 	
-	@ApiModelProperty(notes="已完成工作量-来自计划中实际完成工作量",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalCompleteWorkload;
+	@ApiModelProperty(notes="项目总外购人力预算-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetOuserAt;
+	
+	@ApiModelProperty(notes="项目总内部人力预算-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetIuserAt;
+	
+	@ApiModelProperty(notes="项目总人力成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actUserAt;
 	
 	@ApiModelProperty(notes="项目总内部人力成本金额",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalCostIuserAmount;
+	BigDecimal actIuserAt;
 	
 	@ApiModelProperty(notes="项目总外购人力成本金额",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalCostOuserAmount;
+	BigDecimal actOuserAt;
+	
+	@ApiModelProperty(notes="项目总非人力成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actNouserAt;
 	
 	@ApiModelProperty(notes="项目进度0~100之间，来自任务表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalProgress;
+	BigDecimal finishRate;
 	
-	@ApiModelProperty(notes="激活的bug总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalActiveBugCnt;
+	@ApiModelProperty(notes="项目总预算工作量-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetWorkload;
 	
-	@ApiModelProperty(notes="已解决bug总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalConfirmedBugCnt;
+	@ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetOuserWorkload;
+	
+	@ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetIuserWorkload;
+	
+	@ApiModelProperty(notes="预估工时=计划结束时间在计算当日前完成的任务的预算工时总和",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal estimateWorkload;
+	
+	@ApiModelProperty(notes="已完成工作量-来自计划中实际完成工作量",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actWorkload;
 	
 	@ApiModelProperty(notes="0|初始",allowEmptyValue=true,example="",allowableValues="")
 	String projectStatus;
 	
-	@ApiModelProperty(notes="实际总工作量，来自任务表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalActWorkload;
-	
 	@ApiModelProperty(notes="实际外购总工作量，来自任务表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalActOutWorkload;
+	BigDecimal actOuserWorkload;
 	
 	@ApiModelProperty(notes="实际内部总工作量，来自任务表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalActInnerWorkload;
-	
-	@ApiModelProperty(notes="已经分配到任务的总预算",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalTaskBudgetCostAt;
-	
-	@ApiModelProperty(notes="外购任务数，来自任务表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalTaskOutCnt;
+	BigDecimal actIuserWorkload;
 	
 	@ApiModelProperty(notes="待付款笔数",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalNeedPayCnt;
+	BigDecimal needPayCnt;
 	
 	@ApiModelProperty(notes="完成付款总比数",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalFinishPayCnt;
+	BigDecimal finishPayCnt;
 	
 	@ApiModelProperty(notes="已付款总人数",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalFinishPayUserCnt;
+	BigDecimal finishPayUserCnt;
 	
 	@ApiModelProperty(notes="待付款总人数",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalNeedPayUserCnt;
-	
-	@ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalPlanIuserWorkload;
-	
-	@ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalPlanOuserWorkload;
+	BigDecimal needPayUserCnt;
 	
 	@ApiModelProperty(notes="测试案例总数",allowEmptyValue=true,example="",allowableValues="")
 	Integer testCases;
@@ -176,32 +146,77 @@ public class XmProjectState  implements java.io.Serializable {
 	@ApiModelProperty(notes="产品数",allowEmptyValue=true,example="",allowableValues="")
 	Integer productCnt;
 	
+	@ApiModelProperty(notes="最早开始日期",allowEmptyValue=true,example="",allowableValues="")
+	Date minStartTime;
+	
+	@ApiModelProperty(notes="最晚结束时间",allowEmptyValue=true,example="",allowableValues="")
+	Date maxEndTime;
+	
 	@ApiModelProperty(notes="故事数",allowEmptyValue=true,example="",allowableValues="")
 	Integer menuCnt;
 	
-	@ApiModelProperty(notes="完成的故事数",allowEmptyValue=true,example="",allowableValues="")
-	Integer finishMenuCnt;
+	@ApiModelProperty(notes="已完成需求数，2状态需求",allowEmptyValue=true,example="",allowableValues="")
+	Integer menuFinishCnt;
 	
-	@ApiModelProperty(notes="预估工时=计划结束时间在计算当日前完成的任务的预算工时总和",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal estimateWorkload;
+	@ApiModelProperty(notes="执行中需求数，1状态的需求",allowEmptyValue=true,example="",allowableValues="")
+	Integer menuExecCnt;
 	
-	@ApiModelProperty(notes="执行中任务数=任务表开始日期小于=当前日期，进度<100的任务",allowEmptyValue=true,example="",allowableValues="")
-	Integer execTaskCnt;
+	@ApiModelProperty(notes="未开始需求数，0状态数据",allowEmptyValue=true,example="",allowableValues="")
+	Integer menuUnstartCnt;
 	
-	@ApiModelProperty(notes="待开始的任务数=任务表中开始日期=当前日期+1的任务数",allowEmptyValue=true,example="",allowableValues="")
-	Integer toStartTaskCnt;
+	@ApiModelProperty(notes="已关闭需求数，3状态数据",allowEmptyValue=true,example="",allowableValues="")
+	Integer menuCloseCnt;
 	
-	@ApiModelProperty(notes="执行中需求=需求表中开始日期小于小于等于当前日期，进度<100的需求",allowEmptyValue=true,example="",allowableValues="")
-	Integer execMenuCnt;
+	@ApiModelProperty(notes="任务总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskCnt;
 	
-	@ApiModelProperty(notes="待开始需求数=需求表中开始日期=当前日期+1的需求数",allowEmptyValue=true,example="",allowableValues="")
-	Integer toStartMenuCnt;
+	@ApiModelProperty(notes="待开始任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskUnstartCnt;
 	
-	@ApiModelProperty(notes="最早开始日期",allowEmptyValue=true,example="",allowableValues="")
-	Date minStartTime;
+	@ApiModelProperty(notes="执行中任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskExecCnt;
 	
-	@ApiModelProperty(notes="最晚结束时间",allowEmptyValue=true,example="",allowableValues="")
-	Date maxEndTime;
+	@ApiModelProperty(notes="已完成任务总数-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskFinishCnt;
+	
+	@ApiModelProperty(notes="已结算任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskSetCnt;
+	
+	@ApiModelProperty(notes="外购任务数，来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal taskOutCnt;
+	
+	@ApiModelProperty(notes="已关闭任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskCloseCnt;
+	
+	@ApiModelProperty(notes="bug数目",allowEmptyValue=true,example="",allowableValues="")
+	Integer bugCnt;
+	
+	@ApiModelProperty(notes="已关闭bug总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer closedBugs;
+	
+	@ApiModelProperty(notes="已解决bug总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer resolvedBugs;
+	
+	@ApiModelProperty(notes="激活的bug总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer activeBugs;
+	
+	@ApiModelProperty(notes="已解决bug总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer confirmedBugs;
+	
+	@ApiModelProperty(notes="工期（小时）",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal planWorkhours;
+	
+	@ApiModelProperty(notes="总人数",allowEmptyValue=true,example="",allowableValues="")
+	Integer planWorkerCnt;
+	
+	@ApiModelProperty(notes="实际投入人员数",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actWorkerCnt;
+	
+	@ApiModelProperty(notes="预算总金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetAt;
+	
+	@ApiModelProperty(notes="实际总金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actAt;
 
 	/**项目编号**/
 	public XmProjectState(String projectId) {
@@ -227,26 +242,8 @@ public class XmProjectState  implements java.io.Serializable {
 	/**
 	 * 文件数据
 	 **/
-	public void setTotalFileCnt(Integer totalFileCnt) {
-		this.totalFileCnt = totalFileCnt;
-	}
-	/**
-	 * bug数目
-	 **/
-	public void setTotalBugCnt(Integer totalBugCnt) {
-		this.totalBugCnt = totalBugCnt;
-	}
-	/**
-	 * 任务数
-	 **/
-	public void setTotalTaskCnt(Integer totalTaskCnt) {
-		this.totalTaskCnt = totalTaskCnt;
-	}
-	/**
-	 * 项目总非人力预算-来自项目表
-	 **/
-	public void setTotalBudgetNouserAmount(BigDecimal totalBudgetNouserAmount) {
-		this.totalBudgetNouserAmount = totalBudgetNouserAmount;
+	public void setFileCnt(Integer fileCnt) {
+		this.fileCnt = fileCnt;
 	}
 	/**
 	 * 项目名称
@@ -254,12 +251,6 @@ public class XmProjectState  implements java.io.Serializable {
 	public void setProjectName(String projectName) {
 		this.projectName = projectName;
 	}
-	/**
-	 * 总参与人数
-	 **/
-	public void setTotalStaffCnt(Integer totalStaffCnt) {
-		this.totalStaffCnt = totalStaffCnt;
-	}
 	/**
 	 * 统计执行日期
 	 **/
@@ -272,95 +263,53 @@ public class XmProjectState  implements java.io.Serializable {
 	public void setCalcStatus(String calcStatus) {
 		this.calcStatus = calcStatus;
 	}
-	/**
-	 * 项目总非人力成本
-	 **/
-	public void setTotalCostNouserAmount(BigDecimal totalCostNouserAmount) {
-		this.totalCostNouserAmount = totalCostNouserAmount;
-	}
-	/**
-	 * 已关闭bug总数
-	 **/
-	public void setTotalClosedBugCnt(Integer totalClosedBugCnt) {
-		this.totalClosedBugCnt = totalClosedBugCnt;
-	}
-	/**
-	 * 已解决bug总数
-	 **/
-	public void setTotalResolvedBugCnt(Integer totalResolvedBugCnt) {
-		this.totalResolvedBugCnt = totalResolvedBugCnt;
-	}
-	/**
-	 * 已完成任务总数-来自任务表
-	 **/
-	public void setTotalCompleteTaskCnt(Integer totalCompleteTaskCnt) {
-		this.totalCompleteTaskCnt = totalCompleteTaskCnt;
-	}
 	/**
 	 * 项目阶段计划数
 	 **/
-	public void setTotalPhaseCnt(Integer totalPhaseCnt) {
-		this.totalPhaseCnt = totalPhaseCnt;
+	public void setPhaseCnt(Integer phaseCnt) {
+		this.phaseCnt = phaseCnt;
 	}
 	/**
 	 * 项目阶段计划已完成数
 	 **/
-	public void setTotalCompletePhaseCnt(Integer totalCompletePhaseCnt) {
-		this.totalCompletePhaseCnt = totalCompletePhaseCnt;
+	public void setPhaseFinishCnt(Integer phaseFinishCnt) {
+		this.phaseFinishCnt = phaseFinishCnt;
 	}
 	/**
 	 * 待付款总金额
 	 **/
-	public void setTotalNeedPayAmount(BigDecimal totalNeedPayAmount) {
-		this.totalNeedPayAmount = totalNeedPayAmount;
+	public void setNeedPayAt(BigDecimal needPayAt) {
+		this.needPayAt = needPayAt;
 	}
 	/**
 	 * 已付款总金额
 	 **/
-	public void setTotalFinishPayAmount(BigDecimal totalFinishPayAmount) {
-		this.totalFinishPayAmount = totalFinishPayAmount;
+	public void setFinishPayAt(BigDecimal finishPayAt) {
+		this.finishPayAt = finishPayAt;
 	}
 	/**
 	 * 待收款总金额
 	 **/
-	public void setTotalNeedColAmount(BigDecimal totalNeedColAmount) {
-		this.totalNeedColAmount = totalNeedColAmount;
+	public void setNeedColAt(BigDecimal needColAt) {
+		this.needColAt = needColAt;
 	}
 	/**
 	 * 已收款总金额
 	 **/
-	public void setTotalFinishColAmount(BigDecimal totalFinishColAmount) {
-		this.totalFinishColAmount = totalFinishColAmount;
-	}
-	/**
-	 * 项目总人力成本
-	 **/
-	public void setTotalCostUserAmount(BigDecimal totalCostUserAmount) {
-		this.totalCostUserAmount = totalCostUserAmount;
-	}
-	/**
-	 * 项目总内部人力预算-来自项目表
-	 **/
-	public void setTotalBudgetIuserAmount(BigDecimal totalBudgetIuserAmount) {
-		this.totalBudgetIuserAmount = totalBudgetIuserAmount;
-	}
-	/**
-	 * 项目总预算工作量-来自项目表
-	 **/
-	public void setTotalPlanWorkload(BigDecimal totalPlanWorkload) {
-		this.totalPlanWorkload = totalPlanWorkload;
+	public void setFinishColAt(BigDecimal finishColAt) {
+		this.finishColAt = finishColAt;
 	}
 	/**
 	 * 项目风险总数
 	 **/
-	public void setTotalRiskCnt(Integer totalRiskCnt) {
-		this.totalRiskCnt = totalRiskCnt;
+	public void setRiskCnt(Integer riskCnt) {
+		this.riskCnt = riskCnt;
 	}
 	/**
 	 * 已完成风险总数
 	 **/
-	public void setTotalCompleteRiskCnt(Integer totalCompleteRiskCnt) {
-		this.totalCompleteRiskCnt = totalCompleteRiskCnt;
+	public void setRiskFinishCnt(Integer riskFinishCnt) {
+		this.riskFinishCnt = riskFinishCnt;
 	}
 	/**
 	 * 机构编号
@@ -375,118 +324,124 @@ public class XmProjectState  implements java.io.Serializable {
 		this.branchName = branchName;
 	}
 	/**
-	 * 项目总外购人力预算-来自项目表
+	 * 项目总非人力预算-来自任务表
 	 **/
-	public void setTotalBudgetOuserAmount(BigDecimal totalBudgetOuserAmount) {
-		this.totalBudgetOuserAmount = totalBudgetOuserAmount;
+	public void setBudgetNouserAt(BigDecimal budgetNouserAt) {
+		this.budgetNouserAt = budgetNouserAt;
 	}
 	/**
-	 * 已完成工作量-来自计划中实际完成工作量
+	 * 项目总外购人力预算-来自任务表
 	 **/
-	public void setTotalCompleteWorkload(BigDecimal totalCompleteWorkload) {
-		this.totalCompleteWorkload = totalCompleteWorkload;
+	public void setBudgetOuserAt(BigDecimal budgetOuserAt) {
+		this.budgetOuserAt = budgetOuserAt;
+	}
+	/**
+	 * 项目总内部人力预算-来自任务表
+	 **/
+	public void setBudgetIuserAt(BigDecimal budgetIuserAt) {
+		this.budgetIuserAt = budgetIuserAt;
+	}
+	/**
+	 * 项目总人力成本
+	 **/
+	public void setActUserAt(BigDecimal actUserAt) {
+		this.actUserAt = actUserAt;
 	}
 	/**
 	 * 项目总内部人力成本金额
 	 **/
-	public void setTotalCostIuserAmount(BigDecimal totalCostIuserAmount) {
-		this.totalCostIuserAmount = totalCostIuserAmount;
+	public void setActIuserAt(BigDecimal actIuserAt) {
+		this.actIuserAt = actIuserAt;
 	}
 	/**
 	 * 项目总外购人力成本金额
 	 **/
-	public void setTotalCostOuserAmount(BigDecimal totalCostOuserAmount) {
-		this.totalCostOuserAmount = totalCostOuserAmount;
+	public void setActOuserAt(BigDecimal actOuserAt) {
+		this.actOuserAt = actOuserAt;
+	}
+	/**
+	 * 项目总非人力成本
+	 **/
+	public void setActNouserAt(BigDecimal actNouserAt) {
+		this.actNouserAt = actNouserAt;
 	}
 	/**
 	 * 项目进度0~100之间，来自任务表
 	 **/
-	public void setTotalProgress(BigDecimal totalProgress) {
-		this.totalProgress = totalProgress;
+	public void setFinishRate(BigDecimal finishRate) {
+		this.finishRate = finishRate;
 	}
 	/**
-	 * 激活的bug总数
+	 * 项目总预算工作量-来自任务表
 	 **/
-	public void setTotalActiveBugCnt(Integer totalActiveBugCnt) {
-		this.totalActiveBugCnt = totalActiveBugCnt;
+	public void setBudgetWorkload(BigDecimal budgetWorkload) {
+		this.budgetWorkload = budgetWorkload;
 	}
 	/**
-	 * 已解决bug总数
+	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
 	 **/
-	public void setTotalConfirmedBugCnt(Integer totalConfirmedBugCnt) {
-		this.totalConfirmedBugCnt = totalConfirmedBugCnt;
+	public void setBudgetOuserWorkload(BigDecimal budgetOuserWorkload) {
+		this.budgetOuserWorkload = budgetOuserWorkload;
 	}
 	/**
-	 * 0|初始
+	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
 	 **/
-	public void setProjectStatus(String projectStatus) {
-		this.projectStatus = projectStatus;
+	public void setBudgetIuserWorkload(BigDecimal budgetIuserWorkload) {
+		this.budgetIuserWorkload = budgetIuserWorkload;
 	}
 	/**
-	 * 实际总工作量，来自任务表
+	 * 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
 	 **/
-	public void setTotalActWorkload(BigDecimal totalActWorkload) {
-		this.totalActWorkload = totalActWorkload;
+	public void setEstimateWorkload(BigDecimal estimateWorkload) {
+		this.estimateWorkload = estimateWorkload;
 	}
 	/**
-	 * 实际外购总工作量，来自任务表
+	 * 已完成工作量-来自计划中实际完成工作量
 	 **/
-	public void setTotalActOutWorkload(BigDecimal totalActOutWorkload) {
-		this.totalActOutWorkload = totalActOutWorkload;
+	public void setActWorkload(BigDecimal actWorkload) {
+		this.actWorkload = actWorkload;
 	}
 	/**
-	 * 实际内部总工作量，来自任务表
+	 * 0|初始
 	 **/
-	public void setTotalActInnerWorkload(BigDecimal totalActInnerWorkload) {
-		this.totalActInnerWorkload = totalActInnerWorkload;
+	public void setProjectStatus(String projectStatus) {
+		this.projectStatus = projectStatus;
 	}
 	/**
-	 * 已经分配到任务的总预算
+	 * 实际外购总工作量，来自任务表
 	 **/
-	public void setTotalTaskBudgetCostAt(BigDecimal totalTaskBudgetCostAt) {
-		this.totalTaskBudgetCostAt = totalTaskBudgetCostAt;
+	public void setActOuserWorkload(BigDecimal actOuserWorkload) {
+		this.actOuserWorkload = actOuserWorkload;
 	}
 	/**
-	 * 外购任务数，来自任务表
+	 * 实际内部总工作量，来自任务表
 	 **/
-	public void setTotalTaskOutCnt(BigDecimal totalTaskOutCnt) {
-		this.totalTaskOutCnt = totalTaskOutCnt;
+	public void setActIuserWorkload(BigDecimal actIuserWorkload) {
+		this.actIuserWorkload = actIuserWorkload;
 	}
 	/**
 	 * 待付款笔数
 	 **/
-	public void setTotalNeedPayCnt(BigDecimal totalNeedPayCnt) {
-		this.totalNeedPayCnt = totalNeedPayCnt;
+	public void setNeedPayCnt(BigDecimal needPayCnt) {
+		this.needPayCnt = needPayCnt;
 	}
 	/**
 	 * 完成付款总比数
 	 **/
-	public void setTotalFinishPayCnt(BigDecimal totalFinishPayCnt) {
-		this.totalFinishPayCnt = totalFinishPayCnt;
+	public void setFinishPayCnt(BigDecimal finishPayCnt) {
+		this.finishPayCnt = finishPayCnt;
 	}
 	/**
 	 * 已付款总人数
 	 **/
-	public void setTotalFinishPayUserCnt(BigDecimal totalFinishPayUserCnt) {
-		this.totalFinishPayUserCnt = totalFinishPayUserCnt;
+	public void setFinishPayUserCnt(BigDecimal finishPayUserCnt) {
+		this.finishPayUserCnt = finishPayUserCnt;
 	}
 	/**
 	 * 待付款总人数
 	 **/
-	public void setTotalNeedPayUserCnt(BigDecimal totalNeedPayUserCnt) {
-		this.totalNeedPayUserCnt = totalNeedPayUserCnt;
-	}
-	/**
-	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
-	 **/
-	public void setTotalPlanIuserWorkload(BigDecimal totalPlanIuserWorkload) {
-		this.totalPlanIuserWorkload = totalPlanIuserWorkload;
-	}
-	/**
-	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
-	 **/
-	public void setTotalPlanOuserWorkload(BigDecimal totalPlanOuserWorkload) {
-		this.totalPlanOuserWorkload = totalPlanOuserWorkload;
+	public void setNeedPayUserCnt(BigDecimal needPayUserCnt) {
+		this.needPayUserCnt = needPayUserCnt;
 	}
 	/**
 	 * 测试案例总数
@@ -524,6 +479,18 @@ public class XmProjectState  implements java.io.Serializable {
 	public void setProductCnt(Integer productCnt) {
 		this.productCnt = productCnt;
 	}
+	/**
+	 * 最早开始日期
+	 **/
+	public void setMinStartTime(Date minStartTime) {
+		this.minStartTime = minStartTime;
+	}
+	/**
+	 * 最晚结束时间
+	 **/
+	public void setMaxEndTime(Date maxEndTime) {
+		this.maxEndTime = maxEndTime;
+	}
 	/**
 	 * 故事数
 	 **/
@@ -531,203 +498,215 @@ public class XmProjectState  implements java.io.Serializable {
 		this.menuCnt = menuCnt;
 	}
 	/**
-	 * 完成的故事数
+	 * 已完成需求数，2状态需求
 	 **/
-	public void setFinishMenuCnt(Integer finishMenuCnt) {
-		this.finishMenuCnt = finishMenuCnt;
+	public void setMenuFinishCnt(Integer menuFinishCnt) {
+		this.menuFinishCnt = menuFinishCnt;
 	}
 	/**
-	 * 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
+	 * 执行中需求数，1状态的需求
 	 **/
-	public void setEstimateWorkload(BigDecimal estimateWorkload) {
-		this.estimateWorkload = estimateWorkload;
+	public void setMenuExecCnt(Integer menuExecCnt) {
+		this.menuExecCnt = menuExecCnt;
 	}
 	/**
-	 * 执行中任务数=任务表开始日期小于=当前日期，进度<100的任务
+	 * 未开始需求数，0状态数据
 	 **/
-	public void setExecTaskCnt(Integer execTaskCnt) {
-		this.execTaskCnt = execTaskCnt;
+	public void setMenuUnstartCnt(Integer menuUnstartCnt) {
+		this.menuUnstartCnt = menuUnstartCnt;
 	}
 	/**
-	 * 待开始的任务数=任务表中开始日期=当前日期+1的任务数
+	 * 已关闭需求数，3状态数据
 	 **/
-	public void setToStartTaskCnt(Integer toStartTaskCnt) {
-		this.toStartTaskCnt = toStartTaskCnt;
+	public void setMenuCloseCnt(Integer menuCloseCnt) {
+		this.menuCloseCnt = menuCloseCnt;
 	}
 	/**
-	 * 执行中需求=需求表中开始日期小于小于等于当前日期，进度<100的需求
+	 * 任务总数
 	 **/
-	public void setExecMenuCnt(Integer execMenuCnt) {
-		this.execMenuCnt = execMenuCnt;
+	public void setTaskCnt(Integer taskCnt) {
+		this.taskCnt = taskCnt;
 	}
 	/**
-	 * 待开始需求数=需求表中开始日期=当前日期+1的需求数
+	 * 待开始任务
 	 **/
-	public void setToStartMenuCnt(Integer toStartMenuCnt) {
-		this.toStartMenuCnt = toStartMenuCnt;
+	public void setTaskUnstartCnt(Integer taskUnstartCnt) {
+		this.taskUnstartCnt = taskUnstartCnt;
 	}
 	/**
-	 * 最早开始日期
+	 * 执行中任务
 	 **/
-	public void setMinStartTime(Date minStartTime) {
-		this.minStartTime = minStartTime;
+	public void setTaskExecCnt(Integer taskExecCnt) {
+		this.taskExecCnt = taskExecCnt;
 	}
 	/**
-	 * 最晚结束时间
+	 * 已完成任务总数-来自任务表
 	 **/
-	public void setMaxEndTime(Date maxEndTime) {
-		this.maxEndTime = maxEndTime;
+	public void setTaskFinishCnt(Integer taskFinishCnt) {
+		this.taskFinishCnt = taskFinishCnt;
 	}
-	
 	/**
-	 * 项目编号
+	 * 已结算任务
 	 **/
-	public String getProjectId() {
-		return this.projectId;
+	public void setTaskSetCnt(Integer taskSetCnt) {
+		this.taskSetCnt = taskSetCnt;
 	}
 	/**
-	 * 统计日期yyyy-mm-dd类型
+	 * 外购任务数，来自任务表
 	 **/
-	public String getBizDate() {
-		return this.bizDate;
+	public void setTaskOutCnt(BigDecimal taskOutCnt) {
+		this.taskOutCnt = taskOutCnt;
 	}
 	/**
-	 * 文件数据
+	 * 已关闭任务
 	 **/
-	public Integer getTotalFileCnt() {
-		return this.totalFileCnt;
+	public void setTaskCloseCnt(Integer taskCloseCnt) {
+		this.taskCloseCnt = taskCloseCnt;
 	}
 	/**
 	 * bug数目
 	 **/
-	public Integer getTotalBugCnt() {
-		return this.totalBugCnt;
+	public void setBugCnt(Integer bugCnt) {
+		this.bugCnt = bugCnt;
 	}
 	/**
-	 * 任务数
+	 * 已关闭bug总数
 	 **/
-	public Integer getTotalTaskCnt() {
-		return this.totalTaskCnt;
+	public void setClosedBugs(Integer closedBugs) {
+		this.closedBugs = closedBugs;
 	}
 	/**
-	 * 项目总非人力预算-来自项目表
+	 * 已解决bug总数
 	 **/
-	public BigDecimal getTotalBudgetNouserAmount() {
-		return this.totalBudgetNouserAmount;
+	public void setResolvedBugs(Integer resolvedBugs) {
+		this.resolvedBugs = resolvedBugs;
 	}
 	/**
-	 * 项目名称
+	 * 激活的bug总数
 	 **/
-	public String getProjectName() {
-		return this.projectName;
+	public void setActiveBugs(Integer activeBugs) {
+		this.activeBugs = activeBugs;
 	}
 	/**
-	 * 总参与人数
+	 * 已解决bug总数
 	 **/
-	public Integer getTotalStaffCnt() {
-		return this.totalStaffCnt;
+	public void setConfirmedBugs(Integer confirmedBugs) {
+		this.confirmedBugs = confirmedBugs;
 	}
 	/**
-	 * 统计执行日期
+	 * 工期（小时）
 	 **/
-	public Date getCalcTime() {
-		return this.calcTime;
+	public void setPlanWorkhours(BigDecimal planWorkhours) {
+		this.planWorkhours = planWorkhours;
 	}
 	/**
-	 * 0-暂时的1稳定的，暂时的可以被覆盖，稳定的不允许覆盖
+	 * 总人数
 	 **/
-	public String getCalcStatus() {
-		return this.calcStatus;
+	public void setPlanWorkerCnt(Integer planWorkerCnt) {
+		this.planWorkerCnt = planWorkerCnt;
 	}
 	/**
-	 * 项目总非人力成本
+	 * 实际投入人员数
 	 **/
-	public BigDecimal getTotalCostNouserAmount() {
-		return this.totalCostNouserAmount;
+	public void setActWorkerCnt(BigDecimal actWorkerCnt) {
+		this.actWorkerCnt = actWorkerCnt;
 	}
 	/**
-	 * 已关闭bug总数
+	 * 预算总金额
 	 **/
-	public Integer getTotalClosedBugCnt() {
-		return this.totalClosedBugCnt;
+	public void setBudgetAt(BigDecimal budgetAt) {
+		this.budgetAt = budgetAt;
 	}
 	/**
-	 * 已解决bug总数
+	 * 实际总金额
 	 **/
-	public Integer getTotalResolvedBugCnt() {
-		return this.totalResolvedBugCnt;
+	public void setActAt(BigDecimal actAt) {
+		this.actAt = actAt;
 	}
+	
 	/**
-	 * 已完成任务总数-来自任务表
+	 * 项目编号
 	 **/
-	public Integer getTotalCompleteTaskCnt() {
-		return this.totalCompleteTaskCnt;
+	public String getProjectId() {
+		return this.projectId;
 	}
 	/**
-	 * 项目阶段计划数
+	 * 统计日期yyyy-mm-dd类型
 	 **/
-	public Integer getTotalPhaseCnt() {
-		return this.totalPhaseCnt;
+	public String getBizDate() {
+		return this.bizDate;
 	}
 	/**
-	 * 项目阶段计划已完成数
+	 * 文件数据
 	 **/
-	public Integer getTotalCompletePhaseCnt() {
-		return this.totalCompletePhaseCnt;
+	public Integer getFileCnt() {
+		return this.fileCnt;
 	}
 	/**
-	 * 待付款总金额
+	 * 项目名称
+	 **/
+	public String getProjectName() {
+		return this.projectName;
+	}
+	/**
+	 * 统计执行日期
 	 **/
-	public BigDecimal getTotalNeedPayAmount() {
-		return this.totalNeedPayAmount;
+	public Date getCalcTime() {
+		return this.calcTime;
 	}
 	/**
-	 * 已付款总金额
+	 * 0-暂时的1稳定的，暂时的可以被覆盖，稳定的不允许覆盖
 	 **/
-	public BigDecimal getTotalFinishPayAmount() {
-		return this.totalFinishPayAmount;
+	public String getCalcStatus() {
+		return this.calcStatus;
 	}
 	/**
-	 * 待收款总金额
+	 * 项目阶段计划数
 	 **/
-	public BigDecimal getTotalNeedColAmount() {
-		return this.totalNeedColAmount;
+	public Integer getPhaseCnt() {
+		return this.phaseCnt;
 	}
 	/**
-	 * 已收款总金额
+	 * 项目阶段计划已完成数
 	 **/
-	public BigDecimal getTotalFinishColAmount() {
-		return this.totalFinishColAmount;
+	public Integer getPhaseFinishCnt() {
+		return this.phaseFinishCnt;
 	}
 	/**
-	 * 项目总人力成本
+	 * 待付款总金额
 	 **/
-	public BigDecimal getTotalCostUserAmount() {
-		return this.totalCostUserAmount;
+	public BigDecimal getNeedPayAt() {
+		return this.needPayAt;
 	}
 	/**
-	 * 项目总内部人力预算-来自项目表
+	 * 已付款总金额
 	 **/
-	public BigDecimal getTotalBudgetIuserAmount() {
-		return this.totalBudgetIuserAmount;
+	public BigDecimal getFinishPayAt() {
+		return this.finishPayAt;
 	}
 	/**
-	 * 项目总预算工作量-来自项目表
+	 * 待收款总金额
+	 **/
+	public BigDecimal getNeedColAt() {
+		return this.needColAt;
+	}
+	/**
+	 * 已收款总金额
 	 **/
-	public BigDecimal getTotalPlanWorkload() {
-		return this.totalPlanWorkload;
+	public BigDecimal getFinishColAt() {
+		return this.finishColAt;
 	}
 	/**
 	 * 项目风险总数
 	 **/
-	public Integer getTotalRiskCnt() {
-		return this.totalRiskCnt;
+	public Integer getRiskCnt() {
+		return this.riskCnt;
 	}
 	/**
 	 * 已完成风险总数
 	 **/
-	public Integer getTotalCompleteRiskCnt() {
-		return this.totalCompleteRiskCnt;
+	public Integer getRiskFinishCnt() {
+		return this.riskFinishCnt;
 	}
 	/**
 	 * 机构编号
@@ -742,118 +721,124 @@ public class XmProjectState  implements java.io.Serializable {
 		return this.branchName;
 	}
 	/**
-	 * 项目总外购人力预算-来自项目表
+	 * 项目总非人力预算-来自任务表
 	 **/
-	public BigDecimal getTotalBudgetOuserAmount() {
-		return this.totalBudgetOuserAmount;
+	public BigDecimal getBudgetNouserAt() {
+		return this.budgetNouserAt;
 	}
 	/**
-	 * 已完成工作量-来自计划中实际完成工作量
+	 * 项目总外购人力预算-来自任务表
+	 **/
+	public BigDecimal getBudgetOuserAt() {
+		return this.budgetOuserAt;
+	}
+	/**
+	 * 项目总内部人力预算-来自任务表
 	 **/
-	public BigDecimal getTotalCompleteWorkload() {
-		return this.totalCompleteWorkload;
+	public BigDecimal getBudgetIuserAt() {
+		return this.budgetIuserAt;
+	}
+	/**
+	 * 项目总人力成本
+	 **/
+	public BigDecimal getActUserAt() {
+		return this.actUserAt;
 	}
 	/**
 	 * 项目总内部人力成本金额
 	 **/
-	public BigDecimal getTotalCostIuserAmount() {
-		return this.totalCostIuserAmount;
+	public BigDecimal getActIuserAt() {
+		return this.actIuserAt;
 	}
 	/**
 	 * 项目总外购人力成本金额
 	 **/
-	public BigDecimal getTotalCostOuserAmount() {
-		return this.totalCostOuserAmount;
+	public BigDecimal getActOuserAt() {
+		return this.actOuserAt;
+	}
+	/**
+	 * 项目总非人力成本
+	 **/
+	public BigDecimal getActNouserAt() {
+		return this.actNouserAt;
 	}
 	/**
 	 * 项目进度0~100之间，来自任务表
 	 **/
-	public BigDecimal getTotalProgress() {
-		return this.totalProgress;
+	public BigDecimal getFinishRate() {
+		return this.finishRate;
 	}
 	/**
-	 * 激活的bug总数
+	 * 项目总预算工作量-来自任务表
 	 **/
-	public Integer getTotalActiveBugCnt() {
-		return this.totalActiveBugCnt;
+	public BigDecimal getBudgetWorkload() {
+		return this.budgetWorkload;
 	}
 	/**
-	 * 已解决bug总数
+	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
 	 **/
-	public Integer getTotalConfirmedBugCnt() {
-		return this.totalConfirmedBugCnt;
+	public BigDecimal getBudgetOuserWorkload() {
+		return this.budgetOuserWorkload;
 	}
 	/**
-	 * 0|初始
+	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
 	 **/
-	public String getProjectStatus() {
-		return this.projectStatus;
+	public BigDecimal getBudgetIuserWorkload() {
+		return this.budgetIuserWorkload;
 	}
 	/**
-	 * 实际总工作量，来自任务表
+	 * 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
 	 **/
-	public BigDecimal getTotalActWorkload() {
-		return this.totalActWorkload;
+	public BigDecimal getEstimateWorkload() {
+		return this.estimateWorkload;
 	}
 	/**
-	 * 实际外购总工作量，来自任务表
+	 * 已完成工作量-来自计划中实际完成工作量
 	 **/
-	public BigDecimal getTotalActOutWorkload() {
-		return this.totalActOutWorkload;
+	public BigDecimal getActWorkload() {
+		return this.actWorkload;
 	}
 	/**
-	 * 实际内部总工作量，来自任务表
+	 * 0|初始
 	 **/
-	public BigDecimal getTotalActInnerWorkload() {
-		return this.totalActInnerWorkload;
+	public String getProjectStatus() {
+		return this.projectStatus;
 	}
 	/**
-	 * 已经分配到任务的总预算
+	 * 实际外购总工作量，来自任务表
 	 **/
-	public BigDecimal getTotalTaskBudgetCostAt() {
-		return this.totalTaskBudgetCostAt;
+	public BigDecimal getActOuserWorkload() {
+		return this.actOuserWorkload;
 	}
 	/**
-	 * 外购任务数，来自任务表
+	 * 实际内部总工作量，来自任务表
 	 **/
-	public BigDecimal getTotalTaskOutCnt() {
-		return this.totalTaskOutCnt;
+	public BigDecimal getActIuserWorkload() {
+		return this.actIuserWorkload;
 	}
 	/**
 	 * 待付款笔数
 	 **/
-	public BigDecimal getTotalNeedPayCnt() {
-		return this.totalNeedPayCnt;
+	public BigDecimal getNeedPayCnt() {
+		return this.needPayCnt;
 	}
 	/**
 	 * 完成付款总比数
 	 **/
-	public BigDecimal getTotalFinishPayCnt() {
-		return this.totalFinishPayCnt;
+	public BigDecimal getFinishPayCnt() {
+		return this.finishPayCnt;
 	}
 	/**
 	 * 已付款总人数
 	 **/
-	public BigDecimal getTotalFinishPayUserCnt() {
-		return this.totalFinishPayUserCnt;
+	public BigDecimal getFinishPayUserCnt() {
+		return this.finishPayUserCnt;
 	}
 	/**
 	 * 待付款总人数
 	 **/
-	public BigDecimal getTotalNeedPayUserCnt() {
-		return this.totalNeedPayUserCnt;
-	}
-	/**
-	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
-	 **/
-	public BigDecimal getTotalPlanIuserWorkload() {
-		return this.totalPlanIuserWorkload;
-	}
-	/**
-	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
-	 **/
-	public BigDecimal getTotalPlanOuserWorkload() {
-		return this.totalPlanOuserWorkload;
+	public BigDecimal getNeedPayUserCnt() {
+		return this.needPayUserCnt;
 	}
 	/**
 	 * 测试案例总数
@@ -891,6 +876,18 @@ public class XmProjectState  implements java.io.Serializable {
 	public Integer getProductCnt() {
 		return this.productCnt;
 	}
+	/**
+	 * 最早开始日期
+	 **/
+	public Date getMinStartTime() {
+		return this.minStartTime;
+	}
+	/**
+	 * 最晚结束时间
+	 **/
+	public Date getMaxEndTime() {
+		return this.maxEndTime;
+	}
 	/**
 	 * 故事数
 	 **/
@@ -898,52 +895,130 @@ public class XmProjectState  implements java.io.Serializable {
 		return this.menuCnt;
 	}
 	/**
-	 * 完成的故事数
+	 * 已完成需求数，2状态需求
 	 **/
-	public Integer getFinishMenuCnt() {
-		return this.finishMenuCnt;
+	public Integer getMenuFinishCnt() {
+		return this.menuFinishCnt;
 	}
 	/**
-	 * 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
+	 * 执行中需求数，1状态的需求
 	 **/
-	public BigDecimal getEstimateWorkload() {
-		return this.estimateWorkload;
+	public Integer getMenuExecCnt() {
+		return this.menuExecCnt;
 	}
 	/**
-	 * 执行中任务数=任务表开始日期小于=当前日期，进度<100的任务
+	 * 未开始需求数，0状态数据
 	 **/
-	public Integer getExecTaskCnt() {
-		return this.execTaskCnt;
+	public Integer getMenuUnstartCnt() {
+		return this.menuUnstartCnt;
 	}
 	/**
-	 * 待开始的任务数=任务表中开始日期=当前日期+1的任务数
+	 * 已关闭需求数，3状态数据
 	 **/
-	public Integer getToStartTaskCnt() {
-		return this.toStartTaskCnt;
+	public Integer getMenuCloseCnt() {
+		return this.menuCloseCnt;
 	}
 	/**
-	 * 执行中需求=需求表中开始日期小于小于等于当前日期，进度<100的需求
+	 * 任务总数
 	 **/
-	public Integer getExecMenuCnt() {
-		return this.execMenuCnt;
+	public Integer getTaskCnt() {
+		return this.taskCnt;
 	}
 	/**
-	 * 待开始需求数=需求表中开始日期=当前日期+1的需求数
+	 * 待开始任务
 	 **/
-	public Integer getToStartMenuCnt() {
-		return this.toStartMenuCnt;
+	public Integer getTaskUnstartCnt() {
+		return this.taskUnstartCnt;
 	}
 	/**
-	 * 最早开始日期
+	 * 执行中任务
 	 **/
-	public Date getMinStartTime() {
-		return this.minStartTime;
+	public Integer getTaskExecCnt() {
+		return this.taskExecCnt;
 	}
 	/**
-	 * 最晚结束时间
+	 * 已完成任务总数-来自任务表
 	 **/
-	public Date getMaxEndTime() {
-		return this.maxEndTime;
+	public Integer getTaskFinishCnt() {
+		return this.taskFinishCnt;
+	}
+	/**
+	 * 已结算任务
+	 **/
+	public Integer getTaskSetCnt() {
+		return this.taskSetCnt;
+	}
+	/**
+	 * 外购任务数，来自任务表
+	 **/
+	public BigDecimal getTaskOutCnt() {
+		return this.taskOutCnt;
+	}
+	/**
+	 * 已关闭任务
+	 **/
+	public Integer getTaskCloseCnt() {
+		return this.taskCloseCnt;
+	}
+	/**
+	 * bug数目
+	 **/
+	public Integer getBugCnt() {
+		return this.bugCnt;
+	}
+	/**
+	 * 已关闭bug总数
+	 **/
+	public Integer getClosedBugs() {
+		return this.closedBugs;
+	}
+	/**
+	 * 已解决bug总数
+	 **/
+	public Integer getResolvedBugs() {
+		return this.resolvedBugs;
+	}
+	/**
+	 * 激活的bug总数
+	 **/
+	public Integer getActiveBugs() {
+		return this.activeBugs;
+	}
+	/**
+	 * 已解决bug总数
+	 **/
+	public Integer getConfirmedBugs() {
+		return this.confirmedBugs;
+	}
+	/**
+	 * 工期（小时）
+	 **/
+	public BigDecimal getPlanWorkhours() {
+		return this.planWorkhours;
+	}
+	/**
+	 * 总人数
+	 **/
+	public Integer getPlanWorkerCnt() {
+		return this.planWorkerCnt;
+	}
+	/**
+	 * 实际投入人员数
+	 **/
+	public BigDecimal getActWorkerCnt() {
+		return this.actWorkerCnt;
+	}
+	/**
+	 * 预算总金额
+	 **/
+	public BigDecimal getBudgetAt() {
+		return this.budgetAt;
+	}
+	/**
+	 * 实际总金额
+	 **/
+	public BigDecimal getActAt() {
+		return this.actAt;
 	}
 
 }
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectStateHis.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectStateHis.java
index bb0873c5..5f45a38c 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProjectStateHis.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectStateHis.java
@@ -2,15 +2,15 @@ package  com.xm.core.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
 import java.util.Date;
+import java.math.BigDecimal;
 
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmProjectStateHis所有属性名: <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>
+ *	projectId,bizDate,fileCnt,projectName,calcTime,calcStatus,phaseCnt,phaseFinishCnt,needPayAt,finishPayAt,needColAt,finishColAt,riskCnt,riskFinishCnt,branchId,branchName,budgetNouserAt,budgetOuserAt,budgetIuserAt,actUserAt,actIuserAt,actOuserAt,actNouserAt,finishRate,budgetWorkload,budgetOuserWorkload,budgetIuserWorkload,estimateWorkload,actWorkload,projectStatus,actOuserWorkload,actIuserWorkload,needPayCnt,finishPayCnt,finishPayUserCnt,needPayUserCnt,testCases,execCases,designCases,finishCases,iterationCnt,productCnt,minStartTime,maxEndTime,menuCnt,menuFinishCnt,menuExecCnt,menuUnstartCnt,menuCloseCnt,taskCnt,taskUnstartCnt,taskExecCnt,taskFinishCnt,taskSetCnt,taskOutCnt,taskCloseCnt,bugCnt,closedBugs,resolvedBugs,activeBugs,confirmedBugs,planWorkhours,planWorkerCnt,actWorkerCnt,budgetAt,actAt;<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>
+ *	project_id,biz_date,file_cnt,project_name,calc_time,calc_status,phase_cnt,phase_finish_cnt,need_pay_at,finish_pay_at,need_col_at,finish_col_at,risk_cnt,risk_finish_cnt,branch_id,branch_name,budget_nouser_at,budget_ouser_at,budget_iuser_at,act_user_at,act_iuser_at,act_ouser_at,act_nouser_at,finish_rate,budget_workload,budget_ouser_workload,budget_iuser_workload,estimate_workload,act_workload,project_status,act_ouser_workload,act_iuser_workload,need_pay_cnt,finish_pay_cnt,finish_pay_user_cnt,need_pay_user_cnt,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,min_start_time,max_end_time,menu_cnt,menu_finish_cnt,menu_exec_cnt,menu_unstart_cnt,menu_close_cnt,task_cnt,task_unstart_cnt,task_exec_cnt,task_finish_cnt,task_set_cnt,task_out_cnt,task_close_cnt,bug_cnt,closed_bugs,resolved_bugs,active_bugs,confirmed_bugs,plan_workhours,plan_worker_cnt,act_worker_cnt,budget_at,act_at;<br>
  * 当前主键(包括多主键):<br>
  *	project_id,biz_date;<br>
  */
@@ -27,73 +27,40 @@ public class XmProjectStateHis  implements java.io.Serializable {
   	
 	
 	@ApiModelProperty(notes="文件数据",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalFileCnt;
-	
-	@ApiModelProperty(notes="bug数目",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalBugCnt;
-	
-	@ApiModelProperty(notes="任务数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalTaskCnt;
-	
-	@ApiModelProperty(notes="项目总非人力预算-来自项目表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalBudgetNouserAmount;
+	Integer fileCnt;
 	
 	@ApiModelProperty(notes="项目名称",allowEmptyValue=true,example="",allowableValues="")
 	String projectName;
 	
-	@ApiModelProperty(notes="总参与人数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalStaffCnt;
-	
 	@ApiModelProperty(notes="统计执行日期",allowEmptyValue=true,example="",allowableValues="")
 	Date calcTime;
 	
 	@ApiModelProperty(notes="0-暂时的1稳定的，暂时的可以被覆盖，稳定的不允许覆盖",allowEmptyValue=true,example="",allowableValues="")
 	String calcStatus;
 	
-	@ApiModelProperty(notes="项目总非人力成本",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalCostNouserAmount;
-	
-	@ApiModelProperty(notes="已关闭bug总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalClosedBugCnt;
-	
-	@ApiModelProperty(notes="已解决bug总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalResolvedBugCnt;
-	
-	@ApiModelProperty(notes="已完成任务总数-来自任务表",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalCompleteTaskCnt;
-	
 	@ApiModelProperty(notes="项目阶段计划数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalPhaseCnt;
+	Integer phaseCnt;
 	
 	@ApiModelProperty(notes="项目阶段计划已完成数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalCompletePhaseCnt;
+	Integer phaseFinishCnt;
 	
 	@ApiModelProperty(notes="待付款总金额",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalNeedPayAmount;
+	BigDecimal needPayAt;
 	
 	@ApiModelProperty(notes="已付款总金额",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalFinishPayAmount;
+	BigDecimal finishPayAt;
 	
 	@ApiModelProperty(notes="待收款总金额",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalNeedColAmount;
+	BigDecimal needColAt;
 	
 	@ApiModelProperty(notes="已收款总金额",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalFinishColAmount;
-	
-	@ApiModelProperty(notes="项目总人力成本",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalCostUserAmount;
-	
-	@ApiModelProperty(notes="项目总内部人力预算-来自项目表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalBudgetIuserAmount;
-	
-	@ApiModelProperty(notes="项目总预算工作量-来自项目表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalPlanWorkload;
+	BigDecimal finishColAt;
 	
 	@ApiModelProperty(notes="项目风险总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalRiskCnt;
+	Integer riskCnt;
 	
 	@ApiModelProperty(notes="已完成风险总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalCompleteRiskCnt;
+	Integer riskFinishCnt;
 	
 	@ApiModelProperty(notes="机构编号",allowEmptyValue=true,example="",allowableValues="")
 	String branchId;
@@ -101,62 +68,65 @@ public class XmProjectStateHis  implements java.io.Serializable {
 	@ApiModelProperty(notes="机构名称",allowEmptyValue=true,example="",allowableValues="")
 	String branchName;
 	
-	@ApiModelProperty(notes="项目总外购人力预算-来自项目表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalBudgetOuserAmount;
+	@ApiModelProperty(notes="项目总非人力预算-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetNouserAt;
 	
-	@ApiModelProperty(notes="已完成工作量-来自计划中实际完成工作量",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalCompleteWorkload;
+	@ApiModelProperty(notes="项目总外购人力预算-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetOuserAt;
+	
+	@ApiModelProperty(notes="项目总内部人力预算-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetIuserAt;
+	
+	@ApiModelProperty(notes="项目总人力成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actUserAt;
 	
 	@ApiModelProperty(notes="项目总内部人力成本金额",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalCostIuserAmount;
+	BigDecimal actIuserAt;
 	
 	@ApiModelProperty(notes="项目总外购人力成本金额",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalCostOuserAmount;
+	BigDecimal actOuserAt;
+	
+	@ApiModelProperty(notes="项目总非人力成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actNouserAt;
 	
 	@ApiModelProperty(notes="项目进度0~100之间，来自任务表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalProgress;
+	BigDecimal finishRate;
 	
-	@ApiModelProperty(notes="激活的bug总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalActiveBugCnt;
+	@ApiModelProperty(notes="项目总预算工作量-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetWorkload;
 	
-	@ApiModelProperty(notes="已解决bug总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalConfirmedBugCnt;
+	@ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetOuserWorkload;
+	
+	@ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetIuserWorkload;
+	
+	@ApiModelProperty(notes="预估工时=计划结束时间在计算当日前完成的任务的预算工时总和",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal estimateWorkload;
+	
+	@ApiModelProperty(notes="已完成工作量-来自计划中实际完成工作量",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actWorkload;
 	
 	@ApiModelProperty(notes="0|初始",allowEmptyValue=true,example="",allowableValues="")
 	String projectStatus;
 	
-	@ApiModelProperty(notes="实际总工作量，来自任务表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalActWorkload;
-	
 	@ApiModelProperty(notes="实际外购总工作量，来自任务表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalActOutWorkload;
+	BigDecimal actOuserWorkload;
 	
 	@ApiModelProperty(notes="实际内部总工作量，来自任务表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalActInnerWorkload;
-	
-	@ApiModelProperty(notes="已经分配到任务的总预算",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalTaskBudgetCostAt;
-	
-	@ApiModelProperty(notes="外购任务数，来自任务表",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalTaskOutCnt;
+	BigDecimal actIuserWorkload;
 	
 	@ApiModelProperty(notes="待付款笔数",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalNeedPayCnt;
+	BigDecimal needPayCnt;
 	
 	@ApiModelProperty(notes="完成付款总比数",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalFinishPayCnt;
+	BigDecimal finishPayCnt;
 	
 	@ApiModelProperty(notes="已付款总人数",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalFinishPayUserCnt;
+	BigDecimal finishPayUserCnt;
 	
 	@ApiModelProperty(notes="待付款总人数",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalNeedPayUserCnt;
-	
-	@ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalPlanIuserWorkload;
-	
-	@ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalPlanOuserWorkload;
+	BigDecimal needPayUserCnt;
 	
 	@ApiModelProperty(notes="测试案例总数",allowEmptyValue=true,example="",allowableValues="")
 	Integer testCases;
@@ -176,32 +146,77 @@ public class XmProjectStateHis  implements java.io.Serializable {
 	@ApiModelProperty(notes="产品数",allowEmptyValue=true,example="",allowableValues="")
 	Integer productCnt;
 	
+	@ApiModelProperty(notes="最早开始日期",allowEmptyValue=true,example="",allowableValues="")
+	Date minStartTime;
+	
+	@ApiModelProperty(notes="最晚结束时间",allowEmptyValue=true,example="",allowableValues="")
+	Date maxEndTime;
+	
 	@ApiModelProperty(notes="故事数",allowEmptyValue=true,example="",allowableValues="")
 	Integer menuCnt;
 	
-	@ApiModelProperty(notes="完成的故事数",allowEmptyValue=true,example="",allowableValues="")
-	Integer finishMenuCnt;
+	@ApiModelProperty(notes="已完成需求数，2状态需求",allowEmptyValue=true,example="",allowableValues="")
+	Integer menuFinishCnt;
 	
-	@ApiModelProperty(notes="预估工时=计划结束时间在计算当日前完成的任务的预算工时总和",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal estimateWorkload;
+	@ApiModelProperty(notes="执行中需求数，1状态的需求",allowEmptyValue=true,example="",allowableValues="")
+	Integer menuExecCnt;
 	
-	@ApiModelProperty(notes="执行中任务数=任务表开始日期小于=当前日期，进度<100的任务",allowEmptyValue=true,example="",allowableValues="")
-	Integer execTaskCnt;
+	@ApiModelProperty(notes="未开始需求数，0状态数据",allowEmptyValue=true,example="",allowableValues="")
+	Integer menuUnstartCnt;
 	
-	@ApiModelProperty(notes="待开始的任务数=任务表中开始日期=当前日期+1的任务数",allowEmptyValue=true,example="",allowableValues="")
-	Integer toStartTaskCnt;
+	@ApiModelProperty(notes="已关闭需求数，3状态数据",allowEmptyValue=true,example="",allowableValues="")
+	Integer menuCloseCnt;
 	
-	@ApiModelProperty(notes="执行中需求=需求表中开始日期小于小于等于当前日期，进度<100的需求",allowEmptyValue=true,example="",allowableValues="")
-	Integer execMenuCnt;
+	@ApiModelProperty(notes="任务总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskCnt;
 	
-	@ApiModelProperty(notes="待开始需求数=需求表中开始日期=当前日期+1的需求数",allowEmptyValue=true,example="",allowableValues="")
-	Integer toStartMenuCnt;
+	@ApiModelProperty(notes="待开始任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskUnstartCnt;
 	
-	@ApiModelProperty(notes="最早开始日期",allowEmptyValue=true,example="",allowableValues="")
-	Date minStartTime;
+	@ApiModelProperty(notes="执行中任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskExecCnt;
 	
-	@ApiModelProperty(notes="最晚结束时间",allowEmptyValue=true,example="",allowableValues="")
-	Date maxEndTime;
+	@ApiModelProperty(notes="已完成任务总数-来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskFinishCnt;
+	
+	@ApiModelProperty(notes="已结算任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskSetCnt;
+	
+	@ApiModelProperty(notes="外购任务数，来自任务表",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal taskOutCnt;
+	
+	@ApiModelProperty(notes="已关闭任务",allowEmptyValue=true,example="",allowableValues="")
+	Integer taskCloseCnt;
+	
+	@ApiModelProperty(notes="bug数目",allowEmptyValue=true,example="",allowableValues="")
+	Integer bugCnt;
+	
+	@ApiModelProperty(notes="已关闭bug总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer closedBugs;
+	
+	@ApiModelProperty(notes="已解决bug总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer resolvedBugs;
+	
+	@ApiModelProperty(notes="激活的bug总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer activeBugs;
+	
+	@ApiModelProperty(notes="已解决bug总数",allowEmptyValue=true,example="",allowableValues="")
+	Integer confirmedBugs;
+	
+	@ApiModelProperty(notes="工期（小时）",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal planWorkhours;
+	
+	@ApiModelProperty(notes="总人数",allowEmptyValue=true,example="",allowableValues="")
+	Integer planWorkerCnt;
+	
+	@ApiModelProperty(notes="实际投入人员数",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actWorkerCnt;
+	
+	@ApiModelProperty(notes="预算总金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal budgetAt;
+	
+	@ApiModelProperty(notes="实际总金额",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal actAt;
 
 	/**项目编号,统计日期yyyy-mm-dd类型**/
 	public XmProjectStateHis(String projectId,String bizDate) {
@@ -228,26 +243,8 @@ public class XmProjectStateHis  implements java.io.Serializable {
 	/**
 	 * 文件数据
 	 **/
-	public void setTotalFileCnt(Integer totalFileCnt) {
-		this.totalFileCnt = totalFileCnt;
-	}
-	/**
-	 * bug数目
-	 **/
-	public void setTotalBugCnt(Integer totalBugCnt) {
-		this.totalBugCnt = totalBugCnt;
-	}
-	/**
-	 * 任务数
-	 **/
-	public void setTotalTaskCnt(Integer totalTaskCnt) {
-		this.totalTaskCnt = totalTaskCnt;
-	}
-	/**
-	 * 项目总非人力预算-来自项目表
-	 **/
-	public void setTotalBudgetNouserAmount(BigDecimal totalBudgetNouserAmount) {
-		this.totalBudgetNouserAmount = totalBudgetNouserAmount;
+	public void setFileCnt(Integer fileCnt) {
+		this.fileCnt = fileCnt;
 	}
 	/**
 	 * 项目名称
@@ -255,12 +252,6 @@ public class XmProjectStateHis  implements java.io.Serializable {
 	public void setProjectName(String projectName) {
 		this.projectName = projectName;
 	}
-	/**
-	 * 总参与人数
-	 **/
-	public void setTotalStaffCnt(Integer totalStaffCnt) {
-		this.totalStaffCnt = totalStaffCnt;
-	}
 	/**
 	 * 统计执行日期
 	 **/
@@ -273,95 +264,53 @@ public class XmProjectStateHis  implements java.io.Serializable {
 	public void setCalcStatus(String calcStatus) {
 		this.calcStatus = calcStatus;
 	}
-	/**
-	 * 项目总非人力成本
-	 **/
-	public void setTotalCostNouserAmount(BigDecimal totalCostNouserAmount) {
-		this.totalCostNouserAmount = totalCostNouserAmount;
-	}
-	/**
-	 * 已关闭bug总数
-	 **/
-	public void setTotalClosedBugCnt(Integer totalClosedBugCnt) {
-		this.totalClosedBugCnt = totalClosedBugCnt;
-	}
-	/**
-	 * 已解决bug总数
-	 **/
-	public void setTotalResolvedBugCnt(Integer totalResolvedBugCnt) {
-		this.totalResolvedBugCnt = totalResolvedBugCnt;
-	}
-	/**
-	 * 已完成任务总数-来自任务表
-	 **/
-	public void setTotalCompleteTaskCnt(Integer totalCompleteTaskCnt) {
-		this.totalCompleteTaskCnt = totalCompleteTaskCnt;
-	}
 	/**
 	 * 项目阶段计划数
 	 **/
-	public void setTotalPhaseCnt(Integer totalPhaseCnt) {
-		this.totalPhaseCnt = totalPhaseCnt;
+	public void setPhaseCnt(Integer phaseCnt) {
+		this.phaseCnt = phaseCnt;
 	}
 	/**
 	 * 项目阶段计划已完成数
 	 **/
-	public void setTotalCompletePhaseCnt(Integer totalCompletePhaseCnt) {
-		this.totalCompletePhaseCnt = totalCompletePhaseCnt;
+	public void setPhaseFinishCnt(Integer phaseFinishCnt) {
+		this.phaseFinishCnt = phaseFinishCnt;
 	}
 	/**
 	 * 待付款总金额
 	 **/
-	public void setTotalNeedPayAmount(BigDecimal totalNeedPayAmount) {
-		this.totalNeedPayAmount = totalNeedPayAmount;
+	public void setNeedPayAt(BigDecimal needPayAt) {
+		this.needPayAt = needPayAt;
 	}
 	/**
 	 * 已付款总金额
 	 **/
-	public void setTotalFinishPayAmount(BigDecimal totalFinishPayAmount) {
-		this.totalFinishPayAmount = totalFinishPayAmount;
+	public void setFinishPayAt(BigDecimal finishPayAt) {
+		this.finishPayAt = finishPayAt;
 	}
 	/**
 	 * 待收款总金额
 	 **/
-	public void setTotalNeedColAmount(BigDecimal totalNeedColAmount) {
-		this.totalNeedColAmount = totalNeedColAmount;
+	public void setNeedColAt(BigDecimal needColAt) {
+		this.needColAt = needColAt;
 	}
 	/**
 	 * 已收款总金额
 	 **/
-	public void setTotalFinishColAmount(BigDecimal totalFinishColAmount) {
-		this.totalFinishColAmount = totalFinishColAmount;
-	}
-	/**
-	 * 项目总人力成本
-	 **/
-	public void setTotalCostUserAmount(BigDecimal totalCostUserAmount) {
-		this.totalCostUserAmount = totalCostUserAmount;
-	}
-	/**
-	 * 项目总内部人力预算-来自项目表
-	 **/
-	public void setTotalBudgetIuserAmount(BigDecimal totalBudgetIuserAmount) {
-		this.totalBudgetIuserAmount = totalBudgetIuserAmount;
-	}
-	/**
-	 * 项目总预算工作量-来自项目表
-	 **/
-	public void setTotalPlanWorkload(BigDecimal totalPlanWorkload) {
-		this.totalPlanWorkload = totalPlanWorkload;
+	public void setFinishColAt(BigDecimal finishColAt) {
+		this.finishColAt = finishColAt;
 	}
 	/**
 	 * 项目风险总数
 	 **/
-	public void setTotalRiskCnt(Integer totalRiskCnt) {
-		this.totalRiskCnt = totalRiskCnt;
+	public void setRiskCnt(Integer riskCnt) {
+		this.riskCnt = riskCnt;
 	}
 	/**
 	 * 已完成风险总数
 	 **/
-	public void setTotalCompleteRiskCnt(Integer totalCompleteRiskCnt) {
-		this.totalCompleteRiskCnt = totalCompleteRiskCnt;
+	public void setRiskFinishCnt(Integer riskFinishCnt) {
+		this.riskFinishCnt = riskFinishCnt;
 	}
 	/**
 	 * 机构编号
@@ -376,118 +325,124 @@ public class XmProjectStateHis  implements java.io.Serializable {
 		this.branchName = branchName;
 	}
 	/**
-	 * 项目总外购人力预算-来自项目表
+	 * 项目总非人力预算-来自任务表
 	 **/
-	public void setTotalBudgetOuserAmount(BigDecimal totalBudgetOuserAmount) {
-		this.totalBudgetOuserAmount = totalBudgetOuserAmount;
+	public void setBudgetNouserAt(BigDecimal budgetNouserAt) {
+		this.budgetNouserAt = budgetNouserAt;
 	}
 	/**
-	 * 已完成工作量-来自计划中实际完成工作量
+	 * 项目总外购人力预算-来自任务表
 	 **/
-	public void setTotalCompleteWorkload(BigDecimal totalCompleteWorkload) {
-		this.totalCompleteWorkload = totalCompleteWorkload;
+	public void setBudgetOuserAt(BigDecimal budgetOuserAt) {
+		this.budgetOuserAt = budgetOuserAt;
+	}
+	/**
+	 * 项目总内部人力预算-来自任务表
+	 **/
+	public void setBudgetIuserAt(BigDecimal budgetIuserAt) {
+		this.budgetIuserAt = budgetIuserAt;
+	}
+	/**
+	 * 项目总人力成本
+	 **/
+	public void setActUserAt(BigDecimal actUserAt) {
+		this.actUserAt = actUserAt;
 	}
 	/**
 	 * 项目总内部人力成本金额
 	 **/
-	public void setTotalCostIuserAmount(BigDecimal totalCostIuserAmount) {
-		this.totalCostIuserAmount = totalCostIuserAmount;
+	public void setActIuserAt(BigDecimal actIuserAt) {
+		this.actIuserAt = actIuserAt;
 	}
 	/**
 	 * 项目总外购人力成本金额
 	 **/
-	public void setTotalCostOuserAmount(BigDecimal totalCostOuserAmount) {
-		this.totalCostOuserAmount = totalCostOuserAmount;
+	public void setActOuserAt(BigDecimal actOuserAt) {
+		this.actOuserAt = actOuserAt;
+	}
+	/**
+	 * 项目总非人力成本
+	 **/
+	public void setActNouserAt(BigDecimal actNouserAt) {
+		this.actNouserAt = actNouserAt;
 	}
 	/**
 	 * 项目进度0~100之间，来自任务表
 	 **/
-	public void setTotalProgress(BigDecimal totalProgress) {
-		this.totalProgress = totalProgress;
+	public void setFinishRate(BigDecimal finishRate) {
+		this.finishRate = finishRate;
 	}
 	/**
-	 * 激活的bug总数
+	 * 项目总预算工作量-来自任务表
 	 **/
-	public void setTotalActiveBugCnt(Integer totalActiveBugCnt) {
-		this.totalActiveBugCnt = totalActiveBugCnt;
+	public void setBudgetWorkload(BigDecimal budgetWorkload) {
+		this.budgetWorkload = budgetWorkload;
 	}
 	/**
-	 * 已解决bug总数
+	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
 	 **/
-	public void setTotalConfirmedBugCnt(Integer totalConfirmedBugCnt) {
-		this.totalConfirmedBugCnt = totalConfirmedBugCnt;
+	public void setBudgetOuserWorkload(BigDecimal budgetOuserWorkload) {
+		this.budgetOuserWorkload = budgetOuserWorkload;
 	}
 	/**
-	 * 0|初始
+	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
 	 **/
-	public void setProjectStatus(String projectStatus) {
-		this.projectStatus = projectStatus;
+	public void setBudgetIuserWorkload(BigDecimal budgetIuserWorkload) {
+		this.budgetIuserWorkload = budgetIuserWorkload;
 	}
 	/**
-	 * 实际总工作量，来自任务表
+	 * 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
 	 **/
-	public void setTotalActWorkload(BigDecimal totalActWorkload) {
-		this.totalActWorkload = totalActWorkload;
+	public void setEstimateWorkload(BigDecimal estimateWorkload) {
+		this.estimateWorkload = estimateWorkload;
 	}
 	/**
-	 * 实际外购总工作量，来自任务表
+	 * 已完成工作量-来自计划中实际完成工作量
 	 **/
-	public void setTotalActOutWorkload(BigDecimal totalActOutWorkload) {
-		this.totalActOutWorkload = totalActOutWorkload;
+	public void setActWorkload(BigDecimal actWorkload) {
+		this.actWorkload = actWorkload;
 	}
 	/**
-	 * 实际内部总工作量，来自任务表
+	 * 0|初始
 	 **/
-	public void setTotalActInnerWorkload(BigDecimal totalActInnerWorkload) {
-		this.totalActInnerWorkload = totalActInnerWorkload;
+	public void setProjectStatus(String projectStatus) {
+		this.projectStatus = projectStatus;
 	}
 	/**
-	 * 已经分配到任务的总预算
+	 * 实际外购总工作量，来自任务表
 	 **/
-	public void setTotalTaskBudgetCostAt(BigDecimal totalTaskBudgetCostAt) {
-		this.totalTaskBudgetCostAt = totalTaskBudgetCostAt;
+	public void setActOuserWorkload(BigDecimal actOuserWorkload) {
+		this.actOuserWorkload = actOuserWorkload;
 	}
 	/**
-	 * 外购任务数，来自任务表
+	 * 实际内部总工作量，来自任务表
 	 **/
-	public void setTotalTaskOutCnt(BigDecimal totalTaskOutCnt) {
-		this.totalTaskOutCnt = totalTaskOutCnt;
+	public void setActIuserWorkload(BigDecimal actIuserWorkload) {
+		this.actIuserWorkload = actIuserWorkload;
 	}
 	/**
 	 * 待付款笔数
 	 **/
-	public void setTotalNeedPayCnt(BigDecimal totalNeedPayCnt) {
-		this.totalNeedPayCnt = totalNeedPayCnt;
+	public void setNeedPayCnt(BigDecimal needPayCnt) {
+		this.needPayCnt = needPayCnt;
 	}
 	/**
 	 * 完成付款总比数
 	 **/
-	public void setTotalFinishPayCnt(BigDecimal totalFinishPayCnt) {
-		this.totalFinishPayCnt = totalFinishPayCnt;
+	public void setFinishPayCnt(BigDecimal finishPayCnt) {
+		this.finishPayCnt = finishPayCnt;
 	}
 	/**
 	 * 已付款总人数
 	 **/
-	public void setTotalFinishPayUserCnt(BigDecimal totalFinishPayUserCnt) {
-		this.totalFinishPayUserCnt = totalFinishPayUserCnt;
+	public void setFinishPayUserCnt(BigDecimal finishPayUserCnt) {
+		this.finishPayUserCnt = finishPayUserCnt;
 	}
 	/**
 	 * 待付款总人数
 	 **/
-	public void setTotalNeedPayUserCnt(BigDecimal totalNeedPayUserCnt) {
-		this.totalNeedPayUserCnt = totalNeedPayUserCnt;
-	}
-	/**
-	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
-	 **/
-	public void setTotalPlanIuserWorkload(BigDecimal totalPlanIuserWorkload) {
-		this.totalPlanIuserWorkload = totalPlanIuserWorkload;
-	}
-	/**
-	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
-	 **/
-	public void setTotalPlanOuserWorkload(BigDecimal totalPlanOuserWorkload) {
-		this.totalPlanOuserWorkload = totalPlanOuserWorkload;
+	public void setNeedPayUserCnt(BigDecimal needPayUserCnt) {
+		this.needPayUserCnt = needPayUserCnt;
 	}
 	/**
 	 * 测试案例总数
@@ -525,6 +480,18 @@ public class XmProjectStateHis  implements java.io.Serializable {
 	public void setProductCnt(Integer productCnt) {
 		this.productCnt = productCnt;
 	}
+	/**
+	 * 最早开始日期
+	 **/
+	public void setMinStartTime(Date minStartTime) {
+		this.minStartTime = minStartTime;
+	}
+	/**
+	 * 最晚结束时间
+	 **/
+	public void setMaxEndTime(Date maxEndTime) {
+		this.maxEndTime = maxEndTime;
+	}
 	/**
 	 * 故事数
 	 **/
@@ -532,203 +499,215 @@ public class XmProjectStateHis  implements java.io.Serializable {
 		this.menuCnt = menuCnt;
 	}
 	/**
-	 * 完成的故事数
+	 * 已完成需求数，2状态需求
 	 **/
-	public void setFinishMenuCnt(Integer finishMenuCnt) {
-		this.finishMenuCnt = finishMenuCnt;
+	public void setMenuFinishCnt(Integer menuFinishCnt) {
+		this.menuFinishCnt = menuFinishCnt;
 	}
 	/**
-	 * 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
+	 * 执行中需求数，1状态的需求
 	 **/
-	public void setEstimateWorkload(BigDecimal estimateWorkload) {
-		this.estimateWorkload = estimateWorkload;
+	public void setMenuExecCnt(Integer menuExecCnt) {
+		this.menuExecCnt = menuExecCnt;
 	}
 	/**
-	 * 执行中任务数=任务表开始日期小于=当前日期，进度<100的任务
+	 * 未开始需求数，0状态数据
 	 **/
-	public void setExecTaskCnt(Integer execTaskCnt) {
-		this.execTaskCnt = execTaskCnt;
+	public void setMenuUnstartCnt(Integer menuUnstartCnt) {
+		this.menuUnstartCnt = menuUnstartCnt;
 	}
 	/**
-	 * 待开始的任务数=任务表中开始日期=当前日期+1的任务数
+	 * 已关闭需求数，3状态数据
 	 **/
-	public void setToStartTaskCnt(Integer toStartTaskCnt) {
-		this.toStartTaskCnt = toStartTaskCnt;
+	public void setMenuCloseCnt(Integer menuCloseCnt) {
+		this.menuCloseCnt = menuCloseCnt;
 	}
 	/**
-	 * 执行中需求=需求表中开始日期小于小于等于当前日期，进度<100的需求
+	 * 任务总数
 	 **/
-	public void setExecMenuCnt(Integer execMenuCnt) {
-		this.execMenuCnt = execMenuCnt;
+	public void setTaskCnt(Integer taskCnt) {
+		this.taskCnt = taskCnt;
 	}
 	/**
-	 * 待开始需求数=需求表中开始日期=当前日期+1的需求数
+	 * 待开始任务
 	 **/
-	public void setToStartMenuCnt(Integer toStartMenuCnt) {
-		this.toStartMenuCnt = toStartMenuCnt;
+	public void setTaskUnstartCnt(Integer taskUnstartCnt) {
+		this.taskUnstartCnt = taskUnstartCnt;
 	}
 	/**
-	 * 最早开始日期
+	 * 执行中任务
 	 **/
-	public void setMinStartTime(Date minStartTime) {
-		this.minStartTime = minStartTime;
+	public void setTaskExecCnt(Integer taskExecCnt) {
+		this.taskExecCnt = taskExecCnt;
 	}
 	/**
-	 * 最晚结束时间
+	 * 已完成任务总数-来自任务表
 	 **/
-	public void setMaxEndTime(Date maxEndTime) {
-		this.maxEndTime = maxEndTime;
+	public void setTaskFinishCnt(Integer taskFinishCnt) {
+		this.taskFinishCnt = taskFinishCnt;
 	}
-	
 	/**
-	 * 项目编号
+	 * 已结算任务
 	 **/
-	public String getProjectId() {
-		return this.projectId;
+	public void setTaskSetCnt(Integer taskSetCnt) {
+		this.taskSetCnt = taskSetCnt;
 	}
 	/**
-	 * 统计日期yyyy-mm-dd类型
+	 * 外购任务数，来自任务表
 	 **/
-	public String getBizDate() {
-		return this.bizDate;
+	public void setTaskOutCnt(BigDecimal taskOutCnt) {
+		this.taskOutCnt = taskOutCnt;
 	}
 	/**
-	 * 文件数据
+	 * 已关闭任务
 	 **/
-	public Integer getTotalFileCnt() {
-		return this.totalFileCnt;
+	public void setTaskCloseCnt(Integer taskCloseCnt) {
+		this.taskCloseCnt = taskCloseCnt;
 	}
 	/**
 	 * bug数目
 	 **/
-	public Integer getTotalBugCnt() {
-		return this.totalBugCnt;
+	public void setBugCnt(Integer bugCnt) {
+		this.bugCnt = bugCnt;
 	}
 	/**
-	 * 任务数
+	 * 已关闭bug总数
 	 **/
-	public Integer getTotalTaskCnt() {
-		return this.totalTaskCnt;
+	public void setClosedBugs(Integer closedBugs) {
+		this.closedBugs = closedBugs;
 	}
 	/**
-	 * 项目总非人力预算-来自项目表
+	 * 已解决bug总数
 	 **/
-	public BigDecimal getTotalBudgetNouserAmount() {
-		return this.totalBudgetNouserAmount;
+	public void setResolvedBugs(Integer resolvedBugs) {
+		this.resolvedBugs = resolvedBugs;
 	}
 	/**
-	 * 项目名称
+	 * 激活的bug总数
 	 **/
-	public String getProjectName() {
-		return this.projectName;
+	public void setActiveBugs(Integer activeBugs) {
+		this.activeBugs = activeBugs;
 	}
 	/**
-	 * 总参与人数
+	 * 已解决bug总数
 	 **/
-	public Integer getTotalStaffCnt() {
-		return this.totalStaffCnt;
+	public void setConfirmedBugs(Integer confirmedBugs) {
+		this.confirmedBugs = confirmedBugs;
 	}
 	/**
-	 * 统计执行日期
+	 * 工期（小时）
 	 **/
-	public Date getCalcTime() {
-		return this.calcTime;
+	public void setPlanWorkhours(BigDecimal planWorkhours) {
+		this.planWorkhours = planWorkhours;
 	}
 	/**
-	 * 0-暂时的1稳定的，暂时的可以被覆盖，稳定的不允许覆盖
+	 * 总人数
 	 **/
-	public String getCalcStatus() {
-		return this.calcStatus;
+	public void setPlanWorkerCnt(Integer planWorkerCnt) {
+		this.planWorkerCnt = planWorkerCnt;
 	}
 	/**
-	 * 项目总非人力成本
+	 * 实际投入人员数
 	 **/
-	public BigDecimal getTotalCostNouserAmount() {
-		return this.totalCostNouserAmount;
+	public void setActWorkerCnt(BigDecimal actWorkerCnt) {
+		this.actWorkerCnt = actWorkerCnt;
 	}
 	/**
-	 * 已关闭bug总数
+	 * 预算总金额
 	 **/
-	public Integer getTotalClosedBugCnt() {
-		return this.totalClosedBugCnt;
+	public void setBudgetAt(BigDecimal budgetAt) {
+		this.budgetAt = budgetAt;
 	}
 	/**
-	 * 已解决bug总数
+	 * 实际总金额
 	 **/
-	public Integer getTotalResolvedBugCnt() {
-		return this.totalResolvedBugCnt;
+	public void setActAt(BigDecimal actAt) {
+		this.actAt = actAt;
 	}
+	
 	/**
-	 * 已完成任务总数-来自任务表
+	 * 项目编号
 	 **/
-	public Integer getTotalCompleteTaskCnt() {
-		return this.totalCompleteTaskCnt;
+	public String getProjectId() {
+		return this.projectId;
 	}
 	/**
-	 * 项目阶段计划数
+	 * 统计日期yyyy-mm-dd类型
 	 **/
-	public Integer getTotalPhaseCnt() {
-		return this.totalPhaseCnt;
+	public String getBizDate() {
+		return this.bizDate;
 	}
 	/**
-	 * 项目阶段计划已完成数
+	 * 文件数据
 	 **/
-	public Integer getTotalCompletePhaseCnt() {
-		return this.totalCompletePhaseCnt;
+	public Integer getFileCnt() {
+		return this.fileCnt;
 	}
 	/**
-	 * 待付款总金额
+	 * 项目名称
+	 **/
+	public String getProjectName() {
+		return this.projectName;
+	}
+	/**
+	 * 统计执行日期
 	 **/
-	public BigDecimal getTotalNeedPayAmount() {
-		return this.totalNeedPayAmount;
+	public Date getCalcTime() {
+		return this.calcTime;
 	}
 	/**
-	 * 已付款总金额
+	 * 0-暂时的1稳定的，暂时的可以被覆盖，稳定的不允许覆盖
 	 **/
-	public BigDecimal getTotalFinishPayAmount() {
-		return this.totalFinishPayAmount;
+	public String getCalcStatus() {
+		return this.calcStatus;
 	}
 	/**
-	 * 待收款总金额
+	 * 项目阶段计划数
 	 **/
-	public BigDecimal getTotalNeedColAmount() {
-		return this.totalNeedColAmount;
+	public Integer getPhaseCnt() {
+		return this.phaseCnt;
 	}
 	/**
-	 * 已收款总金额
+	 * 项目阶段计划已完成数
 	 **/
-	public BigDecimal getTotalFinishColAmount() {
-		return this.totalFinishColAmount;
+	public Integer getPhaseFinishCnt() {
+		return this.phaseFinishCnt;
 	}
 	/**
-	 * 项目总人力成本
+	 * 待付款总金额
 	 **/
-	public BigDecimal getTotalCostUserAmount() {
-		return this.totalCostUserAmount;
+	public BigDecimal getNeedPayAt() {
+		return this.needPayAt;
 	}
 	/**
-	 * 项目总内部人力预算-来自项目表
+	 * 已付款总金额
 	 **/
-	public BigDecimal getTotalBudgetIuserAmount() {
-		return this.totalBudgetIuserAmount;
+	public BigDecimal getFinishPayAt() {
+		return this.finishPayAt;
 	}
 	/**
-	 * 项目总预算工作量-来自项目表
+	 * 待收款总金额
+	 **/
+	public BigDecimal getNeedColAt() {
+		return this.needColAt;
+	}
+	/**
+	 * 已收款总金额
 	 **/
-	public BigDecimal getTotalPlanWorkload() {
-		return this.totalPlanWorkload;
+	public BigDecimal getFinishColAt() {
+		return this.finishColAt;
 	}
 	/**
 	 * 项目风险总数
 	 **/
-	public Integer getTotalRiskCnt() {
-		return this.totalRiskCnt;
+	public Integer getRiskCnt() {
+		return this.riskCnt;
 	}
 	/**
 	 * 已完成风险总数
 	 **/
-	public Integer getTotalCompleteRiskCnt() {
-		return this.totalCompleteRiskCnt;
+	public Integer getRiskFinishCnt() {
+		return this.riskFinishCnt;
 	}
 	/**
 	 * 机构编号
@@ -743,118 +722,124 @@ public class XmProjectStateHis  implements java.io.Serializable {
 		return this.branchName;
 	}
 	/**
-	 * 项目总外购人力预算-来自项目表
+	 * 项目总非人力预算-来自任务表
 	 **/
-	public BigDecimal getTotalBudgetOuserAmount() {
-		return this.totalBudgetOuserAmount;
+	public BigDecimal getBudgetNouserAt() {
+		return this.budgetNouserAt;
 	}
 	/**
-	 * 已完成工作量-来自计划中实际完成工作量
+	 * 项目总外购人力预算-来自任务表
+	 **/
+	public BigDecimal getBudgetOuserAt() {
+		return this.budgetOuserAt;
+	}
+	/**
+	 * 项目总内部人力预算-来自任务表
 	 **/
-	public BigDecimal getTotalCompleteWorkload() {
-		return this.totalCompleteWorkload;
+	public BigDecimal getBudgetIuserAt() {
+		return this.budgetIuserAt;
+	}
+	/**
+	 * 项目总人力成本
+	 **/
+	public BigDecimal getActUserAt() {
+		return this.actUserAt;
 	}
 	/**
 	 * 项目总内部人力成本金额
 	 **/
-	public BigDecimal getTotalCostIuserAmount() {
-		return this.totalCostIuserAmount;
+	public BigDecimal getActIuserAt() {
+		return this.actIuserAt;
 	}
 	/**
 	 * 项目总外购人力成本金额
 	 **/
-	public BigDecimal getTotalCostOuserAmount() {
-		return this.totalCostOuserAmount;
+	public BigDecimal getActOuserAt() {
+		return this.actOuserAt;
+	}
+	/**
+	 * 项目总非人力成本
+	 **/
+	public BigDecimal getActNouserAt() {
+		return this.actNouserAt;
 	}
 	/**
 	 * 项目进度0~100之间，来自任务表
 	 **/
-	public BigDecimal getTotalProgress() {
-		return this.totalProgress;
+	public BigDecimal getFinishRate() {
+		return this.finishRate;
 	}
 	/**
-	 * 激活的bug总数
+	 * 项目总预算工作量-来自任务表
 	 **/
-	public Integer getTotalActiveBugCnt() {
-		return this.totalActiveBugCnt;
+	public BigDecimal getBudgetWorkload() {
+		return this.budgetWorkload;
 	}
 	/**
-	 * 已解决bug总数
+	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
 	 **/
-	public Integer getTotalConfirmedBugCnt() {
-		return this.totalConfirmedBugCnt;
+	public BigDecimal getBudgetOuserWorkload() {
+		return this.budgetOuserWorkload;
 	}
 	/**
-	 * 0|初始
+	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
 	 **/
-	public String getProjectStatus() {
-		return this.projectStatus;
+	public BigDecimal getBudgetIuserWorkload() {
+		return this.budgetIuserWorkload;
 	}
 	/**
-	 * 实际总工作量，来自任务表
+	 * 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
 	 **/
-	public BigDecimal getTotalActWorkload() {
-		return this.totalActWorkload;
+	public BigDecimal getEstimateWorkload() {
+		return this.estimateWorkload;
 	}
 	/**
-	 * 实际外购总工作量，来自任务表
+	 * 已完成工作量-来自计划中实际完成工作量
 	 **/
-	public BigDecimal getTotalActOutWorkload() {
-		return this.totalActOutWorkload;
+	public BigDecimal getActWorkload() {
+		return this.actWorkload;
 	}
 	/**
-	 * 实际内部总工作量，来自任务表
+	 * 0|初始
 	 **/
-	public BigDecimal getTotalActInnerWorkload() {
-		return this.totalActInnerWorkload;
+	public String getProjectStatus() {
+		return this.projectStatus;
 	}
 	/**
-	 * 已经分配到任务的总预算
+	 * 实际外购总工作量，来自任务表
 	 **/
-	public BigDecimal getTotalTaskBudgetCostAt() {
-		return this.totalTaskBudgetCostAt;
+	public BigDecimal getActOuserWorkload() {
+		return this.actOuserWorkload;
 	}
 	/**
-	 * 外购任务数，来自任务表
+	 * 实际内部总工作量，来自任务表
 	 **/
-	public BigDecimal getTotalTaskOutCnt() {
-		return this.totalTaskOutCnt;
+	public BigDecimal getActIuserWorkload() {
+		return this.actIuserWorkload;
 	}
 	/**
 	 * 待付款笔数
 	 **/
-	public BigDecimal getTotalNeedPayCnt() {
-		return this.totalNeedPayCnt;
+	public BigDecimal getNeedPayCnt() {
+		return this.needPayCnt;
 	}
 	/**
 	 * 完成付款总比数
 	 **/
-	public BigDecimal getTotalFinishPayCnt() {
-		return this.totalFinishPayCnt;
+	public BigDecimal getFinishPayCnt() {
+		return this.finishPayCnt;
 	}
 	/**
 	 * 已付款总人数
 	 **/
-	public BigDecimal getTotalFinishPayUserCnt() {
-		return this.totalFinishPayUserCnt;
+	public BigDecimal getFinishPayUserCnt() {
+		return this.finishPayUserCnt;
 	}
 	/**
 	 * 待付款总人数
 	 **/
-	public BigDecimal getTotalNeedPayUserCnt() {
-		return this.totalNeedPayUserCnt;
-	}
-	/**
-	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
-	 **/
-	public BigDecimal getTotalPlanIuserWorkload() {
-		return this.totalPlanIuserWorkload;
-	}
-	/**
-	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
-	 **/
-	public BigDecimal getTotalPlanOuserWorkload() {
-		return this.totalPlanOuserWorkload;
+	public BigDecimal getNeedPayUserCnt() {
+		return this.needPayUserCnt;
 	}
 	/**
 	 * 测试案例总数
@@ -892,6 +877,18 @@ public class XmProjectStateHis  implements java.io.Serializable {
 	public Integer getProductCnt() {
 		return this.productCnt;
 	}
+	/**
+	 * 最早开始日期
+	 **/
+	public Date getMinStartTime() {
+		return this.minStartTime;
+	}
+	/**
+	 * 最晚结束时间
+	 **/
+	public Date getMaxEndTime() {
+		return this.maxEndTime;
+	}
 	/**
 	 * 故事数
 	 **/
@@ -899,52 +896,130 @@ public class XmProjectStateHis  implements java.io.Serializable {
 		return this.menuCnt;
 	}
 	/**
-	 * 完成的故事数
+	 * 已完成需求数，2状态需求
 	 **/
-	public Integer getFinishMenuCnt() {
-		return this.finishMenuCnt;
+	public Integer getMenuFinishCnt() {
+		return this.menuFinishCnt;
 	}
 	/**
-	 * 预估工时=计划结束时间在计算当日前完成的任务的预算工时总和
+	 * 执行中需求数，1状态的需求
 	 **/
-	public BigDecimal getEstimateWorkload() {
-		return this.estimateWorkload;
+	public Integer getMenuExecCnt() {
+		return this.menuExecCnt;
 	}
 	/**
-	 * 执行中任务数=任务表开始日期小于=当前日期，进度<100的任务
+	 * 未开始需求数，0状态数据
 	 **/
-	public Integer getExecTaskCnt() {
-		return this.execTaskCnt;
+	public Integer getMenuUnstartCnt() {
+		return this.menuUnstartCnt;
 	}
 	/**
-	 * 待开始的任务数=任务表中开始日期=当前日期+1的任务数
+	 * 已关闭需求数，3状态数据
 	 **/
-	public Integer getToStartTaskCnt() {
-		return this.toStartTaskCnt;
+	public Integer getMenuCloseCnt() {
+		return this.menuCloseCnt;
 	}
 	/**
-	 * 执行中需求=需求表中开始日期小于小于等于当前日期，进度<100的需求
+	 * 任务总数
 	 **/
-	public Integer getExecMenuCnt() {
-		return this.execMenuCnt;
+	public Integer getTaskCnt() {
+		return this.taskCnt;
 	}
 	/**
-	 * 待开始需求数=需求表中开始日期=当前日期+1的需求数
+	 * 待开始任务
 	 **/
-	public Integer getToStartMenuCnt() {
-		return this.toStartMenuCnt;
+	public Integer getTaskUnstartCnt() {
+		return this.taskUnstartCnt;
 	}
 	/**
-	 * 最早开始日期
+	 * 执行中任务
 	 **/
-	public Date getMinStartTime() {
-		return this.minStartTime;
+	public Integer getTaskExecCnt() {
+		return this.taskExecCnt;
 	}
 	/**
-	 * 最晚结束时间
+	 * 已完成任务总数-来自任务表
 	 **/
-	public Date getMaxEndTime() {
-		return this.maxEndTime;
+	public Integer getTaskFinishCnt() {
+		return this.taskFinishCnt;
+	}
+	/**
+	 * 已结算任务
+	 **/
+	public Integer getTaskSetCnt() {
+		return this.taskSetCnt;
+	}
+	/**
+	 * 外购任务数，来自任务表
+	 **/
+	public BigDecimal getTaskOutCnt() {
+		return this.taskOutCnt;
+	}
+	/**
+	 * 已关闭任务
+	 **/
+	public Integer getTaskCloseCnt() {
+		return this.taskCloseCnt;
+	}
+	/**
+	 * bug数目
+	 **/
+	public Integer getBugCnt() {
+		return this.bugCnt;
+	}
+	/**
+	 * 已关闭bug总数
+	 **/
+	public Integer getClosedBugs() {
+		return this.closedBugs;
+	}
+	/**
+	 * 已解决bug总数
+	 **/
+	public Integer getResolvedBugs() {
+		return this.resolvedBugs;
+	}
+	/**
+	 * 激活的bug总数
+	 **/
+	public Integer getActiveBugs() {
+		return this.activeBugs;
+	}
+	/**
+	 * 已解决bug总数
+	 **/
+	public Integer getConfirmedBugs() {
+		return this.confirmedBugs;
+	}
+	/**
+	 * 工期（小时）
+	 **/
+	public BigDecimal getPlanWorkhours() {
+		return this.planWorkhours;
+	}
+	/**
+	 * 总人数
+	 **/
+	public Integer getPlanWorkerCnt() {
+		return this.planWorkerCnt;
+	}
+	/**
+	 * 实际投入人员数
+	 **/
+	public BigDecimal getActWorkerCnt() {
+		return this.actWorkerCnt;
+	}
+	/**
+	 * 预算总金额
+	 **/
+	public BigDecimal getBudgetAt() {
+		return this.budgetAt;
+	}
+	/**
+	 * 实际总金额
+	 **/
+	public BigDecimal getActAt() {
+		return this.actAt;
 	}
 
 }
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml
index 75e44341..16f30b6a 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml
@@ -126,7 +126,7 @@
 		insert into xm_branch_state(
 			<include refid="columns"/>
 		) 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},#{minStartTime},#{maxEndTime}
+		#{projectCnt},#{bizDate},#{fileCnt},#{calcTime},#{calcStatus},#{phaseCnt},#{phaseFinishCnt},#{needPayAt},#{finishPayAt},#{needColAt},#{finishColAt},#{riskCnt},#{riskFinishCnt},#{branchId},#{branchName},#{budgetNouserAt},#{budgetOuserAt},#{budgetIuserAt},#{actUserAt},#{actIuserAt},#{actOuserAt},#{actNouserAt},#{finishRate},#{budgetWorkload},#{budgetOuserWorkload},#{budgetIuserWorkload},#{estimateWorkload},#{actWorkload},#{actOuserWorkload},#{actIuserWorkload},#{needPayCnt},#{finishPayCnt},#{finishPayUserCnt},#{needPayUserCnt},#{testCases},#{execCases},#{designCases},#{finishCases},#{iterationCnt},#{productCnt},#{minStartTime},#{maxEndTime},#{menuCnt},#{menuFinishCnt},#{menuExecCnt},#{menuUnstartCnt},#{menuCloseCnt},#{taskCnt},#{taskUnstartCnt},#{taskExecCnt},#{taskFinishCnt},#{taskSetCnt},#{taskOutCnt},#{taskCloseCnt},#{bugCnt},#{closedBugs},#{resolvedBugs},#{activeBugs},#{confirmedBugs},#{planWorkhours},#{planWorkerCnt},#{actWorkerCnt},#{budgetAt},#{actAt}
 		)
 	</insert>
 	
@@ -189,259 +189,271 @@
 	
 	<!--sql片段 列-->
 	<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,min_start_time,max_end_time
+		project_cnt,biz_date,file_cnt,calc_time,calc_status,phase_cnt,phase_finish_cnt,need_pay_at,finish_pay_at,need_col_at,finish_col_at,risk_cnt,risk_finish_cnt,branch_id,branch_name,budget_nouser_at,budget_ouser_at,budget_iuser_at,act_user_at,act_iuser_at,act_ouser_at,act_nouser_at,finish_rate,budget_workload,budget_ouser_workload,budget_iuser_workload,estimate_workload,act_workload,act_ouser_workload,act_iuser_workload,need_pay_cnt,finish_pay_cnt,finish_pay_user_cnt,need_pay_user_cnt,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,min_start_time,max_end_time,menu_cnt,menu_finish_cnt,menu_exec_cnt,menu_unstart_cnt,menu_close_cnt,task_cnt,task_unstart_cnt,task_exec_cnt,task_finish_cnt,task_set_cnt,task_out_cnt,task_close_cnt,bug_cnt,closed_bugs,resolved_bugs,active_bugs,confirmed_bugs,plan_workhours,plan_worker_cnt,act_worker_cnt,budget_at,act_at
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
 	<sql id="where">
+		<if test="projectCnt != null and projectCnt != ''">      and res.project_cnt = #{projectCnt}     </if>
 		<if test="bizDate != null and bizDate != ''">      and res.biz_date = #{bizDate}     </if>
-		<if test="totalFileCnt != null and totalFileCnt != ''">      and res.total_file_cnt = #{totalFileCnt}     </if>
-		<if test="totalBugCnt != null and totalBugCnt != ''">      and res.total_bug_cnt = #{totalBugCnt}     </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="totalStaffCnt != null and totalStaffCnt != ''">      and res.total_staff_cnt = #{totalStaffCnt}     </if>
+		<if test="fileCnt != null and fileCnt != ''">      and res.file_cnt = #{fileCnt}     </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="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="totalResolvedBugCnt != null and totalResolvedBugCnt != ''">      and res.total_resolved_bug_cnt = #{totalResolvedBugCnt}     </if>
-		<if test="totalCompleteTaskCnt != null and totalCompleteTaskCnt != ''">      and res.total_complete_task_cnt = #{totalCompleteTaskCnt}     </if>
-		<if test="totalPhaseCnt != null and totalPhaseCnt != ''">      and res.total_phase_cnt = #{totalPhaseCnt}     </if>
-		<if test="totalCompletePhaseCnt != null and totalCompletePhaseCnt != ''">      and res.total_complete_phase_cnt = #{totalCompletePhaseCnt}     </if>
-		<if test="totalNeedPayAmount != null and totalNeedPayAmount != ''">      and res.total_need_pay_amount = #{totalNeedPayAmount}     </if>
-		<if test="totalFinishPayAmount != null and totalFinishPayAmount != ''">      and res.total_finish_pay_amount = #{totalFinishPayAmount}     </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="totalCostUserAmount != null and totalCostUserAmount != ''">      and res.total_cost_user_amount = #{totalCostUserAmount}     </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="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="phaseCnt != null and phaseCnt != ''">      and res.phase_cnt = #{phaseCnt}     </if>
+		<if test="phaseFinishCnt != null and phaseFinishCnt != ''">      and res.phase_finish_cnt = #{phaseFinishCnt}     </if>
+		<if test="needPayAt != null and needPayAt != ''">      and res.need_pay_at = #{needPayAt}     </if>
+		<if test="finishPayAt != null and finishPayAt != ''">      and res.finish_pay_at = #{finishPayAt}     </if>
+		<if test="needColAt != null and needColAt != ''">      and res.need_col_at = #{needColAt}     </if>
+		<if test="finishColAt != null and finishColAt != ''">      and res.finish_col_at = #{finishColAt}     </if>
+		<if test="riskCnt != null and riskCnt != ''">      and res.risk_cnt = #{riskCnt}     </if>
+		<if test="riskFinishCnt != null and riskFinishCnt != ''">      and res.risk_finish_cnt = #{riskFinishCnt}     </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="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="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="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="projectStatus != null and projectStatus != ''">      and res.project_status = #{projectStatus}     </if>
-		<if test="totalActWorkload != null and totalActWorkload != ''">      and res.total_act_workload = #{totalActWorkload}     </if>
-		<if test="totalActOutWorkload != null and totalActOutWorkload != ''">      and res.total_act_out_workload = #{totalActOutWorkload}     </if>
-		<if test="totalActInnerWorkload != null and totalActInnerWorkload != ''">      and res.total_act_inner_workload = #{totalActInnerWorkload}     </if>
-		<if test="totalTaskBudgetCostAt != null and totalTaskBudgetCostAt != ''">      and res.total_task_budget_cost_at = #{totalTaskBudgetCostAt}     </if>
-		<if test="totalTaskOutCnt != null and totalTaskOutCnt != ''">      and res.total_task_out_cnt = #{totalTaskOutCnt}     </if>
-		<if test="totalNeedPayCnt != null and totalNeedPayCnt != ''">      and res.total_need_pay_cnt = #{totalNeedPayCnt}     </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="totalNeedPayUserCnt != null and totalNeedPayUserCnt != ''">      and res.total_need_pay_user_cnt = #{totalNeedPayUserCnt}     </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="budgetNouserAt != null and budgetNouserAt != ''">      and res.budget_nouser_at = #{budgetNouserAt}     </if>
+		<if test="budgetOuserAt != null and budgetOuserAt != ''">      and res.budget_ouser_at = #{budgetOuserAt}     </if>
+		<if test="budgetIuserAt != null and budgetIuserAt != ''">      and res.budget_iuser_at = #{budgetIuserAt}     </if>
+		<if test="actUserAt != null and actUserAt != ''">      and res.act_user_at = #{actUserAt}     </if>
+		<if test="actIuserAt != null and actIuserAt != ''">      and res.act_iuser_at = #{actIuserAt}     </if>
+		<if test="actOuserAt != null and actOuserAt != ''">      and res.act_ouser_at = #{actOuserAt}     </if>
+		<if test="actNouserAt != null and actNouserAt != ''">      and res.act_nouser_at = #{actNouserAt}     </if>
+		<if test="finishRate != null and finishRate != ''">      and res.finish_rate = #{finishRate}     </if>
+		<if test="budgetWorkload != null and budgetWorkload != ''">      and res.budget_workload = #{budgetWorkload}     </if>
+		<if test="budgetOuserWorkload != null and budgetOuserWorkload != ''">      and res.budget_ouser_workload = #{budgetOuserWorkload}     </if>
+		<if test="budgetIuserWorkload != null and budgetIuserWorkload != ''">      and res.budget_iuser_workload = #{budgetIuserWorkload}     </if>
+		<if test="estimateWorkload != null and estimateWorkload != ''">      and res.estimate_workload = #{estimateWorkload}     </if>
+		<if test="actWorkload != null and actWorkload != ''">      and res.act_workload = #{actWorkload}     </if>
+		<if test="actOuserWorkload != null and actOuserWorkload != ''">      and res.act_ouser_workload = #{actOuserWorkload}     </if>
+		<if test="actIuserWorkload != null and actIuserWorkload != ''">      and res.act_iuser_workload = #{actIuserWorkload}     </if>
+		<if test="needPayCnt != null and needPayCnt != ''">      and res.need_pay_cnt = #{needPayCnt}     </if>
+		<if test="finishPayCnt != null and finishPayCnt != ''">      and res.finish_pay_cnt = #{finishPayCnt}     </if>
+		<if test="finishPayUserCnt != null and finishPayUserCnt != ''">      and res.finish_pay_user_cnt = #{finishPayUserCnt}     </if>
+		<if test="needPayUserCnt != null and needPayUserCnt != ''">      and res.need_pay_user_cnt = #{needPayUserCnt}     </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="designCases != null and designCases != ''">      and res.design_cases = #{designCases}     </if>
 		<if test="finishCases != null and finishCases != ''">      and res.finish_cases = #{finishCases}     </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="menuCnt != null and menuCnt != ''">      and res.menu_cnt = #{menuCnt}     </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>
 		<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>
+		<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="menuExecCnt != null and menuExecCnt != ''">      and res.menu_exec_cnt = #{menuExecCnt}     </if>
+		<if test="menuUnstartCnt != null and menuUnstartCnt != ''">      and res.menu_unstart_cnt = #{menuUnstartCnt}     </if>
+		<if test="menuCloseCnt != null and menuCloseCnt != ''">      and res.menu_close_cnt = #{menuCloseCnt}     </if>
+		<if test="taskCnt != null and taskCnt != ''">      and res.task_cnt = #{taskCnt}     </if>
+		<if test="taskUnstartCnt != null and taskUnstartCnt != ''">      and res.task_unstart_cnt = #{taskUnstartCnt}     </if>
+		<if test="taskExecCnt != null and taskExecCnt != ''">      and res.task_exec_cnt = #{taskExecCnt}     </if>
+		<if test="taskFinishCnt != null and taskFinishCnt != ''">      and res.task_finish_cnt = #{taskFinishCnt}     </if>
+		<if test="taskSetCnt != null and taskSetCnt != ''">      and res.task_set_cnt = #{taskSetCnt}     </if>
+		<if test="taskOutCnt != null and taskOutCnt != ''">      and res.task_out_cnt = #{taskOutCnt}     </if>
+		<if test="taskCloseCnt != null and taskCloseCnt != ''">      and res.task_close_cnt = #{taskCloseCnt}     </if>
+		<if test="bugCnt != null and bugCnt != ''">      and res.bug_cnt = #{bugCnt}     </if>
+		<if test="closedBugs != null and closedBugs != ''">      and res.closed_bugs = #{closedBugs}     </if>
+		<if test="resolvedBugs != null and resolvedBugs != ''">      and res.resolved_bugs = #{resolvedBugs}     </if>
+		<if test="activeBugs != null and activeBugs != ''">      and res.active_bugs = #{activeBugs}     </if>
+		<if test="confirmedBugs != null and confirmedBugs != ''">      and res.confirmed_bugs = #{confirmedBugs}     </if>
+		<if test="planWorkhours != null and planWorkhours != ''">      and res.plan_workhours = #{planWorkhours}     </if>
+		<if test="planWorkerCnt != null and planWorkerCnt != ''">      and res.plan_worker_cnt = #{planWorkerCnt}     </if>
+		<if test="actWorkerCnt != null and actWorkerCnt != ''">      and res.act_worker_cnt = #{actWorkerCnt}     </if>
+		<if test="budgetAt != null and budgetAt != ''">      and res.budget_at = #{budgetAt}     </if>
+		<if test="actAt != null and actAt != ''">      and res.act_at = #{actAt}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
+		project_cnt = #{projectCnt},
 		biz_date = #{bizDate},
-		total_file_cnt = #{totalFileCnt},
-		total_bug_cnt = #{totalBugCnt},
-		total_task_cnt = #{totalTaskCnt},
-		total_budget_nouser_amount = #{totalBudgetNouserAmount},
-		total_staff_cnt = #{totalStaffCnt},
+		file_cnt = #{fileCnt},
 		calc_time = #{calcTime},
 		calc_status = #{calcStatus},
-		total_cost_nouser_amount = #{totalCostNouserAmount},
-		total_closed_bug_cnt = #{totalClosedBugCnt},
-		total_resolved_bug_cnt = #{totalResolvedBugCnt},
-		total_complete_task_cnt = #{totalCompleteTaskCnt},
-		total_phase_cnt = #{totalPhaseCnt},
-		total_complete_phase_cnt = #{totalCompletePhaseCnt},
-		total_need_pay_amount = #{totalNeedPayAmount},
-		total_finish_pay_amount = #{totalFinishPayAmount},
-		total_need_col_amount = #{totalNeedColAmount},
-		total_finish_col_amount = #{totalFinishColAmount},
-		total_cost_user_amount = #{totalCostUserAmount},
-		total_budget_iuser_amount = #{totalBudgetIuserAmount},
-		total_plan_workload = #{totalPlanWorkload},
-		total_risk_cnt = #{totalRiskCnt},
-		total_complete_risk_cnt = #{totalCompleteRiskCnt},
+		phase_cnt = #{phaseCnt},
+		phase_finish_cnt = #{phaseFinishCnt},
+		need_pay_at = #{needPayAt},
+		finish_pay_at = #{finishPayAt},
+		need_col_at = #{needColAt},
+		finish_col_at = #{finishColAt},
+		risk_cnt = #{riskCnt},
+		risk_finish_cnt = #{riskFinishCnt},
 		branch_name = #{branchName},
-		total_budget_ouser_amount = #{totalBudgetOuserAmount},
-		total_complete_workload = #{totalCompleteWorkload},
-		total_cost_iuser_amount = #{totalCostIuserAmount},
-		total_cost_ouser_amount = #{totalCostOuserAmount},
-		total_progress = #{totalProgress},
-		total_active_bug_cnt = #{totalActiveBugCnt},
-		total_confirmed_bug_cnt = #{totalConfirmedBugCnt},
-		project_status = #{projectStatus},
-		total_act_workload = #{totalActWorkload},
-		total_act_out_workload = #{totalActOutWorkload},
-		total_act_inner_workload = #{totalActInnerWorkload},
-		total_task_budget_cost_at = #{totalTaskBudgetCostAt},
-		total_task_out_cnt = #{totalTaskOutCnt},
-		total_need_pay_cnt = #{totalNeedPayCnt},
-		total_finish_pay_cnt = #{totalFinishPayCnt},
-		total_finish_pay_user_cnt = #{totalFinishPayUserCnt},
-		total_need_pay_user_cnt = #{totalNeedPayUserCnt},
-		total_plan_iuser_workload = #{totalPlanIuserWorkload},
-		total_plan_ouser_workload = #{totalPlanOuserWorkload},
+		budget_nouser_at = #{budgetNouserAt},
+		budget_ouser_at = #{budgetOuserAt},
+		budget_iuser_at = #{budgetIuserAt},
+		act_user_at = #{actUserAt},
+		act_iuser_at = #{actIuserAt},
+		act_ouser_at = #{actOuserAt},
+		act_nouser_at = #{actNouserAt},
+		finish_rate = #{finishRate},
+		budget_workload = #{budgetWorkload},
+		budget_ouser_workload = #{budgetOuserWorkload},
+		budget_iuser_workload = #{budgetIuserWorkload},
+		estimate_workload = #{estimateWorkload},
+		act_workload = #{actWorkload},
+		act_ouser_workload = #{actOuserWorkload},
+		act_iuser_workload = #{actIuserWorkload},
+		need_pay_cnt = #{needPayCnt},
+		finish_pay_cnt = #{finishPayCnt},
+		finish_pay_user_cnt = #{finishPayUserCnt},
+		need_pay_user_cnt = #{needPayUserCnt},
 		test_cases = #{testCases},
 		exec_cases = #{execCases},
 		design_cases = #{designCases},
 		finish_cases = #{finishCases},
 		iteration_cnt = #{iterationCnt},
 		product_cnt = #{productCnt},
-		menu_cnt = #{menuCnt},
-		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},
 		min_start_time = #{minStartTime},
-		max_end_time = #{maxEndTime}
+		max_end_time = #{maxEndTime},
+		menu_cnt = #{menuCnt},
+		menu_finish_cnt = #{menuFinishCnt},
+		menu_exec_cnt = #{menuExecCnt},
+		menu_unstart_cnt = #{menuUnstartCnt},
+		menu_close_cnt = #{menuCloseCnt},
+		task_cnt = #{taskCnt},
+		task_unstart_cnt = #{taskUnstartCnt},
+		task_exec_cnt = #{taskExecCnt},
+		task_finish_cnt = #{taskFinishCnt},
+		task_set_cnt = #{taskSetCnt},
+		task_out_cnt = #{taskOutCnt},
+		task_close_cnt = #{taskCloseCnt},
+		bug_cnt = #{bugCnt},
+		closed_bugs = #{closedBugs},
+		resolved_bugs = #{resolvedBugs},
+		active_bugs = #{activeBugs},
+		confirmed_bugs = #{confirmedBugs},
+		plan_workhours = #{planWorkhours},
+		plan_worker_cnt = #{planWorkerCnt},
+		act_worker_cnt = #{actWorkerCnt},
+		budget_at = #{budgetAt},
+		act_at = #{actAt}
 	</sql>
 	<sql id="someFieldSet">
+		<if test="projectCnt != null and projectCnt != ''"> project_cnt = #{projectCnt},     </if>
 		<if test="bizDate != null and bizDate != ''"> biz_date = #{bizDate},     </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="totalTaskCnt != null and totalTaskCnt != ''"> total_task_cnt = #{totalTaskCnt},     </if>
-		<if test="totalBudgetNouserAmount != null and totalBudgetNouserAmount != ''"> total_budget_nouser_amount = #{totalBudgetNouserAmount},     </if>
-		<if test="totalStaffCnt != null and totalStaffCnt != ''"> total_staff_cnt = #{totalStaffCnt},     </if>
+		<if test="fileCnt != null and fileCnt != ''"> file_cnt = #{fileCnt},     </if>
 		<if test="calcTime != null"> calc_time = #{calcTime},     </if>
 		<if test="calcStatus != null and calcStatus != ''"> calc_status = #{calcStatus},     </if>
-		<if test="totalCostNouserAmount != null and totalCostNouserAmount != ''"> total_cost_nouser_amount = #{totalCostNouserAmount},     </if>
-		<if test="totalClosedBugCnt != null and totalClosedBugCnt != ''"> total_closed_bug_cnt = #{totalClosedBugCnt},     </if>
-		<if test="totalResolvedBugCnt != null and totalResolvedBugCnt != ''"> total_resolved_bug_cnt = #{totalResolvedBugCnt},     </if>
-		<if test="totalCompleteTaskCnt != null and totalCompleteTaskCnt != ''"> total_complete_task_cnt = #{totalCompleteTaskCnt},     </if>
-		<if test="totalPhaseCnt != null and totalPhaseCnt != ''"> total_phase_cnt = #{totalPhaseCnt},     </if>
-		<if test="totalCompletePhaseCnt != null and totalCompletePhaseCnt != ''"> total_complete_phase_cnt = #{totalCompletePhaseCnt},     </if>
-		<if test="totalNeedPayAmount != null and totalNeedPayAmount != ''"> total_need_pay_amount = #{totalNeedPayAmount},     </if>
-		<if test="totalFinishPayAmount != null and totalFinishPayAmount != ''"> total_finish_pay_amount = #{totalFinishPayAmount},     </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="totalCostUserAmount != null and totalCostUserAmount != ''"> total_cost_user_amount = #{totalCostUserAmount},     </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="totalRiskCnt != null and totalRiskCnt != ''"> total_risk_cnt = #{totalRiskCnt},     </if>
-		<if test="totalCompleteRiskCnt != null and totalCompleteRiskCnt != ''"> total_complete_risk_cnt = #{totalCompleteRiskCnt},     </if>
+		<if test="phaseCnt != null and phaseCnt != ''"> phase_cnt = #{phaseCnt},     </if>
+		<if test="phaseFinishCnt != null and phaseFinishCnt != ''"> phase_finish_cnt = #{phaseFinishCnt},     </if>
+		<if test="needPayAt != null and needPayAt != ''"> need_pay_at = #{needPayAt},     </if>
+		<if test="finishPayAt != null and finishPayAt != ''"> finish_pay_at = #{finishPayAt},     </if>
+		<if test="needColAt != null and needColAt != ''"> need_col_at = #{needColAt},     </if>
+		<if test="finishColAt != null and finishColAt != ''"> finish_col_at = #{finishColAt},     </if>
+		<if test="riskCnt != null and riskCnt != ''"> risk_cnt = #{riskCnt},     </if>
+		<if test="riskFinishCnt != null and riskFinishCnt != ''"> risk_finish_cnt = #{riskFinishCnt},     </if>
 		<if test="branchName != null and branchName != ''"> branch_name = #{branchName},     </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="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="totalActiveBugCnt != null and totalActiveBugCnt != ''"> total_active_bug_cnt = #{totalActiveBugCnt},     </if>
-		<if test="totalConfirmedBugCnt != null and totalConfirmedBugCnt != ''"> total_confirmed_bug_cnt = #{totalConfirmedBugCnt},     </if>
-		<if test="projectStatus != null and projectStatus != ''"> project_status = #{projectStatus},     </if>
-		<if test="totalActWorkload != null and totalActWorkload != ''"> total_act_workload = #{totalActWorkload},     </if>
-		<if test="totalActOutWorkload != null and totalActOutWorkload != ''"> total_act_out_workload = #{totalActOutWorkload},     </if>
-		<if test="totalActInnerWorkload != null and totalActInnerWorkload != ''"> total_act_inner_workload = #{totalActInnerWorkload},     </if>
-		<if test="totalTaskBudgetCostAt != null and totalTaskBudgetCostAt != ''"> total_task_budget_cost_at = #{totalTaskBudgetCostAt},     </if>
-		<if test="totalTaskOutCnt != null and totalTaskOutCnt != ''"> total_task_out_cnt = #{totalTaskOutCnt},     </if>
-		<if test="totalNeedPayCnt != null and totalNeedPayCnt != ''"> total_need_pay_cnt = #{totalNeedPayCnt},     </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="totalNeedPayUserCnt != null and totalNeedPayUserCnt != ''"> total_need_pay_user_cnt = #{totalNeedPayUserCnt},     </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="budgetNouserAt != null and budgetNouserAt != ''"> budget_nouser_at = #{budgetNouserAt},     </if>
+		<if test="budgetOuserAt != null and budgetOuserAt != ''"> budget_ouser_at = #{budgetOuserAt},     </if>
+		<if test="budgetIuserAt != null and budgetIuserAt != ''"> budget_iuser_at = #{budgetIuserAt},     </if>
+		<if test="actUserAt != null and actUserAt != ''"> act_user_at = #{actUserAt},     </if>
+		<if test="actIuserAt != null and actIuserAt != ''"> act_iuser_at = #{actIuserAt},     </if>
+		<if test="actOuserAt != null and actOuserAt != ''"> act_ouser_at = #{actOuserAt},     </if>
+		<if test="actNouserAt != null and actNouserAt != ''"> act_nouser_at = #{actNouserAt},     </if>
+		<if test="finishRate != null and finishRate != ''"> finish_rate = #{finishRate},     </if>
+		<if test="budgetWorkload != null and budgetWorkload != ''"> budget_workload = #{budgetWorkload},     </if>
+		<if test="budgetOuserWorkload != null and budgetOuserWorkload != ''"> budget_ouser_workload = #{budgetOuserWorkload},     </if>
+		<if test="budgetIuserWorkload != null and budgetIuserWorkload != ''"> budget_iuser_workload = #{budgetIuserWorkload},     </if>
+		<if test="estimateWorkload != null and estimateWorkload != ''"> estimate_workload = #{estimateWorkload},     </if>
+		<if test="actWorkload != null and actWorkload != ''"> act_workload = #{actWorkload},     </if>
+		<if test="actOuserWorkload != null and actOuserWorkload != ''"> act_ouser_workload = #{actOuserWorkload},     </if>
+		<if test="actIuserWorkload != null and actIuserWorkload != ''"> act_iuser_workload = #{actIuserWorkload},     </if>
+		<if test="needPayCnt != null and needPayCnt != ''"> need_pay_cnt = #{needPayCnt},     </if>
+		<if test="finishPayCnt != null and finishPayCnt != ''"> finish_pay_cnt = #{finishPayCnt},     </if>
+		<if test="finishPayUserCnt != null and finishPayUserCnt != ''"> finish_pay_user_cnt = #{finishPayUserCnt},     </if>
+		<if test="needPayUserCnt != null and needPayUserCnt != ''"> need_pay_user_cnt = #{needPayUserCnt},     </if>
 		<if test="testCases != null and testCases != ''"> test_cases = #{testCases},     </if>
 		<if test="execCases != null and execCases != ''"> exec_cases = #{execCases},     </if>
 		<if test="designCases != null and designCases != ''"> design_cases = #{designCases},     </if>
 		<if test="finishCases != null and finishCases != ''"> finish_cases = #{finishCases},     </if>
 		<if test="iterationCnt != null and iterationCnt != ''"> iteration_cnt = #{iterationCnt},     </if>
 		<if test="productCnt != null and productCnt != ''"> product_cnt = #{productCnt},     </if>
-		<if test="menuCnt != null and menuCnt != ''"> menu_cnt = #{menuCnt},     </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>
 		<if test="minStartTime != null"> min_start_time = #{minStartTime},     </if>
 		<if test="maxEndTime != null"> max_end_time = #{maxEndTime},     </if>
+		<if test="menuCnt != null and menuCnt != ''"> menu_cnt = #{menuCnt},     </if>
+		<if test="menuFinishCnt != null and menuFinishCnt != ''"> menu_finish_cnt = #{menuFinishCnt},     </if>
+		<if test="menuExecCnt != null and menuExecCnt != ''"> menu_exec_cnt = #{menuExecCnt},     </if>
+		<if test="menuUnstartCnt != null and menuUnstartCnt != ''"> menu_unstart_cnt = #{menuUnstartCnt},     </if>
+		<if test="menuCloseCnt != null and menuCloseCnt != ''"> menu_close_cnt = #{menuCloseCnt},     </if>
+		<if test="taskCnt != null and taskCnt != ''"> task_cnt = #{taskCnt},     </if>
+		<if test="taskUnstartCnt != null and taskUnstartCnt != ''"> task_unstart_cnt = #{taskUnstartCnt},     </if>
+		<if test="taskExecCnt != null and taskExecCnt != ''"> task_exec_cnt = #{taskExecCnt},     </if>
+		<if test="taskFinishCnt != null and taskFinishCnt != ''"> task_finish_cnt = #{taskFinishCnt},     </if>
+		<if test="taskSetCnt != null and taskSetCnt != ''"> task_set_cnt = #{taskSetCnt},     </if>
+		<if test="taskOutCnt != null and taskOutCnt != ''"> task_out_cnt = #{taskOutCnt},     </if>
+		<if test="taskCloseCnt != null and taskCloseCnt != ''"> task_close_cnt = #{taskCloseCnt},     </if>
+		<if test="bugCnt != null and bugCnt != ''"> bug_cnt = #{bugCnt},     </if>
+		<if test="closedBugs != null and closedBugs != ''"> closed_bugs = #{closedBugs},     </if>
+		<if test="resolvedBugs != null and resolvedBugs != ''"> resolved_bugs = #{resolvedBugs},     </if>
+		<if test="activeBugs != null and activeBugs != ''"> active_bugs = #{activeBugs},     </if>
+		<if test="confirmedBugs != null and confirmedBugs != ''"> confirmed_bugs = #{confirmedBugs},     </if>
+		<if test="planWorkhours != null and planWorkhours != ''"> plan_workhours = #{planWorkhours},     </if>
+		<if test="planWorkerCnt != null and planWorkerCnt != ''"> plan_worker_cnt = #{planWorkerCnt},     </if>
+		<if test="actWorkerCnt != null and actWorkerCnt != ''"> act_worker_cnt = #{actWorkerCnt},     </if>
+		<if test="budgetAt != null and budgetAt != ''"> budget_at = #{budgetAt},     </if>
+		<if test="actAt != null and actAt != ''"> act_at = #{actAt},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
+			project_cnt = #{item.projectCnt},
 			biz_date = #{item.bizDate},
-			total_file_cnt = #{item.totalFileCnt},
-			total_bug_cnt = #{item.totalBugCnt},
-			total_task_cnt = #{item.totalTaskCnt},
-			total_budget_nouser_amount = #{item.totalBudgetNouserAmount},
-			total_staff_cnt = #{item.totalStaffCnt},
+			file_cnt = #{item.fileCnt},
 			calc_time = #{item.calcTime},
 			calc_status = #{item.calcStatus},
-			total_cost_nouser_amount = #{item.totalCostNouserAmount},
-			total_closed_bug_cnt = #{item.totalClosedBugCnt},
-			total_resolved_bug_cnt = #{item.totalResolvedBugCnt},
-			total_complete_task_cnt = #{item.totalCompleteTaskCnt},
-			total_phase_cnt = #{item.totalPhaseCnt},
-			total_complete_phase_cnt = #{item.totalCompletePhaseCnt},
-			total_need_pay_amount = #{item.totalNeedPayAmount},
-			total_finish_pay_amount = #{item.totalFinishPayAmount},
-			total_need_col_amount = #{item.totalNeedColAmount},
-			total_finish_col_amount = #{item.totalFinishColAmount},
-			total_cost_user_amount = #{item.totalCostUserAmount},
-			total_budget_iuser_amount = #{item.totalBudgetIuserAmount},
-			total_plan_workload = #{item.totalPlanWorkload},
-			total_risk_cnt = #{item.totalRiskCnt},
-			total_complete_risk_cnt = #{item.totalCompleteRiskCnt},
+			phase_cnt = #{item.phaseCnt},
+			phase_finish_cnt = #{item.phaseFinishCnt},
+			need_pay_at = #{item.needPayAt},
+			finish_pay_at = #{item.finishPayAt},
+			need_col_at = #{item.needColAt},
+			finish_col_at = #{item.finishColAt},
+			risk_cnt = #{item.riskCnt},
+			risk_finish_cnt = #{item.riskFinishCnt},
 			branch_name = #{item.branchName},
-			total_budget_ouser_amount = #{item.totalBudgetOuserAmount},
-			total_complete_workload = #{item.totalCompleteWorkload},
-			total_cost_iuser_amount = #{item.totalCostIuserAmount},
-			total_cost_ouser_amount = #{item.totalCostOuserAmount},
-			total_progress = #{item.totalProgress},
-			total_active_bug_cnt = #{item.totalActiveBugCnt},
-			total_confirmed_bug_cnt = #{item.totalConfirmedBugCnt},
-			project_status = #{item.projectStatus},
-			total_act_workload = #{item.totalActWorkload},
-			total_act_out_workload = #{item.totalActOutWorkload},
-			total_act_inner_workload = #{item.totalActInnerWorkload},
-			total_task_budget_cost_at = #{item.totalTaskBudgetCostAt},
-			total_task_out_cnt = #{item.totalTaskOutCnt},
-			total_need_pay_cnt = #{item.totalNeedPayCnt},
-			total_finish_pay_cnt = #{item.totalFinishPayCnt},
-			total_finish_pay_user_cnt = #{item.totalFinishPayUserCnt},
-			total_need_pay_user_cnt = #{item.totalNeedPayUserCnt},
-			total_plan_iuser_workload = #{item.totalPlanIuserWorkload},
-			total_plan_ouser_workload = #{item.totalPlanOuserWorkload},
+			budget_nouser_at = #{item.budgetNouserAt},
+			budget_ouser_at = #{item.budgetOuserAt},
+			budget_iuser_at = #{item.budgetIuserAt},
+			act_user_at = #{item.actUserAt},
+			act_iuser_at = #{item.actIuserAt},
+			act_ouser_at = #{item.actOuserAt},
+			act_nouser_at = #{item.actNouserAt},
+			finish_rate = #{item.finishRate},
+			budget_workload = #{item.budgetWorkload},
+			budget_ouser_workload = #{item.budgetOuserWorkload},
+			budget_iuser_workload = #{item.budgetIuserWorkload},
+			estimate_workload = #{item.estimateWorkload},
+			act_workload = #{item.actWorkload},
+			act_ouser_workload = #{item.actOuserWorkload},
+			act_iuser_workload = #{item.actIuserWorkload},
+			need_pay_cnt = #{item.needPayCnt},
+			finish_pay_cnt = #{item.finishPayCnt},
+			finish_pay_user_cnt = #{item.finishPayUserCnt},
+			need_pay_user_cnt = #{item.needPayUserCnt},
 			test_cases = #{item.testCases},
 			exec_cases = #{item.execCases},
 			design_cases = #{item.designCases},
 			finish_cases = #{item.finishCases},
 			iteration_cnt = #{item.iterationCnt},
 			product_cnt = #{item.productCnt},
-			menu_cnt = #{item.menuCnt},
-			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},
 			min_start_time = #{item.minStartTime},
-			max_end_time = #{item.maxEndTime}
+			max_end_time = #{item.maxEndTime},
+			menu_cnt = #{item.menuCnt},
+			menu_finish_cnt = #{item.menuFinishCnt},
+			menu_exec_cnt = #{item.menuExecCnt},
+			menu_unstart_cnt = #{item.menuUnstartCnt},
+			menu_close_cnt = #{item.menuCloseCnt},
+			task_cnt = #{item.taskCnt},
+			task_unstart_cnt = #{item.taskUnstartCnt},
+			task_exec_cnt = #{item.taskExecCnt},
+			task_finish_cnt = #{item.taskFinishCnt},
+			task_set_cnt = #{item.taskSetCnt},
+			task_out_cnt = #{item.taskOutCnt},
+			task_close_cnt = #{item.taskCloseCnt},
+			bug_cnt = #{item.bugCnt},
+			closed_bugs = #{item.closedBugs},
+			resolved_bugs = #{item.resolvedBugs},
+			active_bugs = #{item.activeBugs},
+			confirmed_bugs = #{item.confirmedBugs},
+			plan_workhours = #{item.planWorkhours},
+			plan_worker_cnt = #{item.planWorkerCnt},
+			act_worker_cnt = #{item.actWorkerCnt},
+			budget_at = #{item.budgetAt},
+			act_at = #{item.actAt}
 	</sql>
 </mapper>
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationStateMapper.xml
index 36f18c44..98b82916 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationStateMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationStateMapper.xml
@@ -70,7 +70,7 @@
 		insert into xm_iteration_state(
 			<include refid="columns"/>
 		) 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},#{estimateWorkload},#{minStartTime},#{maxEndTime}
+		#{iterationId},#{bizDate},#{fileCnt},#{iterationName},#{calcTime},#{calcStatus},#{phaseCnt},#{phaseFinishCnt},#{needPayAt},#{finishPayAt},#{needColAt},#{finishColAt},#{riskCnt},#{riskFinishCnt},#{branchId},#{branchName},#{budgetNouserAt},#{budgetOuserAt},#{budgetIuserAt},#{actUserAt},#{actIuserAt},#{actOuserAt},#{actNouserAt},#{finishRate},#{budgetWorkload},#{budgetOuserWorkload},#{budgetIuserWorkload},#{estimateWorkload},#{actWorkload},#{projectStatus},#{actOuserWorkload},#{actIuserWorkload},#{needPayCnt},#{finishPayCnt},#{finishPayUserCnt},#{needPayUserCnt},#{testCases},#{execCases},#{designCases},#{finishCases},#{iterationCnt},#{productCnt},#{minStartTime},#{maxEndTime},#{menuCnt},#{menuFinishCnt},#{menuExecCnt},#{menuUnstartCnt},#{menuCloseCnt},#{taskCnt},#{taskUnstartCnt},#{taskExecCnt},#{taskFinishCnt},#{taskSetCnt},#{taskOutCnt},#{taskCloseCnt},#{bugCnt},#{closedBugs},#{resolvedBugs},#{activeBugs},#{confirmedBugs},#{planWorkhours},#{planWorkerCnt},#{actWorkerCnt},#{projectCnt},#{budgetAt},#{actAt}
 		)
 	</insert>
 	
@@ -133,131 +133,283 @@
 	
 	<!--sql片段 列-->
 	<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,estimate_workload,min_start_time,max_end_time
+		iteration_id,biz_date,file_cnt,iteration_name,calc_time,calc_status,phase_cnt,phase_finish_cnt,need_pay_at,finish_pay_at,need_col_at,finish_col_at,risk_cnt,risk_finish_cnt,branch_id,branch_name,budget_nouser_at,budget_ouser_at,budget_iuser_at,act_user_at,act_iuser_at,act_ouser_at,act_nouser_at,finish_rate,budget_workload,budget_ouser_workload,budget_iuser_workload,estimate_workload,act_workload,project_status,act_ouser_workload,act_iuser_workload,need_pay_cnt,finish_pay_cnt,finish_pay_user_cnt,need_pay_user_cnt,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,min_start_time,max_end_time,menu_cnt,menu_finish_cnt,menu_exec_cnt,menu_unstart_cnt,menu_close_cnt,task_cnt,task_unstart_cnt,task_exec_cnt,task_finish_cnt,task_set_cnt,task_out_cnt,task_close_cnt,bug_cnt,closed_bugs,resolved_bugs,active_bugs,confirmed_bugs,plan_workhours,plan_worker_cnt,act_worker_cnt,project_cnt,budget_at,act_at
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
 	<sql id="where">
-		<if test="distBudgetCost != null and distBudgetCost != ''">      and res.dist_budget_cost = #{distBudgetCost}     </if>
-		<if test="distBudgetWorkload != null and distBudgetWorkload != ''">      and res.dist_budget_workload = #{distBudgetWorkload}     </if>
-		<if test="actCost != null and actCost != ''">      and res.act_cost = #{actCost}     </if>
-		<if test="actWorkload != null and actWorkload != ''">      and res.act_workload = #{actWorkload}     </if>
-		<if test="actStaffNum != null and actStaffNum != ''">      and res.act_staff_num = #{actStaffNum}     </if>
+		<if test="iterationId != null and iterationId != ''">      and res.iteration_id = #{iterationId}     </if>
+		<if test="bizDate != null and bizDate != ''">      and res.biz_date = #{bizDate}     </if>
+		<if test="fileCnt != null and fileCnt != ''">      and res.file_cnt = #{fileCnt}     </if>
+		<if test="iterationName != null and iterationName != ''">      and res.iteration_name = #{iterationName}     </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="phaseCnt != null and phaseCnt != ''">      and res.phase_cnt = #{phaseCnt}     </if>
+		<if test="phaseFinishCnt != null and phaseFinishCnt != ''">      and res.phase_finish_cnt = #{phaseFinishCnt}     </if>
+		<if test="needPayAt != null and needPayAt != ''">      and res.need_pay_at = #{needPayAt}     </if>
+		<if test="finishPayAt != null and finishPayAt != ''">      and res.finish_pay_at = #{finishPayAt}     </if>
+		<if test="needColAt != null and needColAt != ''">      and res.need_col_at = #{needColAt}     </if>
+		<if test="finishColAt != null and finishColAt != ''">      and res.finish_col_at = #{finishColAt}     </if>
+		<if test="riskCnt != null and riskCnt != ''">      and res.risk_cnt = #{riskCnt}     </if>
+		<if test="riskFinishCnt != null and riskFinishCnt != ''">      and res.risk_finish_cnt = #{riskFinishCnt}     </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="budgetNouserAt != null and budgetNouserAt != ''">      and res.budget_nouser_at = #{budgetNouserAt}     </if>
+		<if test="budgetOuserAt != null and budgetOuserAt != ''">      and res.budget_ouser_at = #{budgetOuserAt}     </if>
+		<if test="budgetIuserAt != null and budgetIuserAt != ''">      and res.budget_iuser_at = #{budgetIuserAt}     </if>
+		<if test="actUserAt != null and actUserAt != ''">      and res.act_user_at = #{actUserAt}     </if>
+		<if test="actIuserAt != null and actIuserAt != ''">      and res.act_iuser_at = #{actIuserAt}     </if>
+		<if test="actOuserAt != null and actOuserAt != ''">      and res.act_ouser_at = #{actOuserAt}     </if>
+		<if test="actNouserAt != null and actNouserAt != ''">      and res.act_nouser_at = #{actNouserAt}     </if>
 		<if test="finishRate != null and finishRate != ''">      and res.finish_rate = #{finishRate}     </if>
+		<if test="budgetWorkload != null and budgetWorkload != ''">      and res.budget_workload = #{budgetWorkload}     </if>
+		<if test="budgetOuserWorkload != null and budgetOuserWorkload != ''">      and res.budget_ouser_workload = #{budgetOuserWorkload}     </if>
+		<if test="budgetIuserWorkload != null and budgetIuserWorkload != ''">      and res.budget_iuser_workload = #{budgetIuserWorkload}     </if>
+		<if test="estimateWorkload != null and estimateWorkload != ''">      and res.estimate_workload = #{estimateWorkload}     </if>
+		<if test="actWorkload != null and actWorkload != ''">      and res.act_workload = #{actWorkload}     </if>
+		<if test="projectStatus != null and projectStatus != ''">      and res.project_status = #{projectStatus}     </if>
+		<if test="actOuserWorkload != null and actOuserWorkload != ''">      and res.act_ouser_workload = #{actOuserWorkload}     </if>
+		<if test="actIuserWorkload != null and actIuserWorkload != ''">      and res.act_iuser_workload = #{actIuserWorkload}     </if>
+		<if test="needPayCnt != null and needPayCnt != ''">      and res.need_pay_cnt = #{needPayCnt}     </if>
+		<if test="finishPayCnt != null and finishPayCnt != ''">      and res.finish_pay_cnt = #{finishPayCnt}     </if>
+		<if test="finishPayUserCnt != null and finishPayUserCnt != ''">      and res.finish_pay_user_cnt = #{finishPayUserCnt}     </if>
+		<if test="needPayUserCnt != null and needPayUserCnt != ''">      and res.need_pay_user_cnt = #{needPayUserCnt}     </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="designCases != null and designCases != ''">      and res.design_cases = #{designCases}     </if>
 		<if test="finishCases != null and finishCases != ''">      and res.finish_cases = #{finishCases}     </if>
-		<if test="projectCnt != null and projectCnt != ''">      and res.project_cnt = #{projectCnt}     </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="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>
 		<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="menuExecCnt != null and menuExecCnt != ''">      and res.menu_exec_cnt = #{menuExecCnt}     </if>
+		<if test="menuUnstartCnt != null and menuUnstartCnt != ''">      and res.menu_unstart_cnt = #{menuUnstartCnt}     </if>
+		<if test="menuCloseCnt != null and menuCloseCnt != ''">      and res.menu_close_cnt = #{menuCloseCnt}     </if>
 		<if test="taskCnt != null and taskCnt != ''">      and res.task_cnt = #{taskCnt}     </if>
-		<if test="finishTaskCnt != null and finishTaskCnt != ''">      and res.finish_task_cnt = #{finishTaskCnt}     </if>
-		<if test="calcTime != null">      and date_format(res.calc_time,'%Y-%m-%d') = date_format(#{calcTime},'%Y-%m-%d')     </if>
-		<if test="iterationName != null and iterationName != ''">      and res.iteration_name = #{iterationName}     </if>
-		<if test="budgetCost != null and budgetCost != ''">      and res.budget_cost = #{budgetCost}     </if>
-		<if test="budgetWorkload != null and budgetWorkload != ''">      and res.budget_workload = #{budgetWorkload}     </if>
-		<if test="iterationId != null and iterationId != ''">      and res.iteration_id = #{iterationId}     </if>
-		<if test="bizDate != null and bizDate != ''">      and res.biz_date = #{bizDate}     </if>
-		<if test="closedBugCnt != null and closedBugCnt != ''">      and res.closed_bug_cnt = #{closedBugCnt}     </if>
-		<if test="resolvedBugCnt != null and resolvedBugCnt != ''">      and res.resolved_bug_cnt = #{resolvedBugCnt}     </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="taskUnstartCnt != null and taskUnstartCnt != ''">      and res.task_unstart_cnt = #{taskUnstartCnt}     </if>
+		<if test="taskExecCnt != null and taskExecCnt != ''">      and res.task_exec_cnt = #{taskExecCnt}     </if>
+		<if test="taskFinishCnt != null and taskFinishCnt != ''">      and res.task_finish_cnt = #{taskFinishCnt}     </if>
+		<if test="taskSetCnt != null and taskSetCnt != ''">      and res.task_set_cnt = #{taskSetCnt}     </if>
+		<if test="taskOutCnt != null and taskOutCnt != ''">      and res.task_out_cnt = #{taskOutCnt}     </if>
+		<if test="taskCloseCnt != null and taskCloseCnt != ''">      and res.task_close_cnt = #{taskCloseCnt}     </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>
+		<if test="closedBugs != null and closedBugs != ''">      and res.closed_bugs = #{closedBugs}     </if>
+		<if test="resolvedBugs != null and resolvedBugs != ''">      and res.resolved_bugs = #{resolvedBugs}     </if>
+		<if test="activeBugs != null and activeBugs != ''">      and res.active_bugs = #{activeBugs}     </if>
+		<if test="confirmedBugs != null and confirmedBugs != ''">      and res.confirmed_bugs = #{confirmedBugs}     </if>
+		<if test="planWorkhours != null and planWorkhours != ''">      and res.plan_workhours = #{planWorkhours}     </if>
+		<if test="planWorkerCnt != null and planWorkerCnt != ''">      and res.plan_worker_cnt = #{planWorkerCnt}     </if>
+		<if test="actWorkerCnt != null and actWorkerCnt != ''">      and res.act_worker_cnt = #{actWorkerCnt}     </if>
+		<if test="projectCnt != null and projectCnt != ''">      and res.project_cnt = #{projectCnt}     </if>
+		<if test="budgetAt != null and budgetAt != ''">      and res.budget_at = #{budgetAt}     </if>
+		<if test="actAt != null and actAt != ''">      and res.act_at = #{actAt}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
-		dist_budget_cost = #{distBudgetCost},
-		dist_budget_workload = #{distBudgetWorkload},
-		act_cost = #{actCost},
-		act_workload = #{actWorkload},
-		act_staff_num = #{actStaffNum},
+		biz_date = #{bizDate},
+		file_cnt = #{fileCnt},
+		iteration_name = #{iterationName},
+		calc_time = #{calcTime},
+		calc_status = #{calcStatus},
+		phase_cnt = #{phaseCnt},
+		phase_finish_cnt = #{phaseFinishCnt},
+		need_pay_at = #{needPayAt},
+		finish_pay_at = #{finishPayAt},
+		need_col_at = #{needColAt},
+		finish_col_at = #{finishColAt},
+		risk_cnt = #{riskCnt},
+		risk_finish_cnt = #{riskFinishCnt},
+		branch_id = #{branchId},
+		branch_name = #{branchName},
+		budget_nouser_at = #{budgetNouserAt},
+		budget_ouser_at = #{budgetOuserAt},
+		budget_iuser_at = #{budgetIuserAt},
+		act_user_at = #{actUserAt},
+		act_iuser_at = #{actIuserAt},
+		act_ouser_at = #{actOuserAt},
+		act_nouser_at = #{actNouserAt},
 		finish_rate = #{finishRate},
+		budget_workload = #{budgetWorkload},
+		budget_ouser_workload = #{budgetOuserWorkload},
+		budget_iuser_workload = #{budgetIuserWorkload},
+		estimate_workload = #{estimateWorkload},
+		act_workload = #{actWorkload},
+		project_status = #{projectStatus},
+		act_ouser_workload = #{actOuserWorkload},
+		act_iuser_workload = #{actIuserWorkload},
+		need_pay_cnt = #{needPayCnt},
+		finish_pay_cnt = #{finishPayCnt},
+		finish_pay_user_cnt = #{finishPayUserCnt},
+		need_pay_user_cnt = #{needPayUserCnt},
 		test_cases = #{testCases},
 		exec_cases = #{execCases},
 		design_cases = #{designCases},
 		finish_cases = #{finishCases},
-		project_cnt = #{projectCnt},
+		iteration_cnt = #{iterationCnt},
 		product_cnt = #{productCnt},
+		min_start_time = #{minStartTime},
+		max_end_time = #{maxEndTime},
 		menu_cnt = #{menuCnt},
+		menu_finish_cnt = #{menuFinishCnt},
+		menu_exec_cnt = #{menuExecCnt},
+		menu_unstart_cnt = #{menuUnstartCnt},
+		menu_close_cnt = #{menuCloseCnt},
 		task_cnt = #{taskCnt},
-		finish_task_cnt = #{finishTaskCnt},
-		calc_time = #{calcTime},
-		iteration_name = #{iterationName},
-		budget_cost = #{budgetCost},
-		budget_workload = #{budgetWorkload},
-		biz_date = #{bizDate},
-		closed_bug_cnt = #{closedBugCnt},
-		resolved_bug_cnt = #{resolvedBugCnt},
-		active_bug_cnt = #{activeBugCnt},
-		confirmed_bug_cnt = #{confirmedBugCnt},
+		task_unstart_cnt = #{taskUnstartCnt},
+		task_exec_cnt = #{taskExecCnt},
+		task_finish_cnt = #{taskFinishCnt},
+		task_set_cnt = #{taskSetCnt},
+		task_out_cnt = #{taskOutCnt},
+		task_close_cnt = #{taskCloseCnt},
 		bug_cnt = #{bugCnt},
-		estimate_workload = #{estimateWorkload},
-		min_start_time = #{minStartTime},
-		max_end_time = #{maxEndTime}
+		closed_bugs = #{closedBugs},
+		resolved_bugs = #{resolvedBugs},
+		active_bugs = #{activeBugs},
+		confirmed_bugs = #{confirmedBugs},
+		plan_workhours = #{planWorkhours},
+		plan_worker_cnt = #{planWorkerCnt},
+		act_worker_cnt = #{actWorkerCnt},
+		project_cnt = #{projectCnt},
+		budget_at = #{budgetAt},
+		act_at = #{actAt}
 	</sql>
 	<sql id="someFieldSet">
-		<if test="distBudgetCost != null and distBudgetCost != ''"> dist_budget_cost = #{distBudgetCost},     </if>
-		<if test="distBudgetWorkload != null and distBudgetWorkload != ''"> dist_budget_workload = #{distBudgetWorkload},     </if>
-		<if test="actCost != null and actCost != ''"> act_cost = #{actCost},     </if>
-		<if test="actWorkload != null and actWorkload != ''"> act_workload = #{actWorkload},     </if>
-		<if test="actStaffNum != null and actStaffNum != ''"> act_staff_num = #{actStaffNum},     </if>
+		<if test="bizDate != null and bizDate != ''"> biz_date = #{bizDate},     </if>
+		<if test="fileCnt != null and fileCnt != ''"> file_cnt = #{fileCnt},     </if>
+		<if test="iterationName != null and iterationName != ''"> iteration_name = #{iterationName},     </if>
+		<if test="calcTime != null"> calc_time = #{calcTime},     </if>
+		<if test="calcStatus != null and calcStatus != ''"> calc_status = #{calcStatus},     </if>
+		<if test="phaseCnt != null and phaseCnt != ''"> phase_cnt = #{phaseCnt},     </if>
+		<if test="phaseFinishCnt != null and phaseFinishCnt != ''"> phase_finish_cnt = #{phaseFinishCnt},     </if>
+		<if test="needPayAt != null and needPayAt != ''"> need_pay_at = #{needPayAt},     </if>
+		<if test="finishPayAt != null and finishPayAt != ''"> finish_pay_at = #{finishPayAt},     </if>
+		<if test="needColAt != null and needColAt != ''"> need_col_at = #{needColAt},     </if>
+		<if test="finishColAt != null and finishColAt != ''"> finish_col_at = #{finishColAt},     </if>
+		<if test="riskCnt != null and riskCnt != ''"> risk_cnt = #{riskCnt},     </if>
+		<if test="riskFinishCnt != null and riskFinishCnt != ''"> risk_finish_cnt = #{riskFinishCnt},     </if>
+		<if test="branchId != null and branchId != ''"> branch_id = #{branchId},     </if>
+		<if test="branchName != null and branchName != ''"> branch_name = #{branchName},     </if>
+		<if test="budgetNouserAt != null and budgetNouserAt != ''"> budget_nouser_at = #{budgetNouserAt},     </if>
+		<if test="budgetOuserAt != null and budgetOuserAt != ''"> budget_ouser_at = #{budgetOuserAt},     </if>
+		<if test="budgetIuserAt != null and budgetIuserAt != ''"> budget_iuser_at = #{budgetIuserAt},     </if>
+		<if test="actUserAt != null and actUserAt != ''"> act_user_at = #{actUserAt},     </if>
+		<if test="actIuserAt != null and actIuserAt != ''"> act_iuser_at = #{actIuserAt},     </if>
+		<if test="actOuserAt != null and actOuserAt != ''"> act_ouser_at = #{actOuserAt},     </if>
+		<if test="actNouserAt != null and actNouserAt != ''"> act_nouser_at = #{actNouserAt},     </if>
 		<if test="finishRate != null and finishRate != ''"> finish_rate = #{finishRate},     </if>
+		<if test="budgetWorkload != null and budgetWorkload != ''"> budget_workload = #{budgetWorkload},     </if>
+		<if test="budgetOuserWorkload != null and budgetOuserWorkload != ''"> budget_ouser_workload = #{budgetOuserWorkload},     </if>
+		<if test="budgetIuserWorkload != null and budgetIuserWorkload != ''"> budget_iuser_workload = #{budgetIuserWorkload},     </if>
+		<if test="estimateWorkload != null and estimateWorkload != ''"> estimate_workload = #{estimateWorkload},     </if>
+		<if test="actWorkload != null and actWorkload != ''"> act_workload = #{actWorkload},     </if>
+		<if test="projectStatus != null and projectStatus != ''"> project_status = #{projectStatus},     </if>
+		<if test="actOuserWorkload != null and actOuserWorkload != ''"> act_ouser_workload = #{actOuserWorkload},     </if>
+		<if test="actIuserWorkload != null and actIuserWorkload != ''"> act_iuser_workload = #{actIuserWorkload},     </if>
+		<if test="needPayCnt != null and needPayCnt != ''"> need_pay_cnt = #{needPayCnt},     </if>
+		<if test="finishPayCnt != null and finishPayCnt != ''"> finish_pay_cnt = #{finishPayCnt},     </if>
+		<if test="finishPayUserCnt != null and finishPayUserCnt != ''"> finish_pay_user_cnt = #{finishPayUserCnt},     </if>
+		<if test="needPayUserCnt != null and needPayUserCnt != ''"> need_pay_user_cnt = #{needPayUserCnt},     </if>
 		<if test="testCases != null and testCases != ''"> test_cases = #{testCases},     </if>
 		<if test="execCases != null and execCases != ''"> exec_cases = #{execCases},     </if>
 		<if test="designCases != null and designCases != ''"> design_cases = #{designCases},     </if>
 		<if test="finishCases != null and finishCases != ''"> finish_cases = #{finishCases},     </if>
-		<if test="projectCnt != null and projectCnt != ''"> project_cnt = #{projectCnt},     </if>
+		<if test="iterationCnt != null and iterationCnt != ''"> iteration_cnt = #{iterationCnt},     </if>
 		<if test="productCnt != null and productCnt != ''"> product_cnt = #{productCnt},     </if>
+		<if test="minStartTime != null"> min_start_time = #{minStartTime},     </if>
+		<if test="maxEndTime != null"> max_end_time = #{maxEndTime},     </if>
 		<if test="menuCnt != null and menuCnt != ''"> menu_cnt = #{menuCnt},     </if>
+		<if test="menuFinishCnt != null and menuFinishCnt != ''"> menu_finish_cnt = #{menuFinishCnt},     </if>
+		<if test="menuExecCnt != null and menuExecCnt != ''"> menu_exec_cnt = #{menuExecCnt},     </if>
+		<if test="menuUnstartCnt != null and menuUnstartCnt != ''"> menu_unstart_cnt = #{menuUnstartCnt},     </if>
+		<if test="menuCloseCnt != null and menuCloseCnt != ''"> menu_close_cnt = #{menuCloseCnt},     </if>
 		<if test="taskCnt != null and taskCnt != ''"> task_cnt = #{taskCnt},     </if>
-		<if test="finishTaskCnt != null and finishTaskCnt != ''"> finish_task_cnt = #{finishTaskCnt},     </if>
-		<if test="calcTime != null"> calc_time = #{calcTime},     </if>
-		<if test="iterationName != null and iterationName != ''"> iteration_name = #{iterationName},     </if>
-		<if test="budgetCost != null and budgetCost != ''"> budget_cost = #{budgetCost},     </if>
-		<if test="budgetWorkload != null and budgetWorkload != ''"> budget_workload = #{budgetWorkload},     </if>
-		<if test="bizDate != null and bizDate != ''"> biz_date = #{bizDate},     </if>
-		<if test="closedBugCnt != null and closedBugCnt != ''"> closed_bug_cnt = #{closedBugCnt},     </if>
-		<if test="resolvedBugCnt != null and resolvedBugCnt != ''"> resolved_bug_cnt = #{resolvedBugCnt},     </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="taskUnstartCnt != null and taskUnstartCnt != ''"> task_unstart_cnt = #{taskUnstartCnt},     </if>
+		<if test="taskExecCnt != null and taskExecCnt != ''"> task_exec_cnt = #{taskExecCnt},     </if>
+		<if test="taskFinishCnt != null and taskFinishCnt != ''"> task_finish_cnt = #{taskFinishCnt},     </if>
+		<if test="taskSetCnt != null and taskSetCnt != ''"> task_set_cnt = #{taskSetCnt},     </if>
+		<if test="taskOutCnt != null and taskOutCnt != ''"> task_out_cnt = #{taskOutCnt},     </if>
+		<if test="taskCloseCnt != null and taskCloseCnt != ''"> task_close_cnt = #{taskCloseCnt},     </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>
+		<if test="closedBugs != null and closedBugs != ''"> closed_bugs = #{closedBugs},     </if>
+		<if test="resolvedBugs != null and resolvedBugs != ''"> resolved_bugs = #{resolvedBugs},     </if>
+		<if test="activeBugs != null and activeBugs != ''"> active_bugs = #{activeBugs},     </if>
+		<if test="confirmedBugs != null and confirmedBugs != ''"> confirmed_bugs = #{confirmedBugs},     </if>
+		<if test="planWorkhours != null and planWorkhours != ''"> plan_workhours = #{planWorkhours},     </if>
+		<if test="planWorkerCnt != null and planWorkerCnt != ''"> plan_worker_cnt = #{planWorkerCnt},     </if>
+		<if test="actWorkerCnt != null and actWorkerCnt != ''"> act_worker_cnt = #{actWorkerCnt},     </if>
+		<if test="projectCnt != null and projectCnt != ''"> project_cnt = #{projectCnt},     </if>
+		<if test="budgetAt != null and budgetAt != ''"> budget_at = #{budgetAt},     </if>
+		<if test="actAt != null and actAt != ''"> act_at = #{actAt},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
-			dist_budget_cost = #{item.distBudgetCost},
-			dist_budget_workload = #{item.distBudgetWorkload},
-			act_cost = #{item.actCost},
-			act_workload = #{item.actWorkload},
-			act_staff_num = #{item.actStaffNum},
+			biz_date = #{item.bizDate},
+			file_cnt = #{item.fileCnt},
+			iteration_name = #{item.iterationName},
+			calc_time = #{item.calcTime},
+			calc_status = #{item.calcStatus},
+			phase_cnt = #{item.phaseCnt},
+			phase_finish_cnt = #{item.phaseFinishCnt},
+			need_pay_at = #{item.needPayAt},
+			finish_pay_at = #{item.finishPayAt},
+			need_col_at = #{item.needColAt},
+			finish_col_at = #{item.finishColAt},
+			risk_cnt = #{item.riskCnt},
+			risk_finish_cnt = #{item.riskFinishCnt},
+			branch_id = #{item.branchId},
+			branch_name = #{item.branchName},
+			budget_nouser_at = #{item.budgetNouserAt},
+			budget_ouser_at = #{item.budgetOuserAt},
+			budget_iuser_at = #{item.budgetIuserAt},
+			act_user_at = #{item.actUserAt},
+			act_iuser_at = #{item.actIuserAt},
+			act_ouser_at = #{item.actOuserAt},
+			act_nouser_at = #{item.actNouserAt},
 			finish_rate = #{item.finishRate},
+			budget_workload = #{item.budgetWorkload},
+			budget_ouser_workload = #{item.budgetOuserWorkload},
+			budget_iuser_workload = #{item.budgetIuserWorkload},
+			estimate_workload = #{item.estimateWorkload},
+			act_workload = #{item.actWorkload},
+			project_status = #{item.projectStatus},
+			act_ouser_workload = #{item.actOuserWorkload},
+			act_iuser_workload = #{item.actIuserWorkload},
+			need_pay_cnt = #{item.needPayCnt},
+			finish_pay_cnt = #{item.finishPayCnt},
+			finish_pay_user_cnt = #{item.finishPayUserCnt},
+			need_pay_user_cnt = #{item.needPayUserCnt},
 			test_cases = #{item.testCases},
 			exec_cases = #{item.execCases},
 			design_cases = #{item.designCases},
 			finish_cases = #{item.finishCases},
-			project_cnt = #{item.projectCnt},
+			iteration_cnt = #{item.iterationCnt},
 			product_cnt = #{item.productCnt},
+			min_start_time = #{item.minStartTime},
+			max_end_time = #{item.maxEndTime},
 			menu_cnt = #{item.menuCnt},
+			menu_finish_cnt = #{item.menuFinishCnt},
+			menu_exec_cnt = #{item.menuExecCnt},
+			menu_unstart_cnt = #{item.menuUnstartCnt},
+			menu_close_cnt = #{item.menuCloseCnt},
 			task_cnt = #{item.taskCnt},
-			finish_task_cnt = #{item.finishTaskCnt},
-			calc_time = #{item.calcTime},
-			iteration_name = #{item.iterationName},
-			budget_cost = #{item.budgetCost},
-			budget_workload = #{item.budgetWorkload},
-			biz_date = #{item.bizDate},
-			closed_bug_cnt = #{item.closedBugCnt},
-			resolved_bug_cnt = #{item.resolvedBugCnt},
-			active_bug_cnt = #{item.activeBugCnt},
-			confirmed_bug_cnt = #{item.confirmedBugCnt},
+			task_unstart_cnt = #{item.taskUnstartCnt},
+			task_exec_cnt = #{item.taskExecCnt},
+			task_finish_cnt = #{item.taskFinishCnt},
+			task_set_cnt = #{item.taskSetCnt},
+			task_out_cnt = #{item.taskOutCnt},
+			task_close_cnt = #{item.taskCloseCnt},
 			bug_cnt = #{item.bugCnt},
-			estimate_workload = #{item.estimateWorkload},
-			min_start_time = #{item.minStartTime},
-			max_end_time = #{item.maxEndTime}
+			closed_bugs = #{item.closedBugs},
+			resolved_bugs = #{item.resolvedBugs},
+			active_bugs = #{item.activeBugs},
+			confirmed_bugs = #{item.confirmedBugs},
+			plan_workhours = #{item.planWorkhours},
+			plan_worker_cnt = #{item.planWorkerCnt},
+			act_worker_cnt = #{item.actWorkerCnt},
+			project_cnt = #{item.projectCnt},
+			budget_at = #{item.budgetAt},
+			act_at = #{item.actAt}
 	</sql>
 </mapper>
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuStateMapper.xml
index 4958f565..89f44f13 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuStateMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuStateMapper.xml
@@ -180,7 +180,7 @@
 		insert into xm_menu_state(
 			<include refid="columns"/>
 		) values (
-		#{menuId},#{planStartTime},#{planEndTime},#{actStartTime},#{actEndTime},#{planWorkload},#{actWorkload},#{planCostAmount},#{actCostAmount},#{finishRate},#{demandRate},#{designRate},#{devRate},#{uatRate},#{sitRate},#{onlineStatus},#{onlineTime},#{planStatus},#{chargeUserid},#{chargeUsername},#{menuStatus},#{ctime},#{ltime},#{cuserid},#{cusername},#{calcTime},#{menuName},#{planWorkhours},#{planWorkerCnt},#{closedBugs},#{activeBugs},#{confirmedBugs},#{resolvedBugs},#{productId},#{productName},#{testCases},#{execCases},#{designCases},#{finishCases},#{projectCnt},#{iterationCnt},#{taskCnt},#{finishTaskCnt},#{bizDate},#{bugCnt}
+		#{menuId},#{finishRate},#{menuStatus},#{ctime},#{calcTime},#{menuName},#{planWorkhours},#{planWorkerCnt},#{closedBugs},#{activeBugs},#{confirmedBugs},#{resolvedBugs},#{productId},#{testCases},#{execCases},#{designCases},#{finishCases},#{bizDate},#{bugCnt},#{taskCnt},#{taskUnstartCnt},#{taskExecCnt},#{taskFinishCnt},#{taskSetCnt},#{taskOutCnt},#{taskCloseCnt},#{budgetNouserAt},#{budgetOuserAt},#{budgetIuserAt},#{actUserAt},#{actIuserAt},#{actOuserAt},#{actNouserAt},#{budgetWorkload},#{budgetOuserWorkload},#{budgetIuserWorkload},#{actWorkload},#{actOuserWorkload},#{actIuserWorkload},#{estimateWorkload},#{budgetAt},#{actAt},#{minStartTime},#{maxEndTime},#{productCnt},#{iterationCnt},#{projectCnt}
 		)
 	</insert>
 	
@@ -243,36 +243,15 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		menu_id,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,online_status,online_time,plan_status,charge_userid,charge_username,menu_status,ctime,ltime,cuserid,cusername,calc_time,menu_name,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,bug_cnt
+		menu_id,finish_rate,menu_status,ctime,calc_time,menu_name,plan_workhours,plan_worker_cnt,closed_bugs,active_bugs,confirmed_bugs,resolved_bugs,product_id,test_cases,exec_cases,design_cases,finish_cases,biz_date,bug_cnt,task_cnt,task_unstart_cnt,task_exec_cnt,task_finish_cnt,task_set_cnt,task_out_cnt,task_close_cnt,budget_nouser_at,budget_ouser_at,budget_iuser_at,act_user_at,act_iuser_at,act_ouser_at,act_nouser_at,budget_workload,budget_ouser_workload,budget_iuser_workload,act_workload,act_ouser_workload,act_iuser_workload,estimate_workload,budget_at,act_at,min_start_time,max_end_time,product_cnt,iteration_cnt,project_cnt
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
 	<sql id="where">
 		<if test="menuId != null and menuId != ''">      and res.menu_id = #{menuId}     </if>
-		<if test="planStartTime != null">      and date_format(res.plan_start_time,'%Y-%m-%d') = date_format(#{planStartTime},'%Y-%m-%d')     </if>
-		<if test="planEndTime != null">      and date_format(res.plan_end_time,'%Y-%m-%d') = date_format(#{planEndTime},'%Y-%m-%d')     </if>
-		<if test="actStartTime != null">      and date_format(res.act_start_time,'%Y-%m-%d') = date_format(#{actStartTime},'%Y-%m-%d')     </if>
-		<if test="actEndTime != null">      and date_format(res.act_end_time,'%Y-%m-%d') = date_format(#{actEndTime},'%Y-%m-%d')     </if>
-		<if test="planWorkload != null and planWorkload != ''">      and res.plan_workload = #{planWorkload}     </if>
-		<if test="actWorkload != null and actWorkload != ''">      and res.act_workload = #{actWorkload}     </if>
-		<if test="planCostAmount != null and planCostAmount != ''">      and res.plan_cost_amount = #{planCostAmount}     </if>
-		<if test="actCostAmount != null and actCostAmount != ''">      and res.act_cost_amount = #{actCostAmount}     </if>
 		<if test="finishRate != null and finishRate != ''">      and res.finish_rate = #{finishRate}     </if>
-		<if test="demandRate != null and demandRate != ''">      and res.demand_rate = #{demandRate}     </if>
-		<if test="designRate != null and designRate != ''">      and res.design_rate = #{designRate}     </if>
-		<if test="devRate != null and devRate != ''">      and res.dev_rate = #{devRate}     </if>
-		<if test="uatRate != null and uatRate != ''">      and res.uat_rate = #{uatRate}     </if>
-		<if test="sitRate != null and sitRate != ''">      and res.sit_rate = #{sitRate}     </if>
-		<if test="onlineStatus != null and onlineStatus != ''">      and res.online_status = #{onlineStatus}     </if>
-		<if test="onlineTime != null">      and date_format(res.online_time,'%Y-%m-%d') = date_format(#{onlineTime},'%Y-%m-%d')     </if>
-		<if test="planStatus != null and planStatus != ''">      and res.plan_status = #{planStatus}     </if>
-		<if test="chargeUserid != null and chargeUserid != ''">      and res.charge_userid = #{chargeUserid}     </if>
-		<if test="chargeUsername != null and chargeUsername != ''">      and res.charge_username = #{chargeUsername}     </if>
 		<if test="menuStatus != null and menuStatus != ''">      and res.menu_status = #{menuStatus}     </if>
 		<if test="ctime != null">      and date_format(res.ctime,'%Y-%m-%d') = date_format(#{ctime},'%Y-%m-%d')     </if>
-		<if test="ltime != null">      and date_format(res.ltime,'%Y-%m-%d') = date_format(#{ltime},'%Y-%m-%d')     </if>
-		<if test="cuserid != null and cuserid != ''">      and res.cuserid = #{cuserid}     </if>
-		<if test="cusername != null and cusername != ''">      and res.cusername = #{cusername}     </if>
 		<if test="calcTime != null">      and date_format(res.calc_time,'%Y-%m-%d') = date_format(#{calcTime},'%Y-%m-%d')     </if>
 		<if test="menuName != null and menuName != ''">      and res.menu_name = #{menuName}     </if>
 		<if test="planWorkhours != null and planWorkhours != ''">      and res.plan_workhours = #{planWorkhours}     </if>
@@ -282,44 +261,46 @@
 		<if test="confirmedBugs != null and confirmedBugs != ''">      and res.confirmed_bugs = #{confirmedBugs}     </if>
 		<if test="resolvedBugs != null and resolvedBugs != ''">      and res.resolved_bugs = #{resolvedBugs}     </if>
 		<if test="productId != null and productId != ''">      and res.product_id = #{productId}     </if>
-		<if test="productName != null and productName != ''">      and res.product_name = #{productName}     </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="designCases != null and designCases != ''">      and res.design_cases = #{designCases}     </if>
 		<if test="finishCases != null and finishCases != ''">      and res.finish_cases = #{finishCases}     </if>
-		<if test="projectCnt != null and projectCnt != ''">      and res.project_cnt = #{projectCnt}     </if>
-		<if test="iterationCnt != null and iterationCnt != ''">      and res.iteration_cnt = #{iterationCnt}     </if>
-		<if test="taskCnt != null and taskCnt != ''">      and res.task_cnt = #{taskCnt}     </if>
-		<if test="finishTaskCnt != null and finishTaskCnt != ''">      and res.finish_task_cnt = #{finishTaskCnt}     </if>
 		<if test="bizDate != null and bizDate != ''">      and res.biz_date = #{bizDate}     </if>
 		<if test="bugCnt != null and bugCnt != ''">      and res.bug_cnt = #{bugCnt}     </if>
+		<if test="taskCnt != null and taskCnt != ''">      and res.task_cnt = #{taskCnt}     </if>
+		<if test="taskUnstartCnt != null and taskUnstartCnt != ''">      and res.task_unstart_cnt = #{taskUnstartCnt}     </if>
+		<if test="taskExecCnt != null and taskExecCnt != ''">      and res.task_exec_cnt = #{taskExecCnt}     </if>
+		<if test="taskFinishCnt != null and taskFinishCnt != ''">      and res.task_finish_cnt = #{taskFinishCnt}     </if>
+		<if test="taskSetCnt != null and taskSetCnt != ''">      and res.task_set_cnt = #{taskSetCnt}     </if>
+		<if test="taskOutCnt != null and taskOutCnt != ''">      and res.task_out_cnt = #{taskOutCnt}     </if>
+		<if test="taskCloseCnt != null and taskCloseCnt != ''">      and res.task_close_cnt = #{taskCloseCnt}     </if>
+		<if test="budgetNouserAt != null and budgetNouserAt != ''">      and res.budget_nouser_at = #{budgetNouserAt}     </if>
+		<if test="budgetOuserAt != null and budgetOuserAt != ''">      and res.budget_ouser_at = #{budgetOuserAt}     </if>
+		<if test="budgetIuserAt != null and budgetIuserAt != ''">      and res.budget_iuser_at = #{budgetIuserAt}     </if>
+		<if test="actUserAt != null and actUserAt != ''">      and res.act_user_at = #{actUserAt}     </if>
+		<if test="actIuserAt != null and actIuserAt != ''">      and res.act_iuser_at = #{actIuserAt}     </if>
+		<if test="actOuserAt != null and actOuserAt != ''">      and res.act_ouser_at = #{actOuserAt}     </if>
+		<if test="actNouserAt != null and actNouserAt != ''">      and res.act_nouser_at = #{actNouserAt}     </if>
+		<if test="budgetWorkload != null and budgetWorkload != ''">      and res.budget_workload = #{budgetWorkload}     </if>
+		<if test="budgetOuserWorkload != null and budgetOuserWorkload != ''">      and res.budget_ouser_workload = #{budgetOuserWorkload}     </if>
+		<if test="budgetIuserWorkload != null and budgetIuserWorkload != ''">      and res.budget_iuser_workload = #{budgetIuserWorkload}     </if>
+		<if test="actWorkload != null and actWorkload != ''">      and res.act_workload = #{actWorkload}     </if>
+		<if test="actOuserWorkload != null and actOuserWorkload != ''">      and res.act_ouser_workload = #{actOuserWorkload}     </if>
+		<if test="actIuserWorkload != null and actIuserWorkload != ''">      and res.act_iuser_workload = #{actIuserWorkload}     </if>
+		<if test="estimateWorkload != null and estimateWorkload != ''">      and res.estimate_workload = #{estimateWorkload}     </if>
+		<if test="budgetAt != null and budgetAt != ''">      and res.budget_at = #{budgetAt}     </if>
+		<if test="actAt != null and actAt != ''">      and res.act_at = #{actAt}     </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>
+		<if test="productCnt != null and productCnt != ''">      and res.product_cnt = #{productCnt}     </if>
+		<if test="iterationCnt != null and iterationCnt != ''">      and res.iteration_cnt = #{iterationCnt}     </if>
+		<if test="projectCnt != null and projectCnt != ''">      and res.project_cnt = #{projectCnt}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
-		plan_start_time = #{planStartTime},
-		plan_end_time = #{planEndTime},
-		act_start_time = #{actStartTime},
-		act_end_time = #{actEndTime},
-		plan_workload = #{planWorkload},
-		act_workload = #{actWorkload},
-		plan_cost_amount = #{planCostAmount},
-		act_cost_amount = #{actCostAmount},
 		finish_rate = #{finishRate},
-		demand_rate = #{demandRate},
-		design_rate = #{designRate},
-		dev_rate = #{devRate},
-		uat_rate = #{uatRate},
-		sit_rate = #{sitRate},
-		online_status = #{onlineStatus},
-		online_time = #{onlineTime},
-		plan_status = #{planStatus},
-		charge_userid = #{chargeUserid},
-		charge_username = #{chargeUsername},
 		menu_status = #{menuStatus},
 		ctime = #{ctime},
-		ltime = #{ltime},
-		cuserid = #{cuserid},
-		cusername = #{cusername},
 		calc_time = #{calcTime},
 		menu_name = #{menuName},
 		plan_workhours = #{planWorkhours},
@@ -329,43 +310,45 @@
 		confirmed_bugs = #{confirmedBugs},
 		resolved_bugs = #{resolvedBugs},
 		product_id = #{productId},
-		product_name = #{productName},
 		test_cases = #{testCases},
 		exec_cases = #{execCases},
 		design_cases = #{designCases},
 		finish_cases = #{finishCases},
-		project_cnt = #{projectCnt},
-		iteration_cnt = #{iterationCnt},
-		task_cnt = #{taskCnt},
-		finish_task_cnt = #{finishTaskCnt},
 		biz_date = #{bizDate},
-		bug_cnt = #{bugCnt}
+		bug_cnt = #{bugCnt},
+		task_cnt = #{taskCnt},
+		task_unstart_cnt = #{taskUnstartCnt},
+		task_exec_cnt = #{taskExecCnt},
+		task_finish_cnt = #{taskFinishCnt},
+		task_set_cnt = #{taskSetCnt},
+		task_out_cnt = #{taskOutCnt},
+		task_close_cnt = #{taskCloseCnt},
+		budget_nouser_at = #{budgetNouserAt},
+		budget_ouser_at = #{budgetOuserAt},
+		budget_iuser_at = #{budgetIuserAt},
+		act_user_at = #{actUserAt},
+		act_iuser_at = #{actIuserAt},
+		act_ouser_at = #{actOuserAt},
+		act_nouser_at = #{actNouserAt},
+		budget_workload = #{budgetWorkload},
+		budget_ouser_workload = #{budgetOuserWorkload},
+		budget_iuser_workload = #{budgetIuserWorkload},
+		act_workload = #{actWorkload},
+		act_ouser_workload = #{actOuserWorkload},
+		act_iuser_workload = #{actIuserWorkload},
+		estimate_workload = #{estimateWorkload},
+		budget_at = #{budgetAt},
+		act_at = #{actAt},
+		min_start_time = #{minStartTime},
+		max_end_time = #{maxEndTime},
+		product_cnt = #{productCnt},
+		iteration_cnt = #{iterationCnt},
+		project_cnt = #{projectCnt}
 	</sql>
 	<sql id="someFieldSet">
-		<if test="planStartTime != null"> plan_start_time = #{planStartTime},     </if>
-		<if test="planEndTime != null"> plan_end_time = #{planEndTime},     </if>
-		<if test="actStartTime != null"> act_start_time = #{actStartTime},     </if>
-		<if test="actEndTime != null"> act_end_time = #{actEndTime},     </if>
-		<if test="planWorkload != null and planWorkload != ''"> plan_workload = #{planWorkload},     </if>
-		<if test="actWorkload != null and actWorkload != ''"> act_workload = #{actWorkload},     </if>
-		<if test="planCostAmount != null and planCostAmount != ''"> plan_cost_amount = #{planCostAmount},     </if>
-		<if test="actCostAmount != null and actCostAmount != ''"> act_cost_amount = #{actCostAmount},     </if>
 		<if test="finishRate != null and finishRate != ''"> finish_rate = #{finishRate},     </if>
-		<if test="demandRate != null and demandRate != ''"> demand_rate = #{demandRate},     </if>
-		<if test="designRate != null and designRate != ''"> design_rate = #{designRate},     </if>
-		<if test="devRate != null and devRate != ''"> dev_rate = #{devRate},     </if>
-		<if test="uatRate != null and uatRate != ''"> uat_rate = #{uatRate},     </if>
-		<if test="sitRate != null and sitRate != ''"> sit_rate = #{sitRate},     </if>
-		<if test="onlineStatus != null and onlineStatus != ''"> online_status = #{onlineStatus},     </if>
-		<if test="onlineTime != null"> online_time = #{onlineTime},     </if>
-		<if test="planStatus != null and planStatus != ''"> plan_status = #{planStatus},     </if>
-		<if test="chargeUserid != null and chargeUserid != ''"> charge_userid = #{chargeUserid},     </if>
-		<if test="chargeUsername != null and chargeUsername != ''"> charge_username = #{chargeUsername},     </if>
 		<if test="menuStatus != null and menuStatus != ''"> menu_status = #{menuStatus},     </if>
 		<if test="ctime != null"> ctime = #{ctime},     </if>
-		<if test="ltime != null"> ltime = #{ltime},     </if>
-		<if test="cuserid != null and cuserid != ''"> cuserid = #{cuserid},     </if>
-		<if test="cusername != null and cusername != ''"> cusername = #{cusername},     </if>
 		<if test="calcTime != null"> calc_time = #{calcTime},     </if>
 		<if test="menuName != null and menuName != ''"> menu_name = #{menuName},     </if>
 		<if test="planWorkhours != null and planWorkhours != ''"> plan_workhours = #{planWorkhours},     </if>
@@ -375,44 +358,46 @@
 		<if test="confirmedBugs != null and confirmedBugs != ''"> confirmed_bugs = #{confirmedBugs},     </if>
 		<if test="resolvedBugs != null and resolvedBugs != ''"> resolved_bugs = #{resolvedBugs},     </if>
 		<if test="productId != null and productId != ''"> product_id = #{productId},     </if>
-		<if test="productName != null and productName != ''"> product_name = #{productName},     </if>
 		<if test="testCases != null and testCases != ''"> test_cases = #{testCases},     </if>
 		<if test="execCases != null and execCases != ''"> exec_cases = #{execCases},     </if>
 		<if test="designCases != null and designCases != ''"> design_cases = #{designCases},     </if>
 		<if test="finishCases != null and finishCases != ''"> finish_cases = #{finishCases},     </if>
-		<if test="projectCnt != null and projectCnt != ''"> project_cnt = #{projectCnt},     </if>
-		<if test="iterationCnt != null and iterationCnt != ''"> iteration_cnt = #{iterationCnt},     </if>
-		<if test="taskCnt != null and taskCnt != ''"> task_cnt = #{taskCnt},     </if>
-		<if test="finishTaskCnt != null and finishTaskCnt != ''"> finish_task_cnt = #{finishTaskCnt},     </if>
 		<if test="bizDate != null and bizDate != ''"> biz_date = #{bizDate},     </if>
 		<if test="bugCnt != null and bugCnt != ''"> bug_cnt = #{bugCnt},     </if>
+		<if test="taskCnt != null and taskCnt != ''"> task_cnt = #{taskCnt},     </if>
+		<if test="taskUnstartCnt != null and taskUnstartCnt != ''"> task_unstart_cnt = #{taskUnstartCnt},     </if>
+		<if test="taskExecCnt != null and taskExecCnt != ''"> task_exec_cnt = #{taskExecCnt},     </if>
+		<if test="taskFinishCnt != null and taskFinishCnt != ''"> task_finish_cnt = #{taskFinishCnt},     </if>
+		<if test="taskSetCnt != null and taskSetCnt != ''"> task_set_cnt = #{taskSetCnt},     </if>
+		<if test="taskOutCnt != null and taskOutCnt != ''"> task_out_cnt = #{taskOutCnt},     </if>
+		<if test="taskCloseCnt != null and taskCloseCnt != ''"> task_close_cnt = #{taskCloseCnt},     </if>
+		<if test="budgetNouserAt != null and budgetNouserAt != ''"> budget_nouser_at = #{budgetNouserAt},     </if>
+		<if test="budgetOuserAt != null and budgetOuserAt != ''"> budget_ouser_at = #{budgetOuserAt},     </if>
+		<if test="budgetIuserAt != null and budgetIuserAt != ''"> budget_iuser_at = #{budgetIuserAt},     </if>
+		<if test="actUserAt != null and actUserAt != ''"> act_user_at = #{actUserAt},     </if>
+		<if test="actIuserAt != null and actIuserAt != ''"> act_iuser_at = #{actIuserAt},     </if>
+		<if test="actOuserAt != null and actOuserAt != ''"> act_ouser_at = #{actOuserAt},     </if>
+		<if test="actNouserAt != null and actNouserAt != ''"> act_nouser_at = #{actNouserAt},     </if>
+		<if test="budgetWorkload != null and budgetWorkload != ''"> budget_workload = #{budgetWorkload},     </if>
+		<if test="budgetOuserWorkload != null and budgetOuserWorkload != ''"> budget_ouser_workload = #{budgetOuserWorkload},     </if>
+		<if test="budgetIuserWorkload != null and budgetIuserWorkload != ''"> budget_iuser_workload = #{budgetIuserWorkload},     </if>
+		<if test="actWorkload != null and actWorkload != ''"> act_workload = #{actWorkload},     </if>
+		<if test="actOuserWorkload != null and actOuserWorkload != ''"> act_ouser_workload = #{actOuserWorkload},     </if>
+		<if test="actIuserWorkload != null and actIuserWorkload != ''"> act_iuser_workload = #{actIuserWorkload},     </if>
+		<if test="estimateWorkload != null and estimateWorkload != ''"> estimate_workload = #{estimateWorkload},     </if>
+		<if test="budgetAt != null and budgetAt != ''"> budget_at = #{budgetAt},     </if>
+		<if test="actAt != null and actAt != ''"> act_at = #{actAt},     </if>
+		<if test="minStartTime != null"> min_start_time = #{minStartTime},     </if>
+		<if test="maxEndTime != null"> max_end_time = #{maxEndTime},     </if>
+		<if test="productCnt != null and productCnt != ''"> product_cnt = #{productCnt},     </if>
+		<if test="iterationCnt != null and iterationCnt != ''"> iteration_cnt = #{iterationCnt},     </if>
+		<if test="projectCnt != null and projectCnt != ''"> project_cnt = #{projectCnt},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
-			plan_start_time = #{item.planStartTime},
-			plan_end_time = #{item.planEndTime},
-			act_start_time = #{item.actStartTime},
-			act_end_time = #{item.actEndTime},
-			plan_workload = #{item.planWorkload},
-			act_workload = #{item.actWorkload},
-			plan_cost_amount = #{item.planCostAmount},
-			act_cost_amount = #{item.actCostAmount},
 			finish_rate = #{item.finishRate},
-			demand_rate = #{item.demandRate},
-			design_rate = #{item.designRate},
-			dev_rate = #{item.devRate},
-			uat_rate = #{item.uatRate},
-			sit_rate = #{item.sitRate},
-			online_status = #{item.onlineStatus},
-			online_time = #{item.onlineTime},
-			plan_status = #{item.planStatus},
-			charge_userid = #{item.chargeUserid},
-			charge_username = #{item.chargeUsername},
 			menu_status = #{item.menuStatus},
 			ctime = #{item.ctime},
-			ltime = #{item.ltime},
-			cuserid = #{item.cuserid},
-			cusername = #{item.cusername},
 			calc_time = #{item.calcTime},
 			menu_name = #{item.menuName},
 			plan_workhours = #{item.planWorkhours},
@@ -422,16 +407,39 @@
 			confirmed_bugs = #{item.confirmedBugs},
 			resolved_bugs = #{item.resolvedBugs},
 			product_id = #{item.productId},
-			product_name = #{item.productName},
 			test_cases = #{item.testCases},
 			exec_cases = #{item.execCases},
 			design_cases = #{item.designCases},
 			finish_cases = #{item.finishCases},
-			project_cnt = #{item.projectCnt},
-			iteration_cnt = #{item.iterationCnt},
-			task_cnt = #{item.taskCnt},
-			finish_task_cnt = #{item.finishTaskCnt},
 			biz_date = #{item.bizDate},
-			bug_cnt = #{item.bugCnt}
+			bug_cnt = #{item.bugCnt},
+			task_cnt = #{item.taskCnt},
+			task_unstart_cnt = #{item.taskUnstartCnt},
+			task_exec_cnt = #{item.taskExecCnt},
+			task_finish_cnt = #{item.taskFinishCnt},
+			task_set_cnt = #{item.taskSetCnt},
+			task_out_cnt = #{item.taskOutCnt},
+			task_close_cnt = #{item.taskCloseCnt},
+			budget_nouser_at = #{item.budgetNouserAt},
+			budget_ouser_at = #{item.budgetOuserAt},
+			budget_iuser_at = #{item.budgetIuserAt},
+			act_user_at = #{item.actUserAt},
+			act_iuser_at = #{item.actIuserAt},
+			act_ouser_at = #{item.actOuserAt},
+			act_nouser_at = #{item.actNouserAt},
+			budget_workload = #{item.budgetWorkload},
+			budget_ouser_workload = #{item.budgetOuserWorkload},
+			budget_iuser_workload = #{item.budgetIuserWorkload},
+			act_workload = #{item.actWorkload},
+			act_ouser_workload = #{item.actOuserWorkload},
+			act_iuser_workload = #{item.actIuserWorkload},
+			estimate_workload = #{item.estimateWorkload},
+			budget_at = #{item.budgetAt},
+			act_at = #{item.actAt},
+			min_start_time = #{item.minStartTime},
+			max_end_time = #{item.maxEndTime},
+			product_cnt = #{item.productCnt},
+			iteration_cnt = #{item.iterationCnt},
+			project_cnt = #{item.projectCnt}
 	</sql>
 </mapper>
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductStateMapper.xml
index 0721e010..03d296dc 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductStateMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductStateMapper.xml
@@ -70,7 +70,7 @@
 		insert into xm_product_state(
 			<include refid="columns"/>
 		) 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},#{menuFinishCnt},#{estimateWorkload}
+		#{productId},#{bizDate},#{fileCnt},#{productName},#{calcTime},#{calcStatus},#{phaseCnt},#{phaseFinishCnt},#{needPayAt},#{finishPayAt},#{needColAt},#{finishColAt},#{riskCnt},#{riskFinishCnt},#{branchId},#{branchName},#{budgetNouserAt},#{budgetOuserAt},#{budgetIuserAt},#{actUserAt},#{actIuserAt},#{actOuserAt},#{actNouserAt},#{finishRate},#{budgetWorkload},#{budgetOuserWorkload},#{budgetIuserWorkload},#{estimateWorkload},#{actWorkload},#{projectStatus},#{actOuserWorkload},#{actIuserWorkload},#{needPayCnt},#{finishPayCnt},#{finishPayUserCnt},#{needPayUserCnt},#{testCases},#{execCases},#{designCases},#{finishCases},#{iterationCnt},#{productCnt},#{minStartTime},#{maxEndTime},#{menuCnt},#{menuFinishCnt},#{menuExecCnt},#{menuUnstartCnt},#{menuCloseCnt},#{taskCnt},#{taskUnstartCnt},#{taskExecCnt},#{taskFinishCnt},#{taskSetCnt},#{taskOutCnt},#{taskCloseCnt},#{bugCnt},#{closedBugs},#{resolvedBugs},#{activeBugs},#{confirmedBugs},#{planWorkhours},#{planWorkerCnt},#{actWorkerCnt},#{projectCnt},#{budgetAt},#{actAt}
 		)
 	</insert>
 	
@@ -133,179 +133,283 @@
 	
 	<!--sql片段 列-->
 	<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,menu_finish_cnt,estimate_workload
+		product_id,biz_date,file_cnt,product_name,calc_time,calc_status,phase_cnt,phase_finish_cnt,need_pay_at,finish_pay_at,need_col_at,finish_col_at,risk_cnt,risk_finish_cnt,branch_id,branch_name,budget_nouser_at,budget_ouser_at,budget_iuser_at,act_user_at,act_iuser_at,act_ouser_at,act_nouser_at,finish_rate,budget_workload,budget_ouser_workload,budget_iuser_workload,estimate_workload,act_workload,project_status,act_ouser_workload,act_iuser_workload,need_pay_cnt,finish_pay_cnt,finish_pay_user_cnt,need_pay_user_cnt,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,min_start_time,max_end_time,menu_cnt,menu_finish_cnt,menu_exec_cnt,menu_unstart_cnt,menu_close_cnt,task_cnt,task_unstart_cnt,task_exec_cnt,task_finish_cnt,task_set_cnt,task_out_cnt,task_close_cnt,bug_cnt,closed_bugs,resolved_bugs,active_bugs,confirmed_bugs,plan_workhours,plan_worker_cnt,act_worker_cnt,project_cnt,budget_at,act_at
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
 	<sql id="where">
-		<if test="planStartTime != null">      and date_format(res.plan_start_time,'%Y-%m-%d') = date_format(#{planStartTime},'%Y-%m-%d')     </if>
-		<if test="planEndTime != null">      and date_format(res.plan_end_time,'%Y-%m-%d') = date_format(#{planEndTime},'%Y-%m-%d')     </if>
-		<if test="actStartTime != null">      and date_format(res.act_start_time,'%Y-%m-%d') = date_format(#{actStartTime},'%Y-%m-%d')     </if>
-		<if test="actEndTime != null">      and date_format(res.act_end_time,'%Y-%m-%d') = date_format(#{actEndTime},'%Y-%m-%d')     </if>
-		<if test="planWorkload != null and planWorkload != ''">      and res.plan_workload = #{planWorkload}     </if>
-		<if test="actWorkload != null and actWorkload != ''">      and res.act_workload = #{actWorkload}     </if>
-		<if test="planCostAmount != null and planCostAmount != ''">      and res.plan_cost_amount = #{planCostAmount}     </if>
-		<if test="actCostAmount != null and actCostAmount != ''">      and res.act_cost_amount = #{actCostAmount}     </if>
-		<if test="finishRate != null and finishRate != ''">      and res.finish_rate = #{finishRate}     </if>
-		<if test="demandRate != null and demandRate != ''">      and res.demand_rate = #{demandRate}     </if>
-		<if test="designRate != null and designRate != ''">      and res.design_rate = #{designRate}     </if>
-		<if test="devRate != null and devRate != ''">      and res.dev_rate = #{devRate}     </if>
-		<if test="uatRate != null and uatRate != ''">      and res.uat_rate = #{uatRate}     </if>
-		<if test="sitRate != null and sitRate != ''">      and res.sit_rate = #{sitRate}     </if>
-		<if test="ctime != null">      and date_format(res.ctime,'%Y-%m-%d') = date_format(#{ctime},'%Y-%m-%d')     </if>
-		<if test="ltime != null">      and date_format(res.ltime,'%Y-%m-%d') = date_format(#{ltime},'%Y-%m-%d')     </if>
-		<if test="cuserid != null and cuserid != ''">      and res.cuserid = #{cuserid}     </if>
-		<if test="cusername != null and cusername != ''">      and res.cusername = #{cusername}     </if>
-		<if test="calcTime != null">      and date_format(res.calc_time,'%Y-%m-%d') = date_format(#{calcTime},'%Y-%m-%d')     </if>
-		<if test="planWorkhours != null and planWorkhours != ''">      and res.plan_workhours = #{planWorkhours}     </if>
-		<if test="planWorkerCnt != null and planWorkerCnt != ''">      and res.plan_worker_cnt = #{planWorkerCnt}     </if>
-		<if test="closedBugs != null and closedBugs != ''">      and res.closed_bugs = #{closedBugs}     </if>
-		<if test="activeBugs != null and activeBugs != ''">      and res.active_bugs = #{activeBugs}     </if>
-		<if test="confirmedBugs != null and confirmedBugs != ''">      and res.confirmed_bugs = #{confirmedBugs}     </if>
-		<if test="resolvedBugs != null and resolvedBugs != ''">      and res.resolved_bugs = #{resolvedBugs}     </if>
 		<if test="productId != null and productId != ''">      and res.product_id = #{productId}     </if>
+		<if test="bizDate != null and bizDate != ''">      and res.biz_date = #{bizDate}     </if>
+		<if test="fileCnt != null and fileCnt != ''">      and res.file_cnt = #{fileCnt}     </if>
 		<if test="productName != null and productName != ''">      and res.product_name = #{productName}     </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="phaseCnt != null and phaseCnt != ''">      and res.phase_cnt = #{phaseCnt}     </if>
+		<if test="phaseFinishCnt != null and phaseFinishCnt != ''">      and res.phase_finish_cnt = #{phaseFinishCnt}     </if>
+		<if test="needPayAt != null and needPayAt != ''">      and res.need_pay_at = #{needPayAt}     </if>
+		<if test="finishPayAt != null and finishPayAt != ''">      and res.finish_pay_at = #{finishPayAt}     </if>
+		<if test="needColAt != null and needColAt != ''">      and res.need_col_at = #{needColAt}     </if>
+		<if test="finishColAt != null and finishColAt != ''">      and res.finish_col_at = #{finishColAt}     </if>
+		<if test="riskCnt != null and riskCnt != ''">      and res.risk_cnt = #{riskCnt}     </if>
+		<if test="riskFinishCnt != null and riskFinishCnt != ''">      and res.risk_finish_cnt = #{riskFinishCnt}     </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="budgetNouserAt != null and budgetNouserAt != ''">      and res.budget_nouser_at = #{budgetNouserAt}     </if>
+		<if test="budgetOuserAt != null and budgetOuserAt != ''">      and res.budget_ouser_at = #{budgetOuserAt}     </if>
+		<if test="budgetIuserAt != null and budgetIuserAt != ''">      and res.budget_iuser_at = #{budgetIuserAt}     </if>
+		<if test="actUserAt != null and actUserAt != ''">      and res.act_user_at = #{actUserAt}     </if>
+		<if test="actIuserAt != null and actIuserAt != ''">      and res.act_iuser_at = #{actIuserAt}     </if>
+		<if test="actOuserAt != null and actOuserAt != ''">      and res.act_ouser_at = #{actOuserAt}     </if>
+		<if test="actNouserAt != null and actNouserAt != ''">      and res.act_nouser_at = #{actNouserAt}     </if>
+		<if test="finishRate != null and finishRate != ''">      and res.finish_rate = #{finishRate}     </if>
+		<if test="budgetWorkload != null and budgetWorkload != ''">      and res.budget_workload = #{budgetWorkload}     </if>
+		<if test="budgetOuserWorkload != null and budgetOuserWorkload != ''">      and res.budget_ouser_workload = #{budgetOuserWorkload}     </if>
+		<if test="budgetIuserWorkload != null and budgetIuserWorkload != ''">      and res.budget_iuser_workload = #{budgetIuserWorkload}     </if>
+		<if test="estimateWorkload != null and estimateWorkload != ''">      and res.estimate_workload = #{estimateWorkload}     </if>
+		<if test="actWorkload != null and actWorkload != ''">      and res.act_workload = #{actWorkload}     </if>
+		<if test="projectStatus != null and projectStatus != ''">      and res.project_status = #{projectStatus}     </if>
+		<if test="actOuserWorkload != null and actOuserWorkload != ''">      and res.act_ouser_workload = #{actOuserWorkload}     </if>
+		<if test="actIuserWorkload != null and actIuserWorkload != ''">      and res.act_iuser_workload = #{actIuserWorkload}     </if>
+		<if test="needPayCnt != null and needPayCnt != ''">      and res.need_pay_cnt = #{needPayCnt}     </if>
+		<if test="finishPayCnt != null and finishPayCnt != ''">      and res.finish_pay_cnt = #{finishPayCnt}     </if>
+		<if test="finishPayUserCnt != null and finishPayUserCnt != ''">      and res.finish_pay_user_cnt = #{finishPayUserCnt}     </if>
+		<if test="needPayUserCnt != null and needPayUserCnt != ''">      and res.need_pay_user_cnt = #{needPayUserCnt}     </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="designCases != null and designCases != ''">      and res.design_cases = #{designCases}     </if>
 		<if test="finishCases != null and finishCases != ''">      and res.finish_cases = #{finishCases}     </if>
-		<if test="projectCnt != null and projectCnt != ''">      and res.project_cnt = #{projectCnt}     </if>
 		<if test="iterationCnt != null and iterationCnt != ''">      and res.iteration_cnt = #{iterationCnt}     </if>
-		<if test="taskCnt != null and taskCnt != ''">      and res.task_cnt = #{taskCnt}     </if>
-		<if test="finishTaskCnt != null and finishTaskCnt != ''">      and res.finish_task_cnt = #{finishTaskCnt}     </if>
-		<if test="bizDate != null and bizDate != ''">      and res.biz_date = #{bizDate}     </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="productCnt != null and productCnt != ''">      and res.product_cnt = #{productCnt}     </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>
 		<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>
+		<if test="menuExecCnt != null and menuExecCnt != ''">      and res.menu_exec_cnt = #{menuExecCnt}     </if>
+		<if test="menuUnstartCnt != null and menuUnstartCnt != ''">      and res.menu_unstart_cnt = #{menuUnstartCnt}     </if>
+		<if test="menuCloseCnt != null and menuCloseCnt != ''">      and res.menu_close_cnt = #{menuCloseCnt}     </if>
+		<if test="taskCnt != null and taskCnt != ''">      and res.task_cnt = #{taskCnt}     </if>
+		<if test="taskUnstartCnt != null and taskUnstartCnt != ''">      and res.task_unstart_cnt = #{taskUnstartCnt}     </if>
+		<if test="taskExecCnt != null and taskExecCnt != ''">      and res.task_exec_cnt = #{taskExecCnt}     </if>
+		<if test="taskFinishCnt != null and taskFinishCnt != ''">      and res.task_finish_cnt = #{taskFinishCnt}     </if>
+		<if test="taskSetCnt != null and taskSetCnt != ''">      and res.task_set_cnt = #{taskSetCnt}     </if>
+		<if test="taskOutCnt != null and taskOutCnt != ''">      and res.task_out_cnt = #{taskOutCnt}     </if>
+		<if test="taskCloseCnt != null and taskCloseCnt != ''">      and res.task_close_cnt = #{taskCloseCnt}     </if>
+		<if test="bugCnt != null and bugCnt != ''">      and res.bug_cnt = #{bugCnt}     </if>
+		<if test="closedBugs != null and closedBugs != ''">      and res.closed_bugs = #{closedBugs}     </if>
+		<if test="resolvedBugs != null and resolvedBugs != ''">      and res.resolved_bugs = #{resolvedBugs}     </if>
+		<if test="activeBugs != null and activeBugs != ''">      and res.active_bugs = #{activeBugs}     </if>
+		<if test="confirmedBugs != null and confirmedBugs != ''">      and res.confirmed_bugs = #{confirmedBugs}     </if>
+		<if test="planWorkhours != null and planWorkhours != ''">      and res.plan_workhours = #{planWorkhours}     </if>
+		<if test="planWorkerCnt != null and planWorkerCnt != ''">      and res.plan_worker_cnt = #{planWorkerCnt}     </if>
+		<if test="actWorkerCnt != null and actWorkerCnt != ''">      and res.act_worker_cnt = #{actWorkerCnt}     </if>
+		<if test="projectCnt != null and projectCnt != ''">      and res.project_cnt = #{projectCnt}     </if>
+		<if test="budgetAt != null and budgetAt != ''">      and res.budget_at = #{budgetAt}     </if>
+		<if test="actAt != null and actAt != ''">      and res.act_at = #{actAt}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
-		plan_start_time = #{planStartTime},
-		plan_end_time = #{planEndTime},
-		act_start_time = #{actStartTime},
-		act_end_time = #{actEndTime},
-		plan_workload = #{planWorkload},
-		act_workload = #{actWorkload},
-		plan_cost_amount = #{planCostAmount},
-		act_cost_amount = #{actCostAmount},
-		finish_rate = #{finishRate},
-		demand_rate = #{demandRate},
-		design_rate = #{designRate},
-		dev_rate = #{devRate},
-		uat_rate = #{uatRate},
-		sit_rate = #{sitRate},
-		ctime = #{ctime},
-		ltime = #{ltime},
-		cuserid = #{cuserid},
-		cusername = #{cusername},
-		calc_time = #{calcTime},
-		plan_workhours = #{planWorkhours},
-		plan_worker_cnt = #{planWorkerCnt},
-		closed_bugs = #{closedBugs},
-		active_bugs = #{activeBugs},
-		confirmed_bugs = #{confirmedBugs},
-		resolved_bugs = #{resolvedBugs},
+		biz_date = #{bizDate},
+		file_cnt = #{fileCnt},
 		product_name = #{productName},
+		calc_time = #{calcTime},
+		calc_status = #{calcStatus},
+		phase_cnt = #{phaseCnt},
+		phase_finish_cnt = #{phaseFinishCnt},
+		need_pay_at = #{needPayAt},
+		finish_pay_at = #{finishPayAt},
+		need_col_at = #{needColAt},
+		finish_col_at = #{finishColAt},
+		risk_cnt = #{riskCnt},
+		risk_finish_cnt = #{riskFinishCnt},
+		branch_id = #{branchId},
+		branch_name = #{branchName},
+		budget_nouser_at = #{budgetNouserAt},
+		budget_ouser_at = #{budgetOuserAt},
+		budget_iuser_at = #{budgetIuserAt},
+		act_user_at = #{actUserAt},
+		act_iuser_at = #{actIuserAt},
+		act_ouser_at = #{actOuserAt},
+		act_nouser_at = #{actNouserAt},
+		finish_rate = #{finishRate},
+		budget_workload = #{budgetWorkload},
+		budget_ouser_workload = #{budgetOuserWorkload},
+		budget_iuser_workload = #{budgetIuserWorkload},
+		estimate_workload = #{estimateWorkload},
+		act_workload = #{actWorkload},
+		project_status = #{projectStatus},
+		act_ouser_workload = #{actOuserWorkload},
+		act_iuser_workload = #{actIuserWorkload},
+		need_pay_cnt = #{needPayCnt},
+		finish_pay_cnt = #{finishPayCnt},
+		finish_pay_user_cnt = #{finishPayUserCnt},
+		need_pay_user_cnt = #{needPayUserCnt},
 		test_cases = #{testCases},
 		exec_cases = #{execCases},
 		design_cases = #{designCases},
 		finish_cases = #{finishCases},
-		project_cnt = #{projectCnt},
 		iteration_cnt = #{iterationCnt},
-		task_cnt = #{taskCnt},
-		finish_task_cnt = #{finishTaskCnt},
-		biz_date = #{bizDate},
-		branch_id = #{branchId},
-		bug_cnt = #{bugCnt},
+		product_cnt = #{productCnt},
+		min_start_time = #{minStartTime},
+		max_end_time = #{maxEndTime},
 		menu_cnt = #{menuCnt},
 		menu_finish_cnt = #{menuFinishCnt},
-		estimate_workload = #{estimateWorkload}
+		menu_exec_cnt = #{menuExecCnt},
+		menu_unstart_cnt = #{menuUnstartCnt},
+		menu_close_cnt = #{menuCloseCnt},
+		task_cnt = #{taskCnt},
+		task_unstart_cnt = #{taskUnstartCnt},
+		task_exec_cnt = #{taskExecCnt},
+		task_finish_cnt = #{taskFinishCnt},
+		task_set_cnt = #{taskSetCnt},
+		task_out_cnt = #{taskOutCnt},
+		task_close_cnt = #{taskCloseCnt},
+		bug_cnt = #{bugCnt},
+		closed_bugs = #{closedBugs},
+		resolved_bugs = #{resolvedBugs},
+		active_bugs = #{activeBugs},
+		confirmed_bugs = #{confirmedBugs},
+		plan_workhours = #{planWorkhours},
+		plan_worker_cnt = #{planWorkerCnt},
+		act_worker_cnt = #{actWorkerCnt},
+		project_cnt = #{projectCnt},
+		budget_at = #{budgetAt},
+		act_at = #{actAt}
 	</sql>
 	<sql id="someFieldSet">
-		<if test="planStartTime != null"> plan_start_time = #{planStartTime},     </if>
-		<if test="planEndTime != null"> plan_end_time = #{planEndTime},     </if>
-		<if test="actStartTime != null"> act_start_time = #{actStartTime},     </if>
-		<if test="actEndTime != null"> act_end_time = #{actEndTime},     </if>
-		<if test="planWorkload != null and planWorkload != ''"> plan_workload = #{planWorkload},     </if>
-		<if test="actWorkload != null and actWorkload != ''"> act_workload = #{actWorkload},     </if>
-		<if test="planCostAmount != null and planCostAmount != ''"> plan_cost_amount = #{planCostAmount},     </if>
-		<if test="actCostAmount != null and actCostAmount != ''"> act_cost_amount = #{actCostAmount},     </if>
-		<if test="finishRate != null and finishRate != ''"> finish_rate = #{finishRate},     </if>
-		<if test="demandRate != null and demandRate != ''"> demand_rate = #{demandRate},     </if>
-		<if test="designRate != null and designRate != ''"> design_rate = #{designRate},     </if>
-		<if test="devRate != null and devRate != ''"> dev_rate = #{devRate},     </if>
-		<if test="uatRate != null and uatRate != ''"> uat_rate = #{uatRate},     </if>
-		<if test="sitRate != null and sitRate != ''"> sit_rate = #{sitRate},     </if>
-		<if test="ctime != null"> ctime = #{ctime},     </if>
-		<if test="ltime != null"> ltime = #{ltime},     </if>
-		<if test="cuserid != null and cuserid != ''"> cuserid = #{cuserid},     </if>
-		<if test="cusername != null and cusername != ''"> cusername = #{cusername},     </if>
-		<if test="calcTime != null"> calc_time = #{calcTime},     </if>
-		<if test="planWorkhours != null and planWorkhours != ''"> plan_workhours = #{planWorkhours},     </if>
-		<if test="planWorkerCnt != null and planWorkerCnt != ''"> plan_worker_cnt = #{planWorkerCnt},     </if>
-		<if test="closedBugs != null and closedBugs != ''"> closed_bugs = #{closedBugs},     </if>
-		<if test="activeBugs != null and activeBugs != ''"> active_bugs = #{activeBugs},     </if>
-		<if test="confirmedBugs != null and confirmedBugs != ''"> confirmed_bugs = #{confirmedBugs},     </if>
-		<if test="resolvedBugs != null and resolvedBugs != ''"> resolved_bugs = #{resolvedBugs},     </if>
+		<if test="bizDate != null and bizDate != ''"> biz_date = #{bizDate},     </if>
+		<if test="fileCnt != null and fileCnt != ''"> file_cnt = #{fileCnt},     </if>
 		<if test="productName != null and productName != ''"> product_name = #{productName},     </if>
+		<if test="calcTime != null"> calc_time = #{calcTime},     </if>
+		<if test="calcStatus != null and calcStatus != ''"> calc_status = #{calcStatus},     </if>
+		<if test="phaseCnt != null and phaseCnt != ''"> phase_cnt = #{phaseCnt},     </if>
+		<if test="phaseFinishCnt != null and phaseFinishCnt != ''"> phase_finish_cnt = #{phaseFinishCnt},     </if>
+		<if test="needPayAt != null and needPayAt != ''"> need_pay_at = #{needPayAt},     </if>
+		<if test="finishPayAt != null and finishPayAt != ''"> finish_pay_at = #{finishPayAt},     </if>
+		<if test="needColAt != null and needColAt != ''"> need_col_at = #{needColAt},     </if>
+		<if test="finishColAt != null and finishColAt != ''"> finish_col_at = #{finishColAt},     </if>
+		<if test="riskCnt != null and riskCnt != ''"> risk_cnt = #{riskCnt},     </if>
+		<if test="riskFinishCnt != null and riskFinishCnt != ''"> risk_finish_cnt = #{riskFinishCnt},     </if>
+		<if test="branchId != null and branchId != ''"> branch_id = #{branchId},     </if>
+		<if test="branchName != null and branchName != ''"> branch_name = #{branchName},     </if>
+		<if test="budgetNouserAt != null and budgetNouserAt != ''"> budget_nouser_at = #{budgetNouserAt},     </if>
+		<if test="budgetOuserAt != null and budgetOuserAt != ''"> budget_ouser_at = #{budgetOuserAt},     </if>
+		<if test="budgetIuserAt != null and budgetIuserAt != ''"> budget_iuser_at = #{budgetIuserAt},     </if>
+		<if test="actUserAt != null and actUserAt != ''"> act_user_at = #{actUserAt},     </if>
+		<if test="actIuserAt != null and actIuserAt != ''"> act_iuser_at = #{actIuserAt},     </if>
+		<if test="actOuserAt != null and actOuserAt != ''"> act_ouser_at = #{actOuserAt},     </if>
+		<if test="actNouserAt != null and actNouserAt != ''"> act_nouser_at = #{actNouserAt},     </if>
+		<if test="finishRate != null and finishRate != ''"> finish_rate = #{finishRate},     </if>
+		<if test="budgetWorkload != null and budgetWorkload != ''"> budget_workload = #{budgetWorkload},     </if>
+		<if test="budgetOuserWorkload != null and budgetOuserWorkload != ''"> budget_ouser_workload = #{budgetOuserWorkload},     </if>
+		<if test="budgetIuserWorkload != null and budgetIuserWorkload != ''"> budget_iuser_workload = #{budgetIuserWorkload},     </if>
+		<if test="estimateWorkload != null and estimateWorkload != ''"> estimate_workload = #{estimateWorkload},     </if>
+		<if test="actWorkload != null and actWorkload != ''"> act_workload = #{actWorkload},     </if>
+		<if test="projectStatus != null and projectStatus != ''"> project_status = #{projectStatus},     </if>
+		<if test="actOuserWorkload != null and actOuserWorkload != ''"> act_ouser_workload = #{actOuserWorkload},     </if>
+		<if test="actIuserWorkload != null and actIuserWorkload != ''"> act_iuser_workload = #{actIuserWorkload},     </if>
+		<if test="needPayCnt != null and needPayCnt != ''"> need_pay_cnt = #{needPayCnt},     </if>
+		<if test="finishPayCnt != null and finishPayCnt != ''"> finish_pay_cnt = #{finishPayCnt},     </if>
+		<if test="finishPayUserCnt != null and finishPayUserCnt != ''"> finish_pay_user_cnt = #{finishPayUserCnt},     </if>
+		<if test="needPayUserCnt != null and needPayUserCnt != ''"> need_pay_user_cnt = #{needPayUserCnt},     </if>
 		<if test="testCases != null and testCases != ''"> test_cases = #{testCases},     </if>
 		<if test="execCases != null and execCases != ''"> exec_cases = #{execCases},     </if>
 		<if test="designCases != null and designCases != ''"> design_cases = #{designCases},     </if>
 		<if test="finishCases != null and finishCases != ''"> finish_cases = #{finishCases},     </if>
-		<if test="projectCnt != null and projectCnt != ''"> project_cnt = #{projectCnt},     </if>
 		<if test="iterationCnt != null and iterationCnt != ''"> iteration_cnt = #{iterationCnt},     </if>
-		<if test="taskCnt != null and taskCnt != ''"> task_cnt = #{taskCnt},     </if>
-		<if test="finishTaskCnt != null and finishTaskCnt != ''"> finish_task_cnt = #{finishTaskCnt},     </if>
-		<if test="bizDate != null and bizDate != ''"> biz_date = #{bizDate},     </if>
-		<if test="branchId != null and branchId != ''"> branch_id = #{branchId},     </if>
-		<if test="bugCnt != null and bugCnt != ''"> bug_cnt = #{bugCnt},     </if>
+		<if test="productCnt != null and productCnt != ''"> product_cnt = #{productCnt},     </if>
+		<if test="minStartTime != null"> min_start_time = #{minStartTime},     </if>
+		<if test="maxEndTime != null"> max_end_time = #{maxEndTime},     </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>
+		<if test="menuExecCnt != null and menuExecCnt != ''"> menu_exec_cnt = #{menuExecCnt},     </if>
+		<if test="menuUnstartCnt != null and menuUnstartCnt != ''"> menu_unstart_cnt = #{menuUnstartCnt},     </if>
+		<if test="menuCloseCnt != null and menuCloseCnt != ''"> menu_close_cnt = #{menuCloseCnt},     </if>
+		<if test="taskCnt != null and taskCnt != ''"> task_cnt = #{taskCnt},     </if>
+		<if test="taskUnstartCnt != null and taskUnstartCnt != ''"> task_unstart_cnt = #{taskUnstartCnt},     </if>
+		<if test="taskExecCnt != null and taskExecCnt != ''"> task_exec_cnt = #{taskExecCnt},     </if>
+		<if test="taskFinishCnt != null and taskFinishCnt != ''"> task_finish_cnt = #{taskFinishCnt},     </if>
+		<if test="taskSetCnt != null and taskSetCnt != ''"> task_set_cnt = #{taskSetCnt},     </if>
+		<if test="taskOutCnt != null and taskOutCnt != ''"> task_out_cnt = #{taskOutCnt},     </if>
+		<if test="taskCloseCnt != null and taskCloseCnt != ''"> task_close_cnt = #{taskCloseCnt},     </if>
+		<if test="bugCnt != null and bugCnt != ''"> bug_cnt = #{bugCnt},     </if>
+		<if test="closedBugs != null and closedBugs != ''"> closed_bugs = #{closedBugs},     </if>
+		<if test="resolvedBugs != null and resolvedBugs != ''"> resolved_bugs = #{resolvedBugs},     </if>
+		<if test="activeBugs != null and activeBugs != ''"> active_bugs = #{activeBugs},     </if>
+		<if test="confirmedBugs != null and confirmedBugs != ''"> confirmed_bugs = #{confirmedBugs},     </if>
+		<if test="planWorkhours != null and planWorkhours != ''"> plan_workhours = #{planWorkhours},     </if>
+		<if test="planWorkerCnt != null and planWorkerCnt != ''"> plan_worker_cnt = #{planWorkerCnt},     </if>
+		<if test="actWorkerCnt != null and actWorkerCnt != ''"> act_worker_cnt = #{actWorkerCnt},     </if>
+		<if test="projectCnt != null and projectCnt != ''"> project_cnt = #{projectCnt},     </if>
+		<if test="budgetAt != null and budgetAt != ''"> budget_at = #{budgetAt},     </if>
+		<if test="actAt != null and actAt != ''"> act_at = #{actAt},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
-			plan_start_time = #{item.planStartTime},
-			plan_end_time = #{item.planEndTime},
-			act_start_time = #{item.actStartTime},
-			act_end_time = #{item.actEndTime},
-			plan_workload = #{item.planWorkload},
-			act_workload = #{item.actWorkload},
-			plan_cost_amount = #{item.planCostAmount},
-			act_cost_amount = #{item.actCostAmount},
-			finish_rate = #{item.finishRate},
-			demand_rate = #{item.demandRate},
-			design_rate = #{item.designRate},
-			dev_rate = #{item.devRate},
-			uat_rate = #{item.uatRate},
-			sit_rate = #{item.sitRate},
-			ctime = #{item.ctime},
-			ltime = #{item.ltime},
-			cuserid = #{item.cuserid},
-			cusername = #{item.cusername},
-			calc_time = #{item.calcTime},
-			plan_workhours = #{item.planWorkhours},
-			plan_worker_cnt = #{item.planWorkerCnt},
-			closed_bugs = #{item.closedBugs},
-			active_bugs = #{item.activeBugs},
-			confirmed_bugs = #{item.confirmedBugs},
-			resolved_bugs = #{item.resolvedBugs},
+			biz_date = #{item.bizDate},
+			file_cnt = #{item.fileCnt},
 			product_name = #{item.productName},
+			calc_time = #{item.calcTime},
+			calc_status = #{item.calcStatus},
+			phase_cnt = #{item.phaseCnt},
+			phase_finish_cnt = #{item.phaseFinishCnt},
+			need_pay_at = #{item.needPayAt},
+			finish_pay_at = #{item.finishPayAt},
+			need_col_at = #{item.needColAt},
+			finish_col_at = #{item.finishColAt},
+			risk_cnt = #{item.riskCnt},
+			risk_finish_cnt = #{item.riskFinishCnt},
+			branch_id = #{item.branchId},
+			branch_name = #{item.branchName},
+			budget_nouser_at = #{item.budgetNouserAt},
+			budget_ouser_at = #{item.budgetOuserAt},
+			budget_iuser_at = #{item.budgetIuserAt},
+			act_user_at = #{item.actUserAt},
+			act_iuser_at = #{item.actIuserAt},
+			act_ouser_at = #{item.actOuserAt},
+			act_nouser_at = #{item.actNouserAt},
+			finish_rate = #{item.finishRate},
+			budget_workload = #{item.budgetWorkload},
+			budget_ouser_workload = #{item.budgetOuserWorkload},
+			budget_iuser_workload = #{item.budgetIuserWorkload},
+			estimate_workload = #{item.estimateWorkload},
+			act_workload = #{item.actWorkload},
+			project_status = #{item.projectStatus},
+			act_ouser_workload = #{item.actOuserWorkload},
+			act_iuser_workload = #{item.actIuserWorkload},
+			need_pay_cnt = #{item.needPayCnt},
+			finish_pay_cnt = #{item.finishPayCnt},
+			finish_pay_user_cnt = #{item.finishPayUserCnt},
+			need_pay_user_cnt = #{item.needPayUserCnt},
 			test_cases = #{item.testCases},
 			exec_cases = #{item.execCases},
 			design_cases = #{item.designCases},
 			finish_cases = #{item.finishCases},
-			project_cnt = #{item.projectCnt},
 			iteration_cnt = #{item.iterationCnt},
-			task_cnt = #{item.taskCnt},
-			finish_task_cnt = #{item.finishTaskCnt},
-			biz_date = #{item.bizDate},
-			branch_id = #{item.branchId},
-			bug_cnt = #{item.bugCnt},
+			product_cnt = #{item.productCnt},
+			min_start_time = #{item.minStartTime},
+			max_end_time = #{item.maxEndTime},
 			menu_cnt = #{item.menuCnt},
 			menu_finish_cnt = #{item.menuFinishCnt},
-			estimate_workload = #{item.estimateWorkload}
+			menu_exec_cnt = #{item.menuExecCnt},
+			menu_unstart_cnt = #{item.menuUnstartCnt},
+			menu_close_cnt = #{item.menuCloseCnt},
+			task_cnt = #{item.taskCnt},
+			task_unstart_cnt = #{item.taskUnstartCnt},
+			task_exec_cnt = #{item.taskExecCnt},
+			task_finish_cnt = #{item.taskFinishCnt},
+			task_set_cnt = #{item.taskSetCnt},
+			task_out_cnt = #{item.taskOutCnt},
+			task_close_cnt = #{item.taskCloseCnt},
+			bug_cnt = #{item.bugCnt},
+			closed_bugs = #{item.closedBugs},
+			resolved_bugs = #{item.resolvedBugs},
+			active_bugs = #{item.activeBugs},
+			confirmed_bugs = #{item.confirmedBugs},
+			plan_workhours = #{item.planWorkhours},
+			plan_worker_cnt = #{item.planWorkerCnt},
+			act_worker_cnt = #{item.actWorkerCnt},
+			project_cnt = #{item.projectCnt},
+			budget_at = #{item.budgetAt},
+			act_at = #{item.actAt}
 	</sql>
 </mapper>
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateHisMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateHisMapper.xml
index 7170faee..8c87480a 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateHisMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateHisMapper.xml
@@ -72,7 +72,7 @@
 		insert into xm_project_state_his(
 			<include refid="columns"/>
 		) 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},#{minStartTime},#{maxEndTime}
+		#{projectId},#{bizDate},#{fileCnt},#{projectName},#{calcTime},#{calcStatus},#{phaseCnt},#{phaseFinishCnt},#{needPayAt},#{finishPayAt},#{needColAt},#{finishColAt},#{riskCnt},#{riskFinishCnt},#{branchId},#{branchName},#{budgetNouserAt},#{budgetOuserAt},#{budgetIuserAt},#{actUserAt},#{actIuserAt},#{actOuserAt},#{actNouserAt},#{finishRate},#{budgetWorkload},#{budgetOuserWorkload},#{budgetIuserWorkload},#{estimateWorkload},#{actWorkload},#{projectStatus},#{actOuserWorkload},#{actIuserWorkload},#{needPayCnt},#{finishPayCnt},#{finishPayUserCnt},#{needPayUserCnt},#{testCases},#{execCases},#{designCases},#{finishCases},#{iterationCnt},#{productCnt},#{minStartTime},#{maxEndTime},#{menuCnt},#{menuFinishCnt},#{menuExecCnt},#{menuUnstartCnt},#{menuCloseCnt},#{taskCnt},#{taskUnstartCnt},#{taskExecCnt},#{taskFinishCnt},#{taskSetCnt},#{taskOutCnt},#{taskCloseCnt},#{bugCnt},#{closedBugs},#{resolvedBugs},#{activeBugs},#{confirmedBugs},#{planWorkhours},#{planWorkerCnt},#{actWorkerCnt},#{budgetAt},#{actAt}
 		)
 	</insert>
 	
@@ -135,256 +135,276 @@
 	
 	<!--sql片段 列-->
 	<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,min_start_time,max_end_time
+		project_id,biz_date,file_cnt,project_name,calc_time,calc_status,phase_cnt,phase_finish_cnt,need_pay_at,finish_pay_at,need_col_at,finish_col_at,risk_cnt,risk_finish_cnt,branch_id,branch_name,budget_nouser_at,budget_ouser_at,budget_iuser_at,act_user_at,act_iuser_at,act_ouser_at,act_nouser_at,finish_rate,budget_workload,budget_ouser_workload,budget_iuser_workload,estimate_workload,act_workload,project_status,act_ouser_workload,act_iuser_workload,need_pay_cnt,finish_pay_cnt,finish_pay_user_cnt,need_pay_user_cnt,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,min_start_time,max_end_time,menu_cnt,menu_finish_cnt,menu_exec_cnt,menu_unstart_cnt,menu_close_cnt,task_cnt,task_unstart_cnt,task_exec_cnt,task_finish_cnt,task_set_cnt,task_out_cnt,task_close_cnt,bug_cnt,closed_bugs,resolved_bugs,active_bugs,confirmed_bugs,plan_workhours,plan_worker_cnt,act_worker_cnt,budget_at,act_at
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
 	<sql id="where">
 		<if test="projectId != null and projectId != ''">      and res.project_id = #{projectId}     </if>
 		<if test="bizDate != null and bizDate != ''">      and res.biz_date = #{bizDate}     </if>
-		<if test="totalFileCnt != null and totalFileCnt != ''">      and res.total_file_cnt = #{totalFileCnt}     </if>
-		<if test="totalBugCnt != null and totalBugCnt != ''">      and res.total_bug_cnt = #{totalBugCnt}     </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="fileCnt != null and fileCnt != ''">      and res.file_cnt = #{fileCnt}     </if>
 		<if test="projectName != null and projectName != ''">      and res.project_name = #{projectName}     </if>
-		<if test="totalStaffCnt != null and totalStaffCnt != ''">      and res.total_staff_cnt = #{totalStaffCnt}     </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="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="totalResolvedBugCnt != null and totalResolvedBugCnt != ''">      and res.total_resolved_bug_cnt = #{totalResolvedBugCnt}     </if>
-		<if test="totalCompleteTaskCnt != null and totalCompleteTaskCnt != ''">      and res.total_complete_task_cnt = #{totalCompleteTaskCnt}     </if>
-		<if test="totalPhaseCnt != null and totalPhaseCnt != ''">      and res.total_phase_cnt = #{totalPhaseCnt}     </if>
-		<if test="totalCompletePhaseCnt != null and totalCompletePhaseCnt != ''">      and res.total_complete_phase_cnt = #{totalCompletePhaseCnt}     </if>
-		<if test="totalNeedPayAmount != null and totalNeedPayAmount != ''">      and res.total_need_pay_amount = #{totalNeedPayAmount}     </if>
-		<if test="totalFinishPayAmount != null and totalFinishPayAmount != ''">      and res.total_finish_pay_amount = #{totalFinishPayAmount}     </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="totalCostUserAmount != null and totalCostUserAmount != ''">      and res.total_cost_user_amount = #{totalCostUserAmount}     </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="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="phaseCnt != null and phaseCnt != ''">      and res.phase_cnt = #{phaseCnt}     </if>
+		<if test="phaseFinishCnt != null and phaseFinishCnt != ''">      and res.phase_finish_cnt = #{phaseFinishCnt}     </if>
+		<if test="needPayAt != null and needPayAt != ''">      and res.need_pay_at = #{needPayAt}     </if>
+		<if test="finishPayAt != null and finishPayAt != ''">      and res.finish_pay_at = #{finishPayAt}     </if>
+		<if test="needColAt != null and needColAt != ''">      and res.need_col_at = #{needColAt}     </if>
+		<if test="finishColAt != null and finishColAt != ''">      and res.finish_col_at = #{finishColAt}     </if>
+		<if test="riskCnt != null and riskCnt != ''">      and res.risk_cnt = #{riskCnt}     </if>
+		<if test="riskFinishCnt != null and riskFinishCnt != ''">      and res.risk_finish_cnt = #{riskFinishCnt}     </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="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="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="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="budgetNouserAt != null and budgetNouserAt != ''">      and res.budget_nouser_at = #{budgetNouserAt}     </if>
+		<if test="budgetOuserAt != null and budgetOuserAt != ''">      and res.budget_ouser_at = #{budgetOuserAt}     </if>
+		<if test="budgetIuserAt != null and budgetIuserAt != ''">      and res.budget_iuser_at = #{budgetIuserAt}     </if>
+		<if test="actUserAt != null and actUserAt != ''">      and res.act_user_at = #{actUserAt}     </if>
+		<if test="actIuserAt != null and actIuserAt != ''">      and res.act_iuser_at = #{actIuserAt}     </if>
+		<if test="actOuserAt != null and actOuserAt != ''">      and res.act_ouser_at = #{actOuserAt}     </if>
+		<if test="actNouserAt != null and actNouserAt != ''">      and res.act_nouser_at = #{actNouserAt}     </if>
+		<if test="finishRate != null and finishRate != ''">      and res.finish_rate = #{finishRate}     </if>
+		<if test="budgetWorkload != null and budgetWorkload != ''">      and res.budget_workload = #{budgetWorkload}     </if>
+		<if test="budgetOuserWorkload != null and budgetOuserWorkload != ''">      and res.budget_ouser_workload = #{budgetOuserWorkload}     </if>
+		<if test="budgetIuserWorkload != null and budgetIuserWorkload != ''">      and res.budget_iuser_workload = #{budgetIuserWorkload}     </if>
+		<if test="estimateWorkload != null and estimateWorkload != ''">      and res.estimate_workload = #{estimateWorkload}     </if>
+		<if test="actWorkload != null and actWorkload != ''">      and res.act_workload = #{actWorkload}     </if>
 		<if test="projectStatus != null and projectStatus != ''">      and res.project_status = #{projectStatus}     </if>
-		<if test="totalActWorkload != null and totalActWorkload != ''">      and res.total_act_workload = #{totalActWorkload}     </if>
-		<if test="totalActOutWorkload != null and totalActOutWorkload != ''">      and res.total_act_out_workload = #{totalActOutWorkload}     </if>
-		<if test="totalActInnerWorkload != null and totalActInnerWorkload != ''">      and res.total_act_inner_workload = #{totalActInnerWorkload}     </if>
-		<if test="totalTaskBudgetCostAt != null and totalTaskBudgetCostAt != ''">      and res.total_task_budget_cost_at = #{totalTaskBudgetCostAt}     </if>
-		<if test="totalTaskOutCnt != null and totalTaskOutCnt != ''">      and res.total_task_out_cnt = #{totalTaskOutCnt}     </if>
-		<if test="totalNeedPayCnt != null and totalNeedPayCnt != ''">      and res.total_need_pay_cnt = #{totalNeedPayCnt}     </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="totalNeedPayUserCnt != null and totalNeedPayUserCnt != ''">      and res.total_need_pay_user_cnt = #{totalNeedPayUserCnt}     </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="actOuserWorkload != null and actOuserWorkload != ''">      and res.act_ouser_workload = #{actOuserWorkload}     </if>
+		<if test="actIuserWorkload != null and actIuserWorkload != ''">      and res.act_iuser_workload = #{actIuserWorkload}     </if>
+		<if test="needPayCnt != null and needPayCnt != ''">      and res.need_pay_cnt = #{needPayCnt}     </if>
+		<if test="finishPayCnt != null and finishPayCnt != ''">      and res.finish_pay_cnt = #{finishPayCnt}     </if>
+		<if test="finishPayUserCnt != null and finishPayUserCnt != ''">      and res.finish_pay_user_cnt = #{finishPayUserCnt}     </if>
+		<if test="needPayUserCnt != null and needPayUserCnt != ''">      and res.need_pay_user_cnt = #{needPayUserCnt}     </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="designCases != null and designCases != ''">      and res.design_cases = #{designCases}     </if>
 		<if test="finishCases != null and finishCases != ''">      and res.finish_cases = #{finishCases}     </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="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>
+		<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="menuExecCnt != null and menuExecCnt != ''">      and res.menu_exec_cnt = #{menuExecCnt}     </if>
+		<if test="menuUnstartCnt != null and menuUnstartCnt != ''">      and res.menu_unstart_cnt = #{menuUnstartCnt}     </if>
+		<if test="menuCloseCnt != null and menuCloseCnt != ''">      and res.menu_close_cnt = #{menuCloseCnt}     </if>
+		<if test="taskCnt != null and taskCnt != ''">      and res.task_cnt = #{taskCnt}     </if>
+		<if test="taskUnstartCnt != null and taskUnstartCnt != ''">      and res.task_unstart_cnt = #{taskUnstartCnt}     </if>
+		<if test="taskExecCnt != null and taskExecCnt != ''">      and res.task_exec_cnt = #{taskExecCnt}     </if>
+		<if test="taskFinishCnt != null and taskFinishCnt != ''">      and res.task_finish_cnt = #{taskFinishCnt}     </if>
+		<if test="taskSetCnt != null and taskSetCnt != ''">      and res.task_set_cnt = #{taskSetCnt}     </if>
+		<if test="taskOutCnt != null and taskOutCnt != ''">      and res.task_out_cnt = #{taskOutCnt}     </if>
+		<if test="taskCloseCnt != null and taskCloseCnt != ''">      and res.task_close_cnt = #{taskCloseCnt}     </if>
+		<if test="bugCnt != null and bugCnt != ''">      and res.bug_cnt = #{bugCnt}     </if>
+		<if test="closedBugs != null and closedBugs != ''">      and res.closed_bugs = #{closedBugs}     </if>
+		<if test="resolvedBugs != null and resolvedBugs != ''">      and res.resolved_bugs = #{resolvedBugs}     </if>
+		<if test="activeBugs != null and activeBugs != ''">      and res.active_bugs = #{activeBugs}     </if>
+		<if test="confirmedBugs != null and confirmedBugs != ''">      and res.confirmed_bugs = #{confirmedBugs}     </if>
+		<if test="planWorkhours != null and planWorkhours != ''">      and res.plan_workhours = #{planWorkhours}     </if>
+		<if test="planWorkerCnt != null and planWorkerCnt != ''">      and res.plan_worker_cnt = #{planWorkerCnt}     </if>
+		<if test="actWorkerCnt != null and actWorkerCnt != ''">      and res.act_worker_cnt = #{actWorkerCnt}     </if>
+		<if test="budgetAt != null and budgetAt != ''">      and res.budget_at = #{budgetAt}     </if>
+		<if test="actAt != null and actAt != ''">      and res.act_at = #{actAt}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
-		total_file_cnt = #{totalFileCnt},
-		total_bug_cnt = #{totalBugCnt},
-		total_task_cnt = #{totalTaskCnt},
-		total_budget_nouser_amount = #{totalBudgetNouserAmount},
+		file_cnt = #{fileCnt},
 		project_name = #{projectName},
-		total_staff_cnt = #{totalStaffCnt},
 		calc_time = #{calcTime},
 		calc_status = #{calcStatus},
-		total_cost_nouser_amount = #{totalCostNouserAmount},
-		total_closed_bug_cnt = #{totalClosedBugCnt},
-		total_resolved_bug_cnt = #{totalResolvedBugCnt},
-		total_complete_task_cnt = #{totalCompleteTaskCnt},
-		total_phase_cnt = #{totalPhaseCnt},
-		total_complete_phase_cnt = #{totalCompletePhaseCnt},
-		total_need_pay_amount = #{totalNeedPayAmount},
-		total_finish_pay_amount = #{totalFinishPayAmount},
-		total_need_col_amount = #{totalNeedColAmount},
-		total_finish_col_amount = #{totalFinishColAmount},
-		total_cost_user_amount = #{totalCostUserAmount},
-		total_budget_iuser_amount = #{totalBudgetIuserAmount},
-		total_plan_workload = #{totalPlanWorkload},
-		total_risk_cnt = #{totalRiskCnt},
-		total_complete_risk_cnt = #{totalCompleteRiskCnt},
+		phase_cnt = #{phaseCnt},
+		phase_finish_cnt = #{phaseFinishCnt},
+		need_pay_at = #{needPayAt},
+		finish_pay_at = #{finishPayAt},
+		need_col_at = #{needColAt},
+		finish_col_at = #{finishColAt},
+		risk_cnt = #{riskCnt},
+		risk_finish_cnt = #{riskFinishCnt},
 		branch_id = #{branchId},
 		branch_name = #{branchName},
-		total_budget_ouser_amount = #{totalBudgetOuserAmount},
-		total_complete_workload = #{totalCompleteWorkload},
-		total_cost_iuser_amount = #{totalCostIuserAmount},
-		total_cost_ouser_amount = #{totalCostOuserAmount},
-		total_progress = #{totalProgress},
-		total_active_bug_cnt = #{totalActiveBugCnt},
-		total_confirmed_bug_cnt = #{totalConfirmedBugCnt},
+		budget_nouser_at = #{budgetNouserAt},
+		budget_ouser_at = #{budgetOuserAt},
+		budget_iuser_at = #{budgetIuserAt},
+		act_user_at = #{actUserAt},
+		act_iuser_at = #{actIuserAt},
+		act_ouser_at = #{actOuserAt},
+		act_nouser_at = #{actNouserAt},
+		finish_rate = #{finishRate},
+		budget_workload = #{budgetWorkload},
+		budget_ouser_workload = #{budgetOuserWorkload},
+		budget_iuser_workload = #{budgetIuserWorkload},
+		estimate_workload = #{estimateWorkload},
+		act_workload = #{actWorkload},
 		project_status = #{projectStatus},
-		total_act_workload = #{totalActWorkload},
-		total_act_out_workload = #{totalActOutWorkload},
-		total_act_inner_workload = #{totalActInnerWorkload},
-		total_task_budget_cost_at = #{totalTaskBudgetCostAt},
-		total_task_out_cnt = #{totalTaskOutCnt},
-		total_need_pay_cnt = #{totalNeedPayCnt},
-		total_finish_pay_cnt = #{totalFinishPayCnt},
-		total_finish_pay_user_cnt = #{totalFinishPayUserCnt},
-		total_need_pay_user_cnt = #{totalNeedPayUserCnt},
-		total_plan_iuser_workload = #{totalPlanIuserWorkload},
-		total_plan_ouser_workload = #{totalPlanOuserWorkload},
+		act_ouser_workload = #{actOuserWorkload},
+		act_iuser_workload = #{actIuserWorkload},
+		need_pay_cnt = #{needPayCnt},
+		finish_pay_cnt = #{finishPayCnt},
+		finish_pay_user_cnt = #{finishPayUserCnt},
+		need_pay_user_cnt = #{needPayUserCnt},
 		test_cases = #{testCases},
 		exec_cases = #{execCases},
 		design_cases = #{designCases},
 		finish_cases = #{finishCases},
 		iteration_cnt = #{iterationCnt},
 		product_cnt = #{productCnt},
-		menu_cnt = #{menuCnt},
-		finish_menu_cnt = #{finishMenuCnt},
-		estimate_workload = #{estimateWorkload},
-		exec_task_cnt = #{execTaskCnt},
-		to_start_task_cnt = #{toStartTaskCnt},
-		exec_menu_cnt = #{execMenuCnt},
-		to_start_menu_cnt = #{toStartMenuCnt},
 		min_start_time = #{minStartTime},
-		max_end_time = #{maxEndTime}
+		max_end_time = #{maxEndTime},
+		menu_cnt = #{menuCnt},
+		menu_finish_cnt = #{menuFinishCnt},
+		menu_exec_cnt = #{menuExecCnt},
+		menu_unstart_cnt = #{menuUnstartCnt},
+		menu_close_cnt = #{menuCloseCnt},
+		task_cnt = #{taskCnt},
+		task_unstart_cnt = #{taskUnstartCnt},
+		task_exec_cnt = #{taskExecCnt},
+		task_finish_cnt = #{taskFinishCnt},
+		task_set_cnt = #{taskSetCnt},
+		task_out_cnt = #{taskOutCnt},
+		task_close_cnt = #{taskCloseCnt},
+		bug_cnt = #{bugCnt},
+		closed_bugs = #{closedBugs},
+		resolved_bugs = #{resolvedBugs},
+		active_bugs = #{activeBugs},
+		confirmed_bugs = #{confirmedBugs},
+		plan_workhours = #{planWorkhours},
+		plan_worker_cnt = #{planWorkerCnt},
+		act_worker_cnt = #{actWorkerCnt},
+		budget_at = #{budgetAt},
+		act_at = #{actAt}
 	</sql>
 	<sql id="someFieldSet">
-		<if test="totalFileCnt != null and totalFileCnt != ''"> total_file_cnt = #{totalFileCnt},     </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="totalBudgetNouserAmount != null and totalBudgetNouserAmount != ''"> total_budget_nouser_amount = #{totalBudgetNouserAmount},     </if>
+		<if test="fileCnt != null and fileCnt != ''"> file_cnt = #{fileCnt},     </if>
 		<if test="projectName != null and projectName != ''"> project_name = #{projectName},     </if>
-		<if test="totalStaffCnt != null and totalStaffCnt != ''"> total_staff_cnt = #{totalStaffCnt},     </if>
 		<if test="calcTime != null"> calc_time = #{calcTime},     </if>
 		<if test="calcStatus != null and calcStatus != ''"> calc_status = #{calcStatus},     </if>
-		<if test="totalCostNouserAmount != null and totalCostNouserAmount != ''"> total_cost_nouser_amount = #{totalCostNouserAmount},     </if>
-		<if test="totalClosedBugCnt != null and totalClosedBugCnt != ''"> total_closed_bug_cnt = #{totalClosedBugCnt},     </if>
-		<if test="totalResolvedBugCnt != null and totalResolvedBugCnt != ''"> total_resolved_bug_cnt = #{totalResolvedBugCnt},     </if>
-		<if test="totalCompleteTaskCnt != null and totalCompleteTaskCnt != ''"> total_complete_task_cnt = #{totalCompleteTaskCnt},     </if>
-		<if test="totalPhaseCnt != null and totalPhaseCnt != ''"> total_phase_cnt = #{totalPhaseCnt},     </if>
-		<if test="totalCompletePhaseCnt != null and totalCompletePhaseCnt != ''"> total_complete_phase_cnt = #{totalCompletePhaseCnt},     </if>
-		<if test="totalNeedPayAmount != null and totalNeedPayAmount != ''"> total_need_pay_amount = #{totalNeedPayAmount},     </if>
-		<if test="totalFinishPayAmount != null and totalFinishPayAmount != ''"> total_finish_pay_amount = #{totalFinishPayAmount},     </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="totalCostUserAmount != null and totalCostUserAmount != ''"> total_cost_user_amount = #{totalCostUserAmount},     </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="totalRiskCnt != null and totalRiskCnt != ''"> total_risk_cnt = #{totalRiskCnt},     </if>
-		<if test="totalCompleteRiskCnt != null and totalCompleteRiskCnt != ''"> total_complete_risk_cnt = #{totalCompleteRiskCnt},     </if>
+		<if test="phaseCnt != null and phaseCnt != ''"> phase_cnt = #{phaseCnt},     </if>
+		<if test="phaseFinishCnt != null and phaseFinishCnt != ''"> phase_finish_cnt = #{phaseFinishCnt},     </if>
+		<if test="needPayAt != null and needPayAt != ''"> need_pay_at = #{needPayAt},     </if>
+		<if test="finishPayAt != null and finishPayAt != ''"> finish_pay_at = #{finishPayAt},     </if>
+		<if test="needColAt != null and needColAt != ''"> need_col_at = #{needColAt},     </if>
+		<if test="finishColAt != null and finishColAt != ''"> finish_col_at = #{finishColAt},     </if>
+		<if test="riskCnt != null and riskCnt != ''"> risk_cnt = #{riskCnt},     </if>
+		<if test="riskFinishCnt != null and riskFinishCnt != ''"> risk_finish_cnt = #{riskFinishCnt},     </if>
 		<if test="branchId != null and branchId != ''"> branch_id = #{branchId},     </if>
 		<if test="branchName != null and branchName != ''"> branch_name = #{branchName},     </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="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="totalActiveBugCnt != null and totalActiveBugCnt != ''"> total_active_bug_cnt = #{totalActiveBugCnt},     </if>
-		<if test="totalConfirmedBugCnt != null and totalConfirmedBugCnt != ''"> total_confirmed_bug_cnt = #{totalConfirmedBugCnt},     </if>
+		<if test="budgetNouserAt != null and budgetNouserAt != ''"> budget_nouser_at = #{budgetNouserAt},     </if>
+		<if test="budgetOuserAt != null and budgetOuserAt != ''"> budget_ouser_at = #{budgetOuserAt},     </if>
+		<if test="budgetIuserAt != null and budgetIuserAt != ''"> budget_iuser_at = #{budgetIuserAt},     </if>
+		<if test="actUserAt != null and actUserAt != ''"> act_user_at = #{actUserAt},     </if>
+		<if test="actIuserAt != null and actIuserAt != ''"> act_iuser_at = #{actIuserAt},     </if>
+		<if test="actOuserAt != null and actOuserAt != ''"> act_ouser_at = #{actOuserAt},     </if>
+		<if test="actNouserAt != null and actNouserAt != ''"> act_nouser_at = #{actNouserAt},     </if>
+		<if test="finishRate != null and finishRate != ''"> finish_rate = #{finishRate},     </if>
+		<if test="budgetWorkload != null and budgetWorkload != ''"> budget_workload = #{budgetWorkload},     </if>
+		<if test="budgetOuserWorkload != null and budgetOuserWorkload != ''"> budget_ouser_workload = #{budgetOuserWorkload},     </if>
+		<if test="budgetIuserWorkload != null and budgetIuserWorkload != ''"> budget_iuser_workload = #{budgetIuserWorkload},     </if>
+		<if test="estimateWorkload != null and estimateWorkload != ''"> estimate_workload = #{estimateWorkload},     </if>
+		<if test="actWorkload != null and actWorkload != ''"> act_workload = #{actWorkload},     </if>
 		<if test="projectStatus != null and projectStatus != ''"> project_status = #{projectStatus},     </if>
-		<if test="totalActWorkload != null and totalActWorkload != ''"> total_act_workload = #{totalActWorkload},     </if>
-		<if test="totalActOutWorkload != null and totalActOutWorkload != ''"> total_act_out_workload = #{totalActOutWorkload},     </if>
-		<if test="totalActInnerWorkload != null and totalActInnerWorkload != ''"> total_act_inner_workload = #{totalActInnerWorkload},     </if>
-		<if test="totalTaskBudgetCostAt != null and totalTaskBudgetCostAt != ''"> total_task_budget_cost_at = #{totalTaskBudgetCostAt},     </if>
-		<if test="totalTaskOutCnt != null and totalTaskOutCnt != ''"> total_task_out_cnt = #{totalTaskOutCnt},     </if>
-		<if test="totalNeedPayCnt != null and totalNeedPayCnt != ''"> total_need_pay_cnt = #{totalNeedPayCnt},     </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="totalNeedPayUserCnt != null and totalNeedPayUserCnt != ''"> total_need_pay_user_cnt = #{totalNeedPayUserCnt},     </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="actOuserWorkload != null and actOuserWorkload != ''"> act_ouser_workload = #{actOuserWorkload},     </if>
+		<if test="actIuserWorkload != null and actIuserWorkload != ''"> act_iuser_workload = #{actIuserWorkload},     </if>
+		<if test="needPayCnt != null and needPayCnt != ''"> need_pay_cnt = #{needPayCnt},     </if>
+		<if test="finishPayCnt != null and finishPayCnt != ''"> finish_pay_cnt = #{finishPayCnt},     </if>
+		<if test="finishPayUserCnt != null and finishPayUserCnt != ''"> finish_pay_user_cnt = #{finishPayUserCnt},     </if>
+		<if test="needPayUserCnt != null and needPayUserCnt != ''"> need_pay_user_cnt = #{needPayUserCnt},     </if>
 		<if test="testCases != null and testCases != ''"> test_cases = #{testCases},     </if>
 		<if test="execCases != null and execCases != ''"> exec_cases = #{execCases},     </if>
 		<if test="designCases != null and designCases != ''"> design_cases = #{designCases},     </if>
 		<if test="finishCases != null and finishCases != ''"> finish_cases = #{finishCases},     </if>
 		<if test="iterationCnt != null and iterationCnt != ''"> iteration_cnt = #{iterationCnt},     </if>
 		<if test="productCnt != null and productCnt != ''"> product_cnt = #{productCnt},     </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>
+		<if test="menuCnt != null and menuCnt != ''"> menu_cnt = #{menuCnt},     </if>
+		<if test="menuFinishCnt != null and menuFinishCnt != ''"> menu_finish_cnt = #{menuFinishCnt},     </if>
+		<if test="menuExecCnt != null and menuExecCnt != ''"> menu_exec_cnt = #{menuExecCnt},     </if>
+		<if test="menuUnstartCnt != null and menuUnstartCnt != ''"> menu_unstart_cnt = #{menuUnstartCnt},     </if>
+		<if test="menuCloseCnt != null and menuCloseCnt != ''"> menu_close_cnt = #{menuCloseCnt},     </if>
+		<if test="taskCnt != null and taskCnt != ''"> task_cnt = #{taskCnt},     </if>
+		<if test="taskUnstartCnt != null and taskUnstartCnt != ''"> task_unstart_cnt = #{taskUnstartCnt},     </if>
+		<if test="taskExecCnt != null and taskExecCnt != ''"> task_exec_cnt = #{taskExecCnt},     </if>
+		<if test="taskFinishCnt != null and taskFinishCnt != ''"> task_finish_cnt = #{taskFinishCnt},     </if>
+		<if test="taskSetCnt != null and taskSetCnt != ''"> task_set_cnt = #{taskSetCnt},     </if>
+		<if test="taskOutCnt != null and taskOutCnt != ''"> task_out_cnt = #{taskOutCnt},     </if>
+		<if test="taskCloseCnt != null and taskCloseCnt != ''"> task_close_cnt = #{taskCloseCnt},     </if>
+		<if test="bugCnt != null and bugCnt != ''"> bug_cnt = #{bugCnt},     </if>
+		<if test="closedBugs != null and closedBugs != ''"> closed_bugs = #{closedBugs},     </if>
+		<if test="resolvedBugs != null and resolvedBugs != ''"> resolved_bugs = #{resolvedBugs},     </if>
+		<if test="activeBugs != null and activeBugs != ''"> active_bugs = #{activeBugs},     </if>
+		<if test="confirmedBugs != null and confirmedBugs != ''"> confirmed_bugs = #{confirmedBugs},     </if>
+		<if test="planWorkhours != null and planWorkhours != ''"> plan_workhours = #{planWorkhours},     </if>
+		<if test="planWorkerCnt != null and planWorkerCnt != ''"> plan_worker_cnt = #{planWorkerCnt},     </if>
+		<if test="actWorkerCnt != null and actWorkerCnt != ''"> act_worker_cnt = #{actWorkerCnt},     </if>
+		<if test="budgetAt != null and budgetAt != ''"> budget_at = #{budgetAt},     </if>
+		<if test="actAt != null and actAt != ''"> act_at = #{actAt},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
-			total_file_cnt = #{item.totalFileCnt},
-			total_bug_cnt = #{item.totalBugCnt},
-			total_task_cnt = #{item.totalTaskCnt},
-			total_budget_nouser_amount = #{item.totalBudgetNouserAmount},
+			file_cnt = #{item.fileCnt},
 			project_name = #{item.projectName},
-			total_staff_cnt = #{item.totalStaffCnt},
 			calc_time = #{item.calcTime},
 			calc_status = #{item.calcStatus},
-			total_cost_nouser_amount = #{item.totalCostNouserAmount},
-			total_closed_bug_cnt = #{item.totalClosedBugCnt},
-			total_resolved_bug_cnt = #{item.totalResolvedBugCnt},
-			total_complete_task_cnt = #{item.totalCompleteTaskCnt},
-			total_phase_cnt = #{item.totalPhaseCnt},
-			total_complete_phase_cnt = #{item.totalCompletePhaseCnt},
-			total_need_pay_amount = #{item.totalNeedPayAmount},
-			total_finish_pay_amount = #{item.totalFinishPayAmount},
-			total_need_col_amount = #{item.totalNeedColAmount},
-			total_finish_col_amount = #{item.totalFinishColAmount},
-			total_cost_user_amount = #{item.totalCostUserAmount},
-			total_budget_iuser_amount = #{item.totalBudgetIuserAmount},
-			total_plan_workload = #{item.totalPlanWorkload},
-			total_risk_cnt = #{item.totalRiskCnt},
-			total_complete_risk_cnt = #{item.totalCompleteRiskCnt},
+			phase_cnt = #{item.phaseCnt},
+			phase_finish_cnt = #{item.phaseFinishCnt},
+			need_pay_at = #{item.needPayAt},
+			finish_pay_at = #{item.finishPayAt},
+			need_col_at = #{item.needColAt},
+			finish_col_at = #{item.finishColAt},
+			risk_cnt = #{item.riskCnt},
+			risk_finish_cnt = #{item.riskFinishCnt},
 			branch_id = #{item.branchId},
 			branch_name = #{item.branchName},
-			total_budget_ouser_amount = #{item.totalBudgetOuserAmount},
-			total_complete_workload = #{item.totalCompleteWorkload},
-			total_cost_iuser_amount = #{item.totalCostIuserAmount},
-			total_cost_ouser_amount = #{item.totalCostOuserAmount},
-			total_progress = #{item.totalProgress},
-			total_active_bug_cnt = #{item.totalActiveBugCnt},
-			total_confirmed_bug_cnt = #{item.totalConfirmedBugCnt},
+			budget_nouser_at = #{item.budgetNouserAt},
+			budget_ouser_at = #{item.budgetOuserAt},
+			budget_iuser_at = #{item.budgetIuserAt},
+			act_user_at = #{item.actUserAt},
+			act_iuser_at = #{item.actIuserAt},
+			act_ouser_at = #{item.actOuserAt},
+			act_nouser_at = #{item.actNouserAt},
+			finish_rate = #{item.finishRate},
+			budget_workload = #{item.budgetWorkload},
+			budget_ouser_workload = #{item.budgetOuserWorkload},
+			budget_iuser_workload = #{item.budgetIuserWorkload},
+			estimate_workload = #{item.estimateWorkload},
+			act_workload = #{item.actWorkload},
 			project_status = #{item.projectStatus},
-			total_act_workload = #{item.totalActWorkload},
-			total_act_out_workload = #{item.totalActOutWorkload},
-			total_act_inner_workload = #{item.totalActInnerWorkload},
-			total_task_budget_cost_at = #{item.totalTaskBudgetCostAt},
-			total_task_out_cnt = #{item.totalTaskOutCnt},
-			total_need_pay_cnt = #{item.totalNeedPayCnt},
-			total_finish_pay_cnt = #{item.totalFinishPayCnt},
-			total_finish_pay_user_cnt = #{item.totalFinishPayUserCnt},
-			total_need_pay_user_cnt = #{item.totalNeedPayUserCnt},
-			total_plan_iuser_workload = #{item.totalPlanIuserWorkload},
-			total_plan_ouser_workload = #{item.totalPlanOuserWorkload},
+			act_ouser_workload = #{item.actOuserWorkload},
+			act_iuser_workload = #{item.actIuserWorkload},
+			need_pay_cnt = #{item.needPayCnt},
+			finish_pay_cnt = #{item.finishPayCnt},
+			finish_pay_user_cnt = #{item.finishPayUserCnt},
+			need_pay_user_cnt = #{item.needPayUserCnt},
 			test_cases = #{item.testCases},
 			exec_cases = #{item.execCases},
 			design_cases = #{item.designCases},
 			finish_cases = #{item.finishCases},
 			iteration_cnt = #{item.iterationCnt},
 			product_cnt = #{item.productCnt},
-			menu_cnt = #{item.menuCnt},
-			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}
+			max_end_time = #{item.maxEndTime},
+			menu_cnt = #{item.menuCnt},
+			menu_finish_cnt = #{item.menuFinishCnt},
+			menu_exec_cnt = #{item.menuExecCnt},
+			menu_unstart_cnt = #{item.menuUnstartCnt},
+			menu_close_cnt = #{item.menuCloseCnt},
+			task_cnt = #{item.taskCnt},
+			task_unstart_cnt = #{item.taskUnstartCnt},
+			task_exec_cnt = #{item.taskExecCnt},
+			task_finish_cnt = #{item.taskFinishCnt},
+			task_set_cnt = #{item.taskSetCnt},
+			task_out_cnt = #{item.taskOutCnt},
+			task_close_cnt = #{item.taskCloseCnt},
+			bug_cnt = #{item.bugCnt},
+			closed_bugs = #{item.closedBugs},
+			resolved_bugs = #{item.resolvedBugs},
+			active_bugs = #{item.activeBugs},
+			confirmed_bugs = #{item.confirmedBugs},
+			plan_workhours = #{item.planWorkhours},
+			plan_worker_cnt = #{item.planWorkerCnt},
+			act_worker_cnt = #{item.actWorkerCnt},
+			budget_at = #{item.budgetAt},
+			act_at = #{item.actAt}
 	</sql>
 </mapper>
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateMapper.xml
index fec68937..37826e3a 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateMapper.xml
@@ -73,7 +73,7 @@
 		insert into xm_project_state(
 			<include refid="columns"/>
 		) 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},#{minStartTime},#{maxEndTime}
+		#{projectId},#{bizDate},#{fileCnt},#{projectName},#{calcTime},#{calcStatus},#{phaseCnt},#{phaseFinishCnt},#{needPayAt},#{finishPayAt},#{needColAt},#{finishColAt},#{riskCnt},#{riskFinishCnt},#{branchId},#{branchName},#{budgetNouserAt},#{budgetOuserAt},#{budgetIuserAt},#{actUserAt},#{actIuserAt},#{actOuserAt},#{actNouserAt},#{finishRate},#{budgetWorkload},#{budgetOuserWorkload},#{budgetIuserWorkload},#{estimateWorkload},#{actWorkload},#{projectStatus},#{actOuserWorkload},#{actIuserWorkload},#{needPayCnt},#{finishPayCnt},#{finishPayUserCnt},#{needPayUserCnt},#{testCases},#{execCases},#{designCases},#{finishCases},#{iterationCnt},#{productCnt},#{minStartTime},#{maxEndTime},#{menuCnt},#{menuFinishCnt},#{menuExecCnt},#{menuUnstartCnt},#{menuCloseCnt},#{taskCnt},#{taskUnstartCnt},#{taskExecCnt},#{taskFinishCnt},#{taskSetCnt},#{taskOutCnt},#{taskCloseCnt},#{bugCnt},#{closedBugs},#{resolvedBugs},#{activeBugs},#{confirmedBugs},#{planWorkhours},#{planWorkerCnt},#{actWorkerCnt},#{budgetAt},#{actAt}
 		)
 	</insert>
 	
@@ -136,259 +136,279 @@
 	
 	<!--sql片段 列-->
 	<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,min_start_time,max_end_time
+		project_id,biz_date,file_cnt,project_name,calc_time,calc_status,phase_cnt,phase_finish_cnt,need_pay_at,finish_pay_at,need_col_at,finish_col_at,risk_cnt,risk_finish_cnt,branch_id,branch_name,budget_nouser_at,budget_ouser_at,budget_iuser_at,act_user_at,act_iuser_at,act_ouser_at,act_nouser_at,finish_rate,budget_workload,budget_ouser_workload,budget_iuser_workload,estimate_workload,act_workload,project_status,act_ouser_workload,act_iuser_workload,need_pay_cnt,finish_pay_cnt,finish_pay_user_cnt,need_pay_user_cnt,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,min_start_time,max_end_time,menu_cnt,menu_finish_cnt,menu_exec_cnt,menu_unstart_cnt,menu_close_cnt,task_cnt,task_unstart_cnt,task_exec_cnt,task_finish_cnt,task_set_cnt,task_out_cnt,task_close_cnt,bug_cnt,closed_bugs,resolved_bugs,active_bugs,confirmed_bugs,plan_workhours,plan_worker_cnt,act_worker_cnt,budget_at,act_at
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
 	<sql id="where">
 		<if test="projectId != null and projectId != ''">      and res.project_id = #{projectId}     </if>
 		<if test="bizDate != null and bizDate != ''">      and res.biz_date = #{bizDate}     </if>
-		<if test="totalFileCnt != null and totalFileCnt != ''">      and res.total_file_cnt = #{totalFileCnt}     </if>
-		<if test="totalBugCnt != null and totalBugCnt != ''">      and res.total_bug_cnt = #{totalBugCnt}     </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="fileCnt != null and fileCnt != ''">      and res.file_cnt = #{fileCnt}     </if>
 		<if test="projectName != null and projectName != ''">      and res.project_name = #{projectName}     </if>
-		<if test="totalStaffCnt != null and totalStaffCnt != ''">      and res.total_staff_cnt = #{totalStaffCnt}     </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="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="totalResolvedBugCnt != null and totalResolvedBugCnt != ''">      and res.total_resolved_bug_cnt = #{totalResolvedBugCnt}     </if>
-		<if test="totalCompleteTaskCnt != null and totalCompleteTaskCnt != ''">      and res.total_complete_task_cnt = #{totalCompleteTaskCnt}     </if>
-		<if test="totalPhaseCnt != null and totalPhaseCnt != ''">      and res.total_phase_cnt = #{totalPhaseCnt}     </if>
-		<if test="totalCompletePhaseCnt != null and totalCompletePhaseCnt != ''">      and res.total_complete_phase_cnt = #{totalCompletePhaseCnt}     </if>
-		<if test="totalNeedPayAmount != null and totalNeedPayAmount != ''">      and res.total_need_pay_amount = #{totalNeedPayAmount}     </if>
-		<if test="totalFinishPayAmount != null and totalFinishPayAmount != ''">      and res.total_finish_pay_amount = #{totalFinishPayAmount}     </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="totalCostUserAmount != null and totalCostUserAmount != ''">      and res.total_cost_user_amount = #{totalCostUserAmount}     </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="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="phaseCnt != null and phaseCnt != ''">      and res.phase_cnt = #{phaseCnt}     </if>
+		<if test="phaseFinishCnt != null and phaseFinishCnt != ''">      and res.phase_finish_cnt = #{phaseFinishCnt}     </if>
+		<if test="needPayAt != null and needPayAt != ''">      and res.need_pay_at = #{needPayAt}     </if>
+		<if test="finishPayAt != null and finishPayAt != ''">      and res.finish_pay_at = #{finishPayAt}     </if>
+		<if test="needColAt != null and needColAt != ''">      and res.need_col_at = #{needColAt}     </if>
+		<if test="finishColAt != null and finishColAt != ''">      and res.finish_col_at = #{finishColAt}     </if>
+		<if test="riskCnt != null and riskCnt != ''">      and res.risk_cnt = #{riskCnt}     </if>
+		<if test="riskFinishCnt != null and riskFinishCnt != ''">      and res.risk_finish_cnt = #{riskFinishCnt}     </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="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="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="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="budgetNouserAt != null and budgetNouserAt != ''">      and res.budget_nouser_at = #{budgetNouserAt}     </if>
+		<if test="budgetOuserAt != null and budgetOuserAt != ''">      and res.budget_ouser_at = #{budgetOuserAt}     </if>
+		<if test="budgetIuserAt != null and budgetIuserAt != ''">      and res.budget_iuser_at = #{budgetIuserAt}     </if>
+		<if test="actUserAt != null and actUserAt != ''">      and res.act_user_at = #{actUserAt}     </if>
+		<if test="actIuserAt != null and actIuserAt != ''">      and res.act_iuser_at = #{actIuserAt}     </if>
+		<if test="actOuserAt != null and actOuserAt != ''">      and res.act_ouser_at = #{actOuserAt}     </if>
+		<if test="actNouserAt != null and actNouserAt != ''">      and res.act_nouser_at = #{actNouserAt}     </if>
+		<if test="finishRate != null and finishRate != ''">      and res.finish_rate = #{finishRate}     </if>
+		<if test="budgetWorkload != null and budgetWorkload != ''">      and res.budget_workload = #{budgetWorkload}     </if>
+		<if test="budgetOuserWorkload != null and budgetOuserWorkload != ''">      and res.budget_ouser_workload = #{budgetOuserWorkload}     </if>
+		<if test="budgetIuserWorkload != null and budgetIuserWorkload != ''">      and res.budget_iuser_workload = #{budgetIuserWorkload}     </if>
+		<if test="estimateWorkload != null and estimateWorkload != ''">      and res.estimate_workload = #{estimateWorkload}     </if>
+		<if test="actWorkload != null and actWorkload != ''">      and res.act_workload = #{actWorkload}     </if>
 		<if test="projectStatus != null and projectStatus != ''">      and res.project_status = #{projectStatus}     </if>
-		<if test="totalActWorkload != null and totalActWorkload != ''">      and res.total_act_workload = #{totalActWorkload}     </if>
-		<if test="totalActOutWorkload != null and totalActOutWorkload != ''">      and res.total_act_out_workload = #{totalActOutWorkload}     </if>
-		<if test="totalActInnerWorkload != null and totalActInnerWorkload != ''">      and res.total_act_inner_workload = #{totalActInnerWorkload}     </if>
-		<if test="totalTaskBudgetCostAt != null and totalTaskBudgetCostAt != ''">      and res.total_task_budget_cost_at = #{totalTaskBudgetCostAt}     </if>
-		<if test="totalTaskOutCnt != null and totalTaskOutCnt != ''">      and res.total_task_out_cnt = #{totalTaskOutCnt}     </if>
-		<if test="totalNeedPayCnt != null and totalNeedPayCnt != ''">      and res.total_need_pay_cnt = #{totalNeedPayCnt}     </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="totalNeedPayUserCnt != null and totalNeedPayUserCnt != ''">      and res.total_need_pay_user_cnt = #{totalNeedPayUserCnt}     </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="actOuserWorkload != null and actOuserWorkload != ''">      and res.act_ouser_workload = #{actOuserWorkload}     </if>
+		<if test="actIuserWorkload != null and actIuserWorkload != ''">      and res.act_iuser_workload = #{actIuserWorkload}     </if>
+		<if test="needPayCnt != null and needPayCnt != ''">      and res.need_pay_cnt = #{needPayCnt}     </if>
+		<if test="finishPayCnt != null and finishPayCnt != ''">      and res.finish_pay_cnt = #{finishPayCnt}     </if>
+		<if test="finishPayUserCnt != null and finishPayUserCnt != ''">      and res.finish_pay_user_cnt = #{finishPayUserCnt}     </if>
+		<if test="needPayUserCnt != null and needPayUserCnt != ''">      and res.need_pay_user_cnt = #{needPayUserCnt}     </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="designCases != null and designCases != ''">      and res.design_cases = #{designCases}     </if>
 		<if test="finishCases != null and finishCases != ''">      and res.finish_cases = #{finishCases}     </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="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>
+		<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="menuExecCnt != null and menuExecCnt != ''">      and res.menu_exec_cnt = #{menuExecCnt}     </if>
+		<if test="menuUnstartCnt != null and menuUnstartCnt != ''">      and res.menu_unstart_cnt = #{menuUnstartCnt}     </if>
+		<if test="menuCloseCnt != null and menuCloseCnt != ''">      and res.menu_close_cnt = #{menuCloseCnt}     </if>
+		<if test="taskCnt != null and taskCnt != ''">      and res.task_cnt = #{taskCnt}     </if>
+		<if test="taskUnstartCnt != null and taskUnstartCnt != ''">      and res.task_unstart_cnt = #{taskUnstartCnt}     </if>
+		<if test="taskExecCnt != null and taskExecCnt != ''">      and res.task_exec_cnt = #{taskExecCnt}     </if>
+		<if test="taskFinishCnt != null and taskFinishCnt != ''">      and res.task_finish_cnt = #{taskFinishCnt}     </if>
+		<if test="taskSetCnt != null and taskSetCnt != ''">      and res.task_set_cnt = #{taskSetCnt}     </if>
+		<if test="taskOutCnt != null and taskOutCnt != ''">      and res.task_out_cnt = #{taskOutCnt}     </if>
+		<if test="taskCloseCnt != null and taskCloseCnt != ''">      and res.task_close_cnt = #{taskCloseCnt}     </if>
+		<if test="bugCnt != null and bugCnt != ''">      and res.bug_cnt = #{bugCnt}     </if>
+		<if test="closedBugs != null and closedBugs != ''">      and res.closed_bugs = #{closedBugs}     </if>
+		<if test="resolvedBugs != null and resolvedBugs != ''">      and res.resolved_bugs = #{resolvedBugs}     </if>
+		<if test="activeBugs != null and activeBugs != ''">      and res.active_bugs = #{activeBugs}     </if>
+		<if test="confirmedBugs != null and confirmedBugs != ''">      and res.confirmed_bugs = #{confirmedBugs}     </if>
+		<if test="planWorkhours != null and planWorkhours != ''">      and res.plan_workhours = #{planWorkhours}     </if>
+		<if test="planWorkerCnt != null and planWorkerCnt != ''">      and res.plan_worker_cnt = #{planWorkerCnt}     </if>
+		<if test="actWorkerCnt != null and actWorkerCnt != ''">      and res.act_worker_cnt = #{actWorkerCnt}     </if>
+		<if test="budgetAt != null and budgetAt != ''">      and res.budget_at = #{budgetAt}     </if>
+		<if test="actAt != null and actAt != ''">      and res.act_at = #{actAt}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
 		biz_date = #{bizDate},
-		total_file_cnt = #{totalFileCnt},
-		total_bug_cnt = #{totalBugCnt},
-		total_task_cnt = #{totalTaskCnt},
-		total_budget_nouser_amount = #{totalBudgetNouserAmount},
+		file_cnt = #{fileCnt},
 		project_name = #{projectName},
-		total_staff_cnt = #{totalStaffCnt},
 		calc_time = #{calcTime},
 		calc_status = #{calcStatus},
-		total_cost_nouser_amount = #{totalCostNouserAmount},
-		total_closed_bug_cnt = #{totalClosedBugCnt},
-		total_resolved_bug_cnt = #{totalResolvedBugCnt},
-		total_complete_task_cnt = #{totalCompleteTaskCnt},
-		total_phase_cnt = #{totalPhaseCnt},
-		total_complete_phase_cnt = #{totalCompletePhaseCnt},
-		total_need_pay_amount = #{totalNeedPayAmount},
-		total_finish_pay_amount = #{totalFinishPayAmount},
-		total_need_col_amount = #{totalNeedColAmount},
-		total_finish_col_amount = #{totalFinishColAmount},
-		total_cost_user_amount = #{totalCostUserAmount},
-		total_budget_iuser_amount = #{totalBudgetIuserAmount},
-		total_plan_workload = #{totalPlanWorkload},
-		total_risk_cnt = #{totalRiskCnt},
-		total_complete_risk_cnt = #{totalCompleteRiskCnt},
+		phase_cnt = #{phaseCnt},
+		phase_finish_cnt = #{phaseFinishCnt},
+		need_pay_at = #{needPayAt},
+		finish_pay_at = #{finishPayAt},
+		need_col_at = #{needColAt},
+		finish_col_at = #{finishColAt},
+		risk_cnt = #{riskCnt},
+		risk_finish_cnt = #{riskFinishCnt},
 		branch_id = #{branchId},
 		branch_name = #{branchName},
-		total_budget_ouser_amount = #{totalBudgetOuserAmount},
-		total_complete_workload = #{totalCompleteWorkload},
-		total_cost_iuser_amount = #{totalCostIuserAmount},
-		total_cost_ouser_amount = #{totalCostOuserAmount},
-		total_progress = #{totalProgress},
-		total_active_bug_cnt = #{totalActiveBugCnt},
-		total_confirmed_bug_cnt = #{totalConfirmedBugCnt},
+		budget_nouser_at = #{budgetNouserAt},
+		budget_ouser_at = #{budgetOuserAt},
+		budget_iuser_at = #{budgetIuserAt},
+		act_user_at = #{actUserAt},
+		act_iuser_at = #{actIuserAt},
+		act_ouser_at = #{actOuserAt},
+		act_nouser_at = #{actNouserAt},
+		finish_rate = #{finishRate},
+		budget_workload = #{budgetWorkload},
+		budget_ouser_workload = #{budgetOuserWorkload},
+		budget_iuser_workload = #{budgetIuserWorkload},
+		estimate_workload = #{estimateWorkload},
+		act_workload = #{actWorkload},
 		project_status = #{projectStatus},
-		total_act_workload = #{totalActWorkload},
-		total_act_out_workload = #{totalActOutWorkload},
-		total_act_inner_workload = #{totalActInnerWorkload},
-		total_task_budget_cost_at = #{totalTaskBudgetCostAt},
-		total_task_out_cnt = #{totalTaskOutCnt},
-		total_need_pay_cnt = #{totalNeedPayCnt},
-		total_finish_pay_cnt = #{totalFinishPayCnt},
-		total_finish_pay_user_cnt = #{totalFinishPayUserCnt},
-		total_need_pay_user_cnt = #{totalNeedPayUserCnt},
-		total_plan_iuser_workload = #{totalPlanIuserWorkload},
-		total_plan_ouser_workload = #{totalPlanOuserWorkload},
+		act_ouser_workload = #{actOuserWorkload},
+		act_iuser_workload = #{actIuserWorkload},
+		need_pay_cnt = #{needPayCnt},
+		finish_pay_cnt = #{finishPayCnt},
+		finish_pay_user_cnt = #{finishPayUserCnt},
+		need_pay_user_cnt = #{needPayUserCnt},
 		test_cases = #{testCases},
 		exec_cases = #{execCases},
 		design_cases = #{designCases},
 		finish_cases = #{finishCases},
 		iteration_cnt = #{iterationCnt},
 		product_cnt = #{productCnt},
-		menu_cnt = #{menuCnt},
-		finish_menu_cnt = #{finishMenuCnt},
-		estimate_workload = #{estimateWorkload},
-		exec_task_cnt = #{execTaskCnt},
-		to_start_task_cnt = #{toStartTaskCnt},
-		exec_menu_cnt = #{execMenuCnt},
-		to_start_menu_cnt = #{toStartMenuCnt},
 		min_start_time = #{minStartTime},
-		max_end_time = #{maxEndTime}
+		max_end_time = #{maxEndTime},
+		menu_cnt = #{menuCnt},
+		menu_finish_cnt = #{menuFinishCnt},
+		menu_exec_cnt = #{menuExecCnt},
+		menu_unstart_cnt = #{menuUnstartCnt},
+		menu_close_cnt = #{menuCloseCnt},
+		task_cnt = #{taskCnt},
+		task_unstart_cnt = #{taskUnstartCnt},
+		task_exec_cnt = #{taskExecCnt},
+		task_finish_cnt = #{taskFinishCnt},
+		task_set_cnt = #{taskSetCnt},
+		task_out_cnt = #{taskOutCnt},
+		task_close_cnt = #{taskCloseCnt},
+		bug_cnt = #{bugCnt},
+		closed_bugs = #{closedBugs},
+		resolved_bugs = #{resolvedBugs},
+		active_bugs = #{activeBugs},
+		confirmed_bugs = #{confirmedBugs},
+		plan_workhours = #{planWorkhours},
+		plan_worker_cnt = #{planWorkerCnt},
+		act_worker_cnt = #{actWorkerCnt},
+		budget_at = #{budgetAt},
+		act_at = #{actAt}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="bizDate != null and bizDate != ''"> biz_date = #{bizDate},     </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="totalTaskCnt != null and totalTaskCnt != ''"> total_task_cnt = #{totalTaskCnt},     </if>
-		<if test="totalBudgetNouserAmount != null and totalBudgetNouserAmount != ''"> total_budget_nouser_amount = #{totalBudgetNouserAmount},     </if>
+		<if test="fileCnt != null and fileCnt != ''"> file_cnt = #{fileCnt},     </if>
 		<if test="projectName != null and projectName != ''"> project_name = #{projectName},     </if>
-		<if test="totalStaffCnt != null and totalStaffCnt != ''"> total_staff_cnt = #{totalStaffCnt},     </if>
 		<if test="calcTime != null"> calc_time = #{calcTime},     </if>
 		<if test="calcStatus != null and calcStatus != ''"> calc_status = #{calcStatus},     </if>
-		<if test="totalCostNouserAmount != null and totalCostNouserAmount != ''"> total_cost_nouser_amount = #{totalCostNouserAmount},     </if>
-		<if test="totalClosedBugCnt != null and totalClosedBugCnt != ''"> total_closed_bug_cnt = #{totalClosedBugCnt},     </if>
-		<if test="totalResolvedBugCnt != null and totalResolvedBugCnt != ''"> total_resolved_bug_cnt = #{totalResolvedBugCnt},     </if>
-		<if test="totalCompleteTaskCnt != null and totalCompleteTaskCnt != ''"> total_complete_task_cnt = #{totalCompleteTaskCnt},     </if>
-		<if test="totalPhaseCnt != null and totalPhaseCnt != ''"> total_phase_cnt = #{totalPhaseCnt},     </if>
-		<if test="totalCompletePhaseCnt != null and totalCompletePhaseCnt != ''"> total_complete_phase_cnt = #{totalCompletePhaseCnt},     </if>
-		<if test="totalNeedPayAmount != null and totalNeedPayAmount != ''"> total_need_pay_amount = #{totalNeedPayAmount},     </if>
-		<if test="totalFinishPayAmount != null and totalFinishPayAmount != ''"> total_finish_pay_amount = #{totalFinishPayAmount},     </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="totalCostUserAmount != null and totalCostUserAmount != ''"> total_cost_user_amount = #{totalCostUserAmount},     </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="totalRiskCnt != null and totalRiskCnt != ''"> total_risk_cnt = #{totalRiskCnt},     </if>
-		<if test="totalCompleteRiskCnt != null and totalCompleteRiskCnt != ''"> total_complete_risk_cnt = #{totalCompleteRiskCnt},     </if>
+		<if test="phaseCnt != null and phaseCnt != ''"> phase_cnt = #{phaseCnt},     </if>
+		<if test="phaseFinishCnt != null and phaseFinishCnt != ''"> phase_finish_cnt = #{phaseFinishCnt},     </if>
+		<if test="needPayAt != null and needPayAt != ''"> need_pay_at = #{needPayAt},     </if>
+		<if test="finishPayAt != null and finishPayAt != ''"> finish_pay_at = #{finishPayAt},     </if>
+		<if test="needColAt != null and needColAt != ''"> need_col_at = #{needColAt},     </if>
+		<if test="finishColAt != null and finishColAt != ''"> finish_col_at = #{finishColAt},     </if>
+		<if test="riskCnt != null and riskCnt != ''"> risk_cnt = #{riskCnt},     </if>
+		<if test="riskFinishCnt != null and riskFinishCnt != ''"> risk_finish_cnt = #{riskFinishCnt},     </if>
 		<if test="branchId != null and branchId != ''"> branch_id = #{branchId},     </if>
 		<if test="branchName != null and branchName != ''"> branch_name = #{branchName},     </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="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="totalActiveBugCnt != null and totalActiveBugCnt != ''"> total_active_bug_cnt = #{totalActiveBugCnt},     </if>
-		<if test="totalConfirmedBugCnt != null and totalConfirmedBugCnt != ''"> total_confirmed_bug_cnt = #{totalConfirmedBugCnt},     </if>
+		<if test="budgetNouserAt != null and budgetNouserAt != ''"> budget_nouser_at = #{budgetNouserAt},     </if>
+		<if test="budgetOuserAt != null and budgetOuserAt != ''"> budget_ouser_at = #{budgetOuserAt},     </if>
+		<if test="budgetIuserAt != null and budgetIuserAt != ''"> budget_iuser_at = #{budgetIuserAt},     </if>
+		<if test="actUserAt != null and actUserAt != ''"> act_user_at = #{actUserAt},     </if>
+		<if test="actIuserAt != null and actIuserAt != ''"> act_iuser_at = #{actIuserAt},     </if>
+		<if test="actOuserAt != null and actOuserAt != ''"> act_ouser_at = #{actOuserAt},     </if>
+		<if test="actNouserAt != null and actNouserAt != ''"> act_nouser_at = #{actNouserAt},     </if>
+		<if test="finishRate != null and finishRate != ''"> finish_rate = #{finishRate},     </if>
+		<if test="budgetWorkload != null and budgetWorkload != ''"> budget_workload = #{budgetWorkload},     </if>
+		<if test="budgetOuserWorkload != null and budgetOuserWorkload != ''"> budget_ouser_workload = #{budgetOuserWorkload},     </if>
+		<if test="budgetIuserWorkload != null and budgetIuserWorkload != ''"> budget_iuser_workload = #{budgetIuserWorkload},     </if>
+		<if test="estimateWorkload != null and estimateWorkload != ''"> estimate_workload = #{estimateWorkload},     </if>
+		<if test="actWorkload != null and actWorkload != ''"> act_workload = #{actWorkload},     </if>
 		<if test="projectStatus != null and projectStatus != ''"> project_status = #{projectStatus},     </if>
-		<if test="totalActWorkload != null and totalActWorkload != ''"> total_act_workload = #{totalActWorkload},     </if>
-		<if test="totalActOutWorkload != null and totalActOutWorkload != ''"> total_act_out_workload = #{totalActOutWorkload},     </if>
-		<if test="totalActInnerWorkload != null and totalActInnerWorkload != ''"> total_act_inner_workload = #{totalActInnerWorkload},     </if>
-		<if test="totalTaskBudgetCostAt != null and totalTaskBudgetCostAt != ''"> total_task_budget_cost_at = #{totalTaskBudgetCostAt},     </if>
-		<if test="totalTaskOutCnt != null and totalTaskOutCnt != ''"> total_task_out_cnt = #{totalTaskOutCnt},     </if>
-		<if test="totalNeedPayCnt != null and totalNeedPayCnt != ''"> total_need_pay_cnt = #{totalNeedPayCnt},     </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="totalNeedPayUserCnt != null and totalNeedPayUserCnt != ''"> total_need_pay_user_cnt = #{totalNeedPayUserCnt},     </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="actOuserWorkload != null and actOuserWorkload != ''"> act_ouser_workload = #{actOuserWorkload},     </if>
+		<if test="actIuserWorkload != null and actIuserWorkload != ''"> act_iuser_workload = #{actIuserWorkload},     </if>
+		<if test="needPayCnt != null and needPayCnt != ''"> need_pay_cnt = #{needPayCnt},     </if>
+		<if test="finishPayCnt != null and finishPayCnt != ''"> finish_pay_cnt = #{finishPayCnt},     </if>
+		<if test="finishPayUserCnt != null and finishPayUserCnt != ''"> finish_pay_user_cnt = #{finishPayUserCnt},     </if>
+		<if test="needPayUserCnt != null and needPayUserCnt != ''"> need_pay_user_cnt = #{needPayUserCnt},     </if>
 		<if test="testCases != null and testCases != ''"> test_cases = #{testCases},     </if>
 		<if test="execCases != null and execCases != ''"> exec_cases = #{execCases},     </if>
 		<if test="designCases != null and designCases != ''"> design_cases = #{designCases},     </if>
 		<if test="finishCases != null and finishCases != ''"> finish_cases = #{finishCases},     </if>
 		<if test="iterationCnt != null and iterationCnt != ''"> iteration_cnt = #{iterationCnt},     </if>
 		<if test="productCnt != null and productCnt != ''"> product_cnt = #{productCnt},     </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>
+		<if test="menuCnt != null and menuCnt != ''"> menu_cnt = #{menuCnt},     </if>
+		<if test="menuFinishCnt != null and menuFinishCnt != ''"> menu_finish_cnt = #{menuFinishCnt},     </if>
+		<if test="menuExecCnt != null and menuExecCnt != ''"> menu_exec_cnt = #{menuExecCnt},     </if>
+		<if test="menuUnstartCnt != null and menuUnstartCnt != ''"> menu_unstart_cnt = #{menuUnstartCnt},     </if>
+		<if test="menuCloseCnt != null and menuCloseCnt != ''"> menu_close_cnt = #{menuCloseCnt},     </if>
+		<if test="taskCnt != null and taskCnt != ''"> task_cnt = #{taskCnt},     </if>
+		<if test="taskUnstartCnt != null and taskUnstartCnt != ''"> task_unstart_cnt = #{taskUnstartCnt},     </if>
+		<if test="taskExecCnt != null and taskExecCnt != ''"> task_exec_cnt = #{taskExecCnt},     </if>
+		<if test="taskFinishCnt != null and taskFinishCnt != ''"> task_finish_cnt = #{taskFinishCnt},     </if>
+		<if test="taskSetCnt != null and taskSetCnt != ''"> task_set_cnt = #{taskSetCnt},     </if>
+		<if test="taskOutCnt != null and taskOutCnt != ''"> task_out_cnt = #{taskOutCnt},     </if>
+		<if test="taskCloseCnt != null and taskCloseCnt != ''"> task_close_cnt = #{taskCloseCnt},     </if>
+		<if test="bugCnt != null and bugCnt != ''"> bug_cnt = #{bugCnt},     </if>
+		<if test="closedBugs != null and closedBugs != ''"> closed_bugs = #{closedBugs},     </if>
+		<if test="resolvedBugs != null and resolvedBugs != ''"> resolved_bugs = #{resolvedBugs},     </if>
+		<if test="activeBugs != null and activeBugs != ''"> active_bugs = #{activeBugs},     </if>
+		<if test="confirmedBugs != null and confirmedBugs != ''"> confirmed_bugs = #{confirmedBugs},     </if>
+		<if test="planWorkhours != null and planWorkhours != ''"> plan_workhours = #{planWorkhours},     </if>
+		<if test="planWorkerCnt != null and planWorkerCnt != ''"> plan_worker_cnt = #{planWorkerCnt},     </if>
+		<if test="actWorkerCnt != null and actWorkerCnt != ''"> act_worker_cnt = #{actWorkerCnt},     </if>
+		<if test="budgetAt != null and budgetAt != ''"> budget_at = #{budgetAt},     </if>
+		<if test="actAt != null and actAt != ''"> act_at = #{actAt},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
 			biz_date = #{item.bizDate},
-			total_file_cnt = #{item.totalFileCnt},
-			total_bug_cnt = #{item.totalBugCnt},
-			total_task_cnt = #{item.totalTaskCnt},
-			total_budget_nouser_amount = #{item.totalBudgetNouserAmount},
+			file_cnt = #{item.fileCnt},
 			project_name = #{item.projectName},
-			total_staff_cnt = #{item.totalStaffCnt},
 			calc_time = #{item.calcTime},
 			calc_status = #{item.calcStatus},
-			total_cost_nouser_amount = #{item.totalCostNouserAmount},
-			total_closed_bug_cnt = #{item.totalClosedBugCnt},
-			total_resolved_bug_cnt = #{item.totalResolvedBugCnt},
-			total_complete_task_cnt = #{item.totalCompleteTaskCnt},
-			total_phase_cnt = #{item.totalPhaseCnt},
-			total_complete_phase_cnt = #{item.totalCompletePhaseCnt},
-			total_need_pay_amount = #{item.totalNeedPayAmount},
-			total_finish_pay_amount = #{item.totalFinishPayAmount},
-			total_need_col_amount = #{item.totalNeedColAmount},
-			total_finish_col_amount = #{item.totalFinishColAmount},
-			total_cost_user_amount = #{item.totalCostUserAmount},
-			total_budget_iuser_amount = #{item.totalBudgetIuserAmount},
-			total_plan_workload = #{item.totalPlanWorkload},
-			total_risk_cnt = #{item.totalRiskCnt},
-			total_complete_risk_cnt = #{item.totalCompleteRiskCnt},
+			phase_cnt = #{item.phaseCnt},
+			phase_finish_cnt = #{item.phaseFinishCnt},
+			need_pay_at = #{item.needPayAt},
+			finish_pay_at = #{item.finishPayAt},
+			need_col_at = #{item.needColAt},
+			finish_col_at = #{item.finishColAt},
+			risk_cnt = #{item.riskCnt},
+			risk_finish_cnt = #{item.riskFinishCnt},
 			branch_id = #{item.branchId},
 			branch_name = #{item.branchName},
-			total_budget_ouser_amount = #{item.totalBudgetOuserAmount},
-			total_complete_workload = #{item.totalCompleteWorkload},
-			total_cost_iuser_amount = #{item.totalCostIuserAmount},
-			total_cost_ouser_amount = #{item.totalCostOuserAmount},
-			total_progress = #{item.totalProgress},
-			total_active_bug_cnt = #{item.totalActiveBugCnt},
-			total_confirmed_bug_cnt = #{item.totalConfirmedBugCnt},
+			budget_nouser_at = #{item.budgetNouserAt},
+			budget_ouser_at = #{item.budgetOuserAt},
+			budget_iuser_at = #{item.budgetIuserAt},
+			act_user_at = #{item.actUserAt},
+			act_iuser_at = #{item.actIuserAt},
+			act_ouser_at = #{item.actOuserAt},
+			act_nouser_at = #{item.actNouserAt},
+			finish_rate = #{item.finishRate},
+			budget_workload = #{item.budgetWorkload},
+			budget_ouser_workload = #{item.budgetOuserWorkload},
+			budget_iuser_workload = #{item.budgetIuserWorkload},
+			estimate_workload = #{item.estimateWorkload},
+			act_workload = #{item.actWorkload},
 			project_status = #{item.projectStatus},
-			total_act_workload = #{item.totalActWorkload},
-			total_act_out_workload = #{item.totalActOutWorkload},
-			total_act_inner_workload = #{item.totalActInnerWorkload},
-			total_task_budget_cost_at = #{item.totalTaskBudgetCostAt},
-			total_task_out_cnt = #{item.totalTaskOutCnt},
-			total_need_pay_cnt = #{item.totalNeedPayCnt},
-			total_finish_pay_cnt = #{item.totalFinishPayCnt},
-			total_finish_pay_user_cnt = #{item.totalFinishPayUserCnt},
-			total_need_pay_user_cnt = #{item.totalNeedPayUserCnt},
-			total_plan_iuser_workload = #{item.totalPlanIuserWorkload},
-			total_plan_ouser_workload = #{item.totalPlanOuserWorkload},
+			act_ouser_workload = #{item.actOuserWorkload},
+			act_iuser_workload = #{item.actIuserWorkload},
+			need_pay_cnt = #{item.needPayCnt},
+			finish_pay_cnt = #{item.finishPayCnt},
+			finish_pay_user_cnt = #{item.finishPayUserCnt},
+			need_pay_user_cnt = #{item.needPayUserCnt},
 			test_cases = #{item.testCases},
 			exec_cases = #{item.execCases},
 			design_cases = #{item.designCases},
 			finish_cases = #{item.finishCases},
 			iteration_cnt = #{item.iterationCnt},
 			product_cnt = #{item.productCnt},
-			menu_cnt = #{item.menuCnt},
-			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}
+			max_end_time = #{item.maxEndTime},
+			menu_cnt = #{item.menuCnt},
+			menu_finish_cnt = #{item.menuFinishCnt},
+			menu_exec_cnt = #{item.menuExecCnt},
+			menu_unstart_cnt = #{item.menuUnstartCnt},
+			menu_close_cnt = #{item.menuCloseCnt},
+			task_cnt = #{item.taskCnt},
+			task_unstart_cnt = #{item.taskUnstartCnt},
+			task_exec_cnt = #{item.taskExecCnt},
+			task_finish_cnt = #{item.taskFinishCnt},
+			task_set_cnt = #{item.taskSetCnt},
+			task_out_cnt = #{item.taskOutCnt},
+			task_close_cnt = #{item.taskCloseCnt},
+			bug_cnt = #{item.bugCnt},
+			closed_bugs = #{item.closedBugs},
+			resolved_bugs = #{item.resolvedBugs},
+			active_bugs = #{item.activeBugs},
+			confirmed_bugs = #{item.confirmedBugs},
+			plan_workhours = #{item.planWorkhours},
+			plan_worker_cnt = #{item.planWorkerCnt},
+			act_worker_cnt = #{item.actWorkerCnt},
+			budget_at = #{item.budgetAt},
+			act_at = #{item.actAt}
 	</sql>
 </mapper>
\ No newline at end of file