From 30f6ade3a2190c5cdf2fa502abdc5e43ea26c743 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 23 Feb 2022 23:58:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xm/core/entity/XmBranchState.java     | 83 ++++++++--------
 .../com/xm/core/entity/XmIterationState.java  | 50 ++++------
 .../java/com/xm/core/entity/XmMenuPlan.java   | 38 +++----
 .../java/com/xm/core/entity/XmMenuState.java  | 31 ++----
 .../com/xm/core/entity/XmProductState.java    | 81 ++++++++-------
 .../xm/core/entity/XmProjectGroupState.java   | 40 +++-----
 .../com/xm/core/entity/XmProjectState.java    | 98 ++++++++-----------
 .../xm/core/dao/XmBranchStateMapper.xml       | 81 +++++++--------
 .../xm/core/dao/XmIterationStateMapper.xml    | 76 +++++++-------
 .../mapper/xm/core/dao/XmMenuPlanMapper.xml   | 39 ++++----
 .../mapper/xm/core/dao/XmMenuStateMapper.xml  | 32 +++---
 .../xm/core/dao/XmProductStateMapper.xml      | 96 +++++++++---------
 .../xm/core/dao/XmProjectGroupStateMapper.xml | 86 ++++++++--------
 .../xm/core/dao/XmProjectStateMapper.xml      | 82 +++++++---------
 14 files changed, 408 insertions(+), 505 deletions(-)

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 a5b4e208..11900461 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
@@ -1,27 +1,26 @@
-package com.xm.core.entity;
+package  com.xm.core.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * 组织 com.qqkj  顶级模块 xm 大模块 core  小模块 <br> 
+ * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmBranchState所有属性名: <br>
- *	bizDate,totalFileCnt,totalBugCnt,totalTaskCnt,totalBudgetNouserAmount,id,totalStaffCnt,calcTime,calcStatus,totalCostNouserAmount,totalClosedBugCnt,totalResolvedBugCnt,totalCompleteTaskCnt,totalPhaseCnt,totalCompletePhaseCnt,totalNeedPayAmount,totalFinishPayAmount,totalNeedColAmount,totalFinishColAmount,totalCostUserAmount,totalBudgetInnerUserAmount,totalPlanWorkload,totalRiskCnt,totalCompleteRiskCnt,branchId,branchName,totalBudgetOutUserAmount,totalCompleteWorkload,totalCostInnerUserAmount,totalCostOutUserAmount,totalProgress,totalActiveBugCnt,totalConfirmedBugCnt,projectStatus,totalActWorkload,totalActOutWorkload,totalActInnerWorkload,totalTaskBudgetCostAt,totalTaskOutCnt,totalNeedPayCnt,totalFinishPayCnt,totalFinishPayUserCnt,totalNeedPayUserCnt,totalPlanInnerUserWorkload,totalPlanOutUserWorkload,testCases,execCases,designCases,finishCases,iterationCnt,productCnt,menuCnt;<br>
- * 表 XM.xm_branch_state 机构内所有项目指标汇总的所有字段名: <br>
- *	biz_date,total_file_cnt,total_bug_cnt,total_task_cnt,total_budget_nouser_amount,id,total_staff_cnt,calc_time,calc_status,total_cost_nouser_amount,total_closed_bug_cnt,total_resolved_bug_cnt,total_complete_task_cnt,total_phase_cnt,total_complete_phase_cnt,total_need_pay_amount,total_finish_pay_amount,total_need_col_amount,total_finish_col_amount,total_cost_user_amount,total_budget_inner_user_amount,total_plan_workload,total_risk_cnt,total_complete_risk_cnt,branch_id,branch_name,total_budget_out_user_amount,total_complete_workload,total_cost_inner_user_amount,total_cost_out_user_amount,total_progress,total_active_bug_cnt,total_confirmed_bug_cnt,project_status,total_act_workload,total_act_out_workload,total_act_inner_workload,total_task_budget_cost_at,total_task_out_cnt,total_need_pay_cnt,total_finish_pay_cnt,total_finish_pay_user_cnt,total_need_pay_user_cnt,total_plan_inner_user_workload,total_plan_out_user_workload,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,menu_cnt;<br>
+ *	bizDate,totalFileCnt,totalBugCnt,totalTaskCnt,totalBudgetNouserAmount,totalStaffCnt,calcTime,calcStatus,totalCostNouserAmount,totalClosedBugCnt,totalResolvedBugCnt,totalCompleteTaskCnt,totalPhaseCnt,totalCompletePhaseCnt,totalNeedPayAmount,totalFinishPayAmount,totalNeedColAmount,totalFinishColAmount,totalCostUserAmount,totalBudgetInnerUserAmount,totalPlanWorkload,totalRiskCnt,totalCompleteRiskCnt,branchId,branchName,totalBudgetOutUserAmount,totalCompleteWorkload,totalCostInnerUserAmount,totalCostOutUserAmount,totalProgress,totalActiveBugCnt,totalConfirmedBugCnt,projectStatus,totalActWorkload,totalActOutWorkload,totalActInnerWorkload,totalTaskBudgetCostAt,totalTaskOutCnt,totalNeedPayCnt,totalFinishPayCnt,totalFinishPayUserCnt,totalNeedPayUserCnt,totalPlanInnerUserWorkload,totalPlanOutUserWorkload,testCases,execCases,designCases,finishCases,iterationCnt,productCnt,menuCnt,projectCnt;<br>
+ * 表 xm_branch_state 机构内所有项目指标汇总的所有字段名: <br>
+ *	biz_date,total_file_cnt,total_bug_cnt,total_task_cnt,total_budget_nouser_amount,total_staff_cnt,calc_time,calc_status,total_cost_nouser_amount,total_closed_bug_cnt,total_resolved_bug_cnt,total_complete_task_cnt,total_phase_cnt,total_complete_phase_cnt,total_need_pay_amount,total_finish_pay_amount,total_need_col_amount,total_finish_col_amount,total_cost_user_amount,total_budget_inner_user_amount,total_plan_workload,total_risk_cnt,total_complete_risk_cnt,branch_id,branch_name,total_budget_out_user_amount,total_complete_workload,total_cost_inner_user_amount,total_cost_out_user_amount,total_progress,total_active_bug_cnt,total_confirmed_bug_cnt,project_status,total_act_workload,total_act_out_workload,total_act_inner_workload,total_task_budget_cost_at,total_task_out_cnt,total_need_pay_cnt,total_finish_pay_cnt,total_finish_pay_user_cnt,total_need_pay_user_cnt,total_plan_inner_user_workload,total_plan_out_user_workload,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,menu_cnt,project_cnt;<br>
  * 当前主键(包括多主键):<br>
- *	id;<br>
+ *	branch_id;<br>
  */
 @ApiModel(description="机构内所有项目指标汇总")
 public class XmBranchState  implements java.io.Serializable {
 	
 	private static final long serialVersionUID = 1L;
 	
-	@ApiModelProperty(notes="主键,主键",allowEmptyValue=true,example="",allowableValues="")
-	String id;
+	@ApiModelProperty(notes="机构编号,主键",allowEmptyValue=true,example="",allowableValues="")
+	String branchId;
   	
 	
 	@ApiModelProperty(notes="统计日期yyyy-mm-dd类型",allowEmptyValue=true,example="",allowableValues="")
@@ -60,10 +59,10 @@ public class XmBranchState  implements java.io.Serializable {
 	@ApiModelProperty(notes="已完成任务总数-来自任务表",allowEmptyValue=true,example="",allowableValues="")
 	Integer totalCompleteTaskCnt;
 	
-	@ApiModelProperty(notes="项目计划数",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="项目阶段计划数",allowEmptyValue=true,example="",allowableValues="")
 	Integer totalPhaseCnt;
 	
-	@ApiModelProperty(notes="项目计划已完成数",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="项目阶段计划已完成数",allowEmptyValue=true,example="",allowableValues="")
 	Integer totalCompletePhaseCnt;
 	
 	@ApiModelProperty(notes="待付款总金额",allowEmptyValue=true,example="",allowableValues="")
@@ -93,9 +92,6 @@ public class XmBranchState  implements java.io.Serializable {
 	@ApiModelProperty(notes="已完成风险总数",allowEmptyValue=true,example="",allowableValues="")
 	Integer totalCompleteRiskCnt;
 	
-	@ApiModelProperty(notes="机构编号",allowEmptyValue=true,example="",allowableValues="")
-	String branchId;
-	
 	@ApiModelProperty(notes="机构名称",allowEmptyValue=true,example="",allowableValues="")
 	String branchName;
 	
@@ -150,10 +146,10 @@ public class XmBranchState  implements java.io.Serializable {
 	@ApiModelProperty(notes="待付款总人数",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal totalNeedPayUserCnt;
 	
-	@ApiModelProperty(notes="内部人力总工作量-应该大于或等于计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal totalPlanInnerUserWorkload;
 	
-	@ApiModelProperty(notes="外购人力总工作量-应该大于或等于计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal totalPlanOutUserWorkload;
 	
 	@ApiModelProperty(notes="测试案例总数",allowEmptyValue=true,example="",allowableValues="")
@@ -174,12 +170,15 @@ public class XmBranchState  implements java.io.Serializable {
 	@ApiModelProperty(notes="产品数",allowEmptyValue=true,example="",allowableValues="")
 	Integer productCnt;
 	
-	@ApiModelProperty(notes="需求数",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="故事数",allowEmptyValue=true,example="",allowableValues="")
 	Integer menuCnt;
+	
+	@ApiModelProperty(notes="项目数量",allowEmptyValue=true,example="",allowableValues="")
+	Integer projectCnt;
 
-	/**主键**/
-	public XmBranchState(String id) {
-		this.id = id;
+	/**机构编号**/
+	public XmBranchState(String branchId) {
+		this.branchId = branchId;
 	}
     
     /**机构内所有项目指标汇总**/
@@ -216,12 +215,6 @@ public class XmBranchState  implements java.io.Serializable {
 	public void setTotalBudgetNouserAmount(BigDecimal totalBudgetNouserAmount) {
 		this.totalBudgetNouserAmount = totalBudgetNouserAmount;
 	}
-	/**
-	 * 主键
-	 **/
-	public void setId(String id) {
-		this.id = id;
-	}
 	/**
 	 * 总参与人数
 	 **/
@@ -265,13 +258,13 @@ public class XmBranchState  implements java.io.Serializable {
 		this.totalCompleteTaskCnt = totalCompleteTaskCnt;
 	}
 	/**
-	 * 项目计划数
+	 * 项目阶段计划数
 	 **/
 	public void setTotalPhaseCnt(Integer totalPhaseCnt) {
 		this.totalPhaseCnt = totalPhaseCnt;
 	}
 	/**
-	 * 项目计划已完成数
+	 * 项目阶段计划已完成数
 	 **/
 	public void setTotalCompletePhaseCnt(Integer totalCompletePhaseCnt) {
 		this.totalCompletePhaseCnt = totalCompletePhaseCnt;
@@ -445,13 +438,13 @@ public class XmBranchState  implements java.io.Serializable {
 		this.totalNeedPayUserCnt = totalNeedPayUserCnt;
 	}
 	/**
-	 * 内部人力总工作量-应该大于或等于计划内部人力总成本
+	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
 	 **/
 	public void setTotalPlanInnerUserWorkload(BigDecimal totalPlanInnerUserWorkload) {
 		this.totalPlanInnerUserWorkload = totalPlanInnerUserWorkload;
 	}
 	/**
-	 * 外购人力总工作量-应该大于或等于计划外购人力总成本
+	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
 	 **/
 	public void setTotalPlanOutUserWorkload(BigDecimal totalPlanOutUserWorkload) {
 		this.totalPlanOutUserWorkload = totalPlanOutUserWorkload;
@@ -493,11 +486,17 @@ public class XmBranchState  implements java.io.Serializable {
 		this.productCnt = productCnt;
 	}
 	/**
-	 * 需求数
+	 * 故事数
 	 **/
 	public void setMenuCnt(Integer menuCnt) {
 		this.menuCnt = menuCnt;
 	}
+	/**
+	 * 项目数量
+	 **/
+	public void setProjectCnt(Integer projectCnt) {
+		this.projectCnt = projectCnt;
+	}
 	
 	/**
 	 * 统计日期yyyy-mm-dd类型
@@ -529,12 +528,6 @@ public class XmBranchState  implements java.io.Serializable {
 	public BigDecimal getTotalBudgetNouserAmount() {
 		return this.totalBudgetNouserAmount;
 	}
-	/**
-	 * 主键
-	 **/
-	public String getId() {
-		return this.id;
-	}
 	/**
 	 * 总参与人数
 	 **/
@@ -578,13 +571,13 @@ public class XmBranchState  implements java.io.Serializable {
 		return this.totalCompleteTaskCnt;
 	}
 	/**
-	 * 项目计划数
+	 * 项目阶段计划数
 	 **/
 	public Integer getTotalPhaseCnt() {
 		return this.totalPhaseCnt;
 	}
 	/**
-	 * 项目计划已完成数
+	 * 项目阶段计划已完成数
 	 **/
 	public Integer getTotalCompletePhaseCnt() {
 		return this.totalCompletePhaseCnt;
@@ -758,13 +751,13 @@ public class XmBranchState  implements java.io.Serializable {
 		return this.totalNeedPayUserCnt;
 	}
 	/**
-	 * 内部人力总工作量-应该大于或等于计划内部人力总成本
+	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
 	 **/
 	public BigDecimal getTotalPlanInnerUserWorkload() {
 		return this.totalPlanInnerUserWorkload;
 	}
 	/**
-	 * 外购人力总工作量-应该大于或等于计划外购人力总成本
+	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
 	 **/
 	public BigDecimal getTotalPlanOutUserWorkload() {
 		return this.totalPlanOutUserWorkload;
@@ -806,10 +799,16 @@ public class XmBranchState  implements java.io.Serializable {
 		return this.productCnt;
 	}
 	/**
-	 * 需求数
+	 * 故事数
 	 **/
 	public Integer getMenuCnt() {
 		return this.menuCnt;
 	}
+	/**
+	 * 项目数量
+	 **/
+	public Integer getProjectCnt() {
+		return this.projectCnt;
+	}
 
 }
\ 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 88563ed4..84f006f4 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
@@ -1,27 +1,26 @@
-package com.xm.core.entity;
+package  com.xm.core.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * 组织 com.qqkj  顶级模块 xm 大模块 core  小模块 <br> 
+ * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmIterationState所有属性名: <br>
- *	id,distBudgetCost,distBudgetWorkload,actCost,actWorkload,actStaffNum,finishRate,testCases,execCases,designCases,finishCases,projectCnt,productCnt,menuCnt,taskCnt,finishTaskCnt,calcTime,iterationName,budgetCost,budgetWorkload,iterationId,bizDate,closedBugCnt,resolvedBugCnt,activeBugCnt,confirmedBugCnt,bugCnt;<br>
- * 表 XM.xm_iteration_state 迭代定义的所有字段名: <br>
- *	id,dist_budget_cost,dist_budget_workload,act_cost,act_workload,act_staff_num,finish_rate,test_cases,exec_cases,design_cases,finish_cases,project_cnt,product_cnt,menu_cnt,task_cnt,finish_task_cnt,calc_time,iteration_name,budget_cost,budget_workload,iteration_id,biz_date,closed_bug_cnt,resolved_bug_cnt,active_bug_cnt,confirmed_bug_cnt,bug_cnt;<br>
+ *	distBudgetCost,distBudgetWorkload,actCost,actWorkload,actStaffNum,finishRate,testCases,execCases,designCases,finishCases,projectCnt,productCnt,menuCnt,taskCnt,finishTaskCnt,calcTime,iterationName,budgetCost,budgetWorkload,iterationId,bizDate,closedBugCnt,resolvedBugCnt,activeBugCnt,confirmedBugCnt,bugCnt;<br>
+ * 表 xm_iteration_state 迭代定义的所有字段名: <br>
+ *	dist_budget_cost,dist_budget_workload,act_cost,act_workload,act_staff_num,finish_rate,test_cases,exec_cases,design_cases,finish_cases,project_cnt,product_cnt,menu_cnt,task_cnt,finish_task_cnt,calc_time,iteration_name,budget_cost,budget_workload,iteration_id,biz_date,closed_bug_cnt,resolved_bug_cnt,active_bug_cnt,confirmed_bug_cnt,bug_cnt;<br>
  * 当前主键(包括多主键):<br>
- *	id;<br>
+ *	iteration_id;<br>
  */
 @ApiModel(description="迭代定义")
 public class XmIterationState  implements java.io.Serializable {
 	
 	private static final long serialVersionUID = 1L;
 	
-	@ApiModelProperty(notes="迭代编码,主键",allowEmptyValue=true,example="",allowableValues="")
-	String id;
+	@ApiModelProperty(notes="迭代编号,主键",allowEmptyValue=true,example="",allowableValues="")
+	String iterationId;
   	
 	
 	@ApiModelProperty(notes="已分配到任务的预算从任务表汇总而来",allowEmptyValue=true,example="",allowableValues="")
@@ -37,7 +36,7 @@ public class XmIterationState  implements java.io.Serializable {
 	BigDecimal actWorkload;
 	
 	@ApiModelProperty(notes="实际投入人员数",allowEmptyValue=true,example="",allowableValues="")
-	Integer actStaffNum;
+	BigDecimal actStaffNum;
 	
 	@ApiModelProperty(notes="进度",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal finishRate;
@@ -60,7 +59,7 @@ public class XmIterationState  implements java.io.Serializable {
 	@ApiModelProperty(notes="关联产品数",allowEmptyValue=true,example="",allowableValues="")
 	Integer productCnt;
 	
-	@ApiModelProperty(notes="关联需求数",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="关联故事数",allowEmptyValue=true,example="",allowableValues="")
 	Integer menuCnt;
 	
 	@ApiModelProperty(notes="关联任务数",allowEmptyValue=true,example="",allowableValues="")
@@ -81,9 +80,6 @@ public class XmIterationState  implements java.io.Serializable {
 	@ApiModelProperty(notes="预算工作量",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal budgetWorkload;
 	
-	@ApiModelProperty(notes="迭代编号",allowEmptyValue=true,example="",allowableValues="")
-	String iterationId;
-	
 	@ApiModelProperty(notes="业务日期yyyy-MM-dd字符串",allowEmptyValue=true,example="",allowableValues="")
 	String bizDate;
 	
@@ -102,21 +98,15 @@ public class XmIterationState  implements java.io.Serializable {
 	@ApiModelProperty(notes="bug总数",allowEmptyValue=true,example="",allowableValues="")
 	Integer bugCnt;
 
-	/**迭代编码**/
-	public XmIterationState(String id) {
-		this.id = id;
+	/**迭代编号**/
+	public XmIterationState(String iterationId) {
+		this.iterationId = iterationId;
 	}
     
     /**迭代定义**/
 	public XmIterationState() {
 	}
 	
-	/**
-	 * 迭代编码
-	 **/
-	public void setId(String id) {
-		this.id = id;
-	}
 	/**
 	 * 已分配到任务的预算从任务表汇总而来
 	 **/
@@ -144,7 +134,7 @@ public class XmIterationState  implements java.io.Serializable {
 	/**
 	 * 实际投入人员数
 	 **/
-	public void setActStaffNum(Integer actStaffNum) {
+	public void setActStaffNum(BigDecimal actStaffNum) {
 		this.actStaffNum = actStaffNum;
 	}
 	/**
@@ -190,7 +180,7 @@ public class XmIterationState  implements java.io.Serializable {
 		this.productCnt = productCnt;
 	}
 	/**
-	 * 关联需求数
+	 * 关联故事数
 	 **/
 	public void setMenuCnt(Integer menuCnt) {
 		this.menuCnt = menuCnt;
@@ -274,12 +264,6 @@ public class XmIterationState  implements java.io.Serializable {
 		this.bugCnt = bugCnt;
 	}
 	
-	/**
-	 * 迭代编码
-	 **/
-	public String getId() {
-		return this.id;
-	}
 	/**
 	 * 已分配到任务的预算从任务表汇总而来
 	 **/
@@ -307,7 +291,7 @@ public class XmIterationState  implements java.io.Serializable {
 	/**
 	 * 实际投入人员数
 	 **/
-	public Integer getActStaffNum() {
+	public BigDecimal getActStaffNum() {
 		return this.actStaffNum;
 	}
 	/**
@@ -353,7 +337,7 @@ public class XmIterationState  implements java.io.Serializable {
 		return this.productCnt;
 	}
 	/**
-	 * 关联需求数
+	 * 关联故事数
 	 **/
 	public Integer getMenuCnt() {
 		return this.menuCnt;
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmMenuPlan.java b/xm-core/src/main/java/com/xm/core/entity/XmMenuPlan.java
index c24e114a..16c960e8 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmMenuPlan.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmMenuPlan.java
@@ -8,30 +8,27 @@ import java.math.BigDecimal;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmMenuPlan所有属性名: <br>
- *	projectId,id,projectName,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,testCases,execCases,designCases,finishCases,iterationCnt,taskCnt,finishTaskCnt,productId,productName,bugCnt;<br>
+ *	projectId,projectName,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,testCases,execCases,designCases,finishCases,iterationCnt,taskCnt,finishTaskCnt,productId,productName,bugCnt;<br>
  * 表 xm_menu_plan 功能计划表,无需前端维护，所有数据由汇总统计得出的所有字段名: <br>
- *	project_id,id,project_name,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,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,task_cnt,finish_task_cnt,product_id,product_name,bug_cnt;<br>
+ *	project_id,project_name,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,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,task_cnt,finish_task_cnt,product_id,product_name,bug_cnt;<br>
  * 当前主键(包括多主键):<br>
- *	id;<br>
+ *	project_id,menu_id;<br>
  */
 @ApiModel(description="功能计划表,无需前端维护，所有数据由汇总统计得出")
 public class XmMenuPlan  implements java.io.Serializable {
 	
 	private static final long serialVersionUID = 1L;
 	
-	@ApiModelProperty(notes="主键,主键",allowEmptyValue=true,example="",allowableValues="")
-	String id;
-  	
-	
-	@ApiModelProperty(notes="项目编号",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="项目编号,主键",allowEmptyValue=true,example="",allowableValues="")
 	String projectId;
 	
+	@ApiModelProperty(notes="功能编号,主键",allowEmptyValue=true,example="",allowableValues="")
+	String menuId;
+  	
+	
 	@ApiModelProperty(notes="项目名称",allowEmptyValue=true,example="",allowableValues="")
 	String projectName;
 	
-	@ApiModelProperty(notes="功能编号",allowEmptyValue=true,example="",allowableValues="")
-	String menuId;
-	
 	@ApiModelProperty(notes="开始时间",allowEmptyValue=true,example="",allowableValues="")
 	Date planStartTime;
 	
@@ -158,9 +155,10 @@ public class XmMenuPlan  implements java.io.Serializable {
 	@ApiModelProperty(notes="bug总数",allowEmptyValue=true,example="",allowableValues="")
 	Integer bugCnt;
 
-	/**主键**/
-	public XmMenuPlan(String id) {
-		this.id = id;
+	/**项目编号,功能编号**/
+	public XmMenuPlan(String projectId,String menuId) {
+		this.projectId = projectId;
+		this.menuId = menuId;
 	}
     
     /**功能计划表,无需前端维护，所有数据由汇总统计得出**/
@@ -173,12 +171,6 @@ public class XmMenuPlan  implements java.io.Serializable {
 	public void setProjectId(String projectId) {
 		this.projectId = projectId;
 	}
-	/**
-	 * 主键
-	 **/
-	public void setId(String id) {
-		this.id = id;
-	}
 	/**
 	 * 项目名称
 	 **/
@@ -450,12 +442,6 @@ public class XmMenuPlan  implements java.io.Serializable {
 	public String getProjectId() {
 		return this.projectId;
 	}
-	/**
-	 * 主键
-	 **/
-	public String getId() {
-		return this.id;
-	}
 	/**
 	 * 项目名称
 	 **/
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 198977c6..9fa3646a 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
@@ -8,23 +8,20 @@ import java.math.BigDecimal;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmMenuState所有属性名: <br>
- *	id,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,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>
  * 表 xm_menu_state 功能状态表,无需前端维护，所有数据由汇总统计得出的所有字段名: <br>
- *	id,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,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>
  * 当前主键(包括多主键):<br>
- *	id;<br>
+ *	menu_id;<br>
  */
 @ApiModel(description="功能状态表,无需前端维护，所有数据由汇总统计得出")
 public class XmMenuState  implements java.io.Serializable {
 	
 	private static final long serialVersionUID = 1L;
 	
-	@ApiModelProperty(notes="主键,主键",allowEmptyValue=true,example="",allowableValues="")
-	String id;
-  	
-	
-	@ApiModelProperty(notes="功能编号",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="功能编号,主键",allowEmptyValue=true,example="",allowableValues="")
 	String menuId;
+  	
 	
 	@ApiModelProperty(notes="开始时间",allowEmptyValue=true,example="",allowableValues="")
 	Date planStartTime;
@@ -158,21 +155,15 @@ public class XmMenuState  implements java.io.Serializable {
 	@ApiModelProperty(notes="bug总数",allowEmptyValue=true,example="",allowableValues="")
 	Integer bugCnt;
 
-	/**主键**/
-	public XmMenuState(String id) {
-		this.id = id;
+	/**功能编号**/
+	public XmMenuState(String menuId) {
+		this.menuId = menuId;
 	}
     
     /**功能状态表,无需前端维护，所有数据由汇总统计得出**/
 	public XmMenuState() {
 	}
 	
-	/**
-	 * 主键
-	 **/
-	public void setId(String id) {
-		this.id = id;
-	}
 	/**
 	 * 功能编号
 	 **/
@@ -444,12 +435,6 @@ public class XmMenuState  implements java.io.Serializable {
 		this.bugCnt = bugCnt;
 	}
 	
-	/**
-	 * 主键
-	 **/
-	public String getId() {
-		return this.id;
-	}
 	/**
 	 * 功能编号
 	 **/
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 f6b46500..1e9e6293 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
@@ -1,27 +1,26 @@
-package com.xm.core.entity;
+package  com.xm.core.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
 import java.util.Date;
+import java.math.BigDecimal;
 
 /**
- * 组织 com.qqkj  顶级模块 xm 大模块 core  小模块 <br> 
+ * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmProductState所有属性名: <br>
- *	id,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;<br>
- * 表 XM.xm_product_state 功能状态表,无需前端维护，所有数据由汇总统计得出的所有字段名: <br>
- *	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,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;<br>
+ *	planStartTime,planEndTime,actStartTime,actEndTime,planWorkload,actWorkload,planCostAmount,actCostAmount,finishRate,demandRate,designRate,devRate,uatRate,sitRate,ctime,ltime,cuserid,cusername,calcTime,planWorkhours,planWorkerCnt,closedBugs,activeBugs,confirmedBugs,resolvedBugs,productId,productName,testCases,execCases,designCases,finishCases,projectCnt,iterationCnt,taskCnt,finishTaskCnt,bizDate,branchId,bugCnt,menuCnt;<br>
+ * 表 xm_product_state 功能状态表,无需前端维护，所有数据由汇总统计得出的所有字段名: <br>
+ *	plan_start_time,plan_end_time,act_start_time,act_end_time,plan_workload,act_workload,plan_cost_amount,act_cost_amount,finish_rate,demand_rate,design_rate,dev_rate,uat_rate,sit_rate,ctime,ltime,cuserid,cusername,calc_time,plan_workhours,plan_worker_cnt,closed_bugs,active_bugs,confirmed_bugs,resolved_bugs,product_id,product_name,test_cases,exec_cases,design_cases,finish_cases,project_cnt,iteration_cnt,task_cnt,finish_task_cnt,biz_date,branch_id,bug_cnt,menu_cnt;<br>
  * 当前主键(包括多主键):<br>
- *	id;<br>
+ *	product_id;<br>
  */
 @ApiModel(description="功能状态表,无需前端维护，所有数据由汇总统计得出")
 public class XmProductState  implements java.io.Serializable {
 	
 	private static final long serialVersionUID = 1L;
 	
-	@ApiModelProperty(notes="主键,主键",allowEmptyValue=true,example="",allowableValues="")
-	String id;
+	@ApiModelProperty(notes="产品编号,主键",allowEmptyValue=true,example="",allowableValues="")
+	String productId;
   	
 	
 	@ApiModelProperty(notes="开始时间",allowEmptyValue=true,example="",allowableValues="")
@@ -85,22 +84,19 @@ public class XmProductState  implements java.io.Serializable {
 	BigDecimal planWorkhours;
 	
 	@ApiModelProperty(notes="总人数",allowEmptyValue=true,example="",allowableValues="")
-	Integer planWorkerCnt;
+	BigDecimal planWorkerCnt;
 	
 	@ApiModelProperty(notes="总关闭bugs",allowEmptyValue=true,example="",allowableValues="")
-	Integer closedBugs;
+	BigDecimal closedBugs;
 	
 	@ApiModelProperty(notes="激活bugs",allowEmptyValue=true,example="",allowableValues="")
-	Integer activeBugs;
+	BigDecimal activeBugs;
 	
 	@ApiModelProperty(notes="已确认bugs总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer confirmedBugs;
+	BigDecimal confirmedBugs;
 	
 	@ApiModelProperty(notes="已解决bugs总数",allowEmptyValue=true,example="",allowableValues="")
-	Integer resolvedBugs;
-	
-	@ApiModelProperty(notes="产品编号",allowEmptyValue=true,example="",allowableValues="")
-	String productId;
+	BigDecimal resolvedBugs;
 	
 	@ApiModelProperty(notes="产品名称",allowEmptyValue=true,example="",allowableValues="")
 	String productName;
@@ -137,22 +133,19 @@ public class XmProductState  implements java.io.Serializable {
 	
 	@ApiModelProperty(notes="bug总数",allowEmptyValue=true,example="",allowableValues="")
 	Integer bugCnt;
+	
+	@ApiModelProperty(notes="故事数",allowEmptyValue=true,example="",allowableValues="")
+	Integer menuCnt;
 
-	/**主键**/
-	public XmProductState(String id) {
-		this.id = id;
+	/**产品编号**/
+	public XmProductState(String productId) {
+		this.productId = productId;
 	}
     
     /**功能状态表,无需前端维护，所有数据由汇总统计得出**/
 	public XmProductState() {
 	}
 	
-	/**
-	 * 主键
-	 **/
-	public void setId(String id) {
-		this.id = id;
-	}
 	/**
 	 * 开始时间
 	 **/
@@ -276,31 +269,31 @@ public class XmProductState  implements java.io.Serializable {
 	/**
 	 * 总人数
 	 **/
-	public void setPlanWorkerCnt(Integer planWorkerCnt) {
+	public void setPlanWorkerCnt(BigDecimal planWorkerCnt) {
 		this.planWorkerCnt = planWorkerCnt;
 	}
 	/**
 	 * 总关闭bugs
 	 **/
-	public void setClosedBugs(Integer closedBugs) {
+	public void setClosedBugs(BigDecimal closedBugs) {
 		this.closedBugs = closedBugs;
 	}
 	/**
 	 * 激活bugs
 	 **/
-	public void setActiveBugs(Integer activeBugs) {
+	public void setActiveBugs(BigDecimal activeBugs) {
 		this.activeBugs = activeBugs;
 	}
 	/**
 	 * 已确认bugs总数
 	 **/
-	public void setConfirmedBugs(Integer confirmedBugs) {
+	public void setConfirmedBugs(BigDecimal confirmedBugs) {
 		this.confirmedBugs = confirmedBugs;
 	}
 	/**
 	 * 已解决bugs总数
 	 **/
-	public void setResolvedBugs(Integer resolvedBugs) {
+	public void setResolvedBugs(BigDecimal resolvedBugs) {
 		this.resolvedBugs = resolvedBugs;
 	}
 	/**
@@ -381,13 +374,13 @@ public class XmProductState  implements java.io.Serializable {
 	public void setBugCnt(Integer bugCnt) {
 		this.bugCnt = bugCnt;
 	}
-	
 	/**
-	 * 主键
+	 * 故事数
 	 **/
-	public String getId() {
-		return this.id;
+	public void setMenuCnt(Integer menuCnt) {
+		this.menuCnt = menuCnt;
 	}
+	
 	/**
 	 * 开始时间
 	 **/
@@ -511,31 +504,31 @@ public class XmProductState  implements java.io.Serializable {
 	/**
 	 * 总人数
 	 **/
-	public Integer getPlanWorkerCnt() {
+	public BigDecimal getPlanWorkerCnt() {
 		return this.planWorkerCnt;
 	}
 	/**
 	 * 总关闭bugs
 	 **/
-	public Integer getClosedBugs() {
+	public BigDecimal getClosedBugs() {
 		return this.closedBugs;
 	}
 	/**
 	 * 激活bugs
 	 **/
-	public Integer getActiveBugs() {
+	public BigDecimal getActiveBugs() {
 		return this.activeBugs;
 	}
 	/**
 	 * 已确认bugs总数
 	 **/
-	public Integer getConfirmedBugs() {
+	public BigDecimal getConfirmedBugs() {
 		return this.confirmedBugs;
 	}
 	/**
 	 * 已解决bugs总数
 	 **/
-	public Integer getResolvedBugs() {
+	public BigDecimal getResolvedBugs() {
 		return this.resolvedBugs;
 	}
 	/**
@@ -616,5 +609,11 @@ public class XmProductState  implements java.io.Serializable {
 	public Integer getBugCnt() {
 		return this.bugCnt;
 	}
+	/**
+	 * 故事数
+	 **/
+	public Integer getMenuCnt() {
+		return this.menuCnt;
+	}
 
 }
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupState.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupState.java
index 9f6714b8..81c3f6a8 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupState.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupState.java
@@ -1,27 +1,26 @@
-package com.xm.core.entity;
+package  com.xm.core.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
 import java.util.Date;
+import java.math.BigDecimal;
 
 /**
- * 组织 com.qqkj  顶级模块 xm 大模块 core  小模块 <br> 
+ * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmProjectGroupState所有属性名: <br>
- *	id,planStartTime,planEndTime,actStartTime,actEndTime,planWorkload,actWorkload,planCostAmount,actCostAmount,finishRate,demandRate,designRate,devRate,uatRate,sitRate,ctime,calcTime,planWorkhours,planWorkerCnt,closedBugs,activeBugs,confirmedBugs,resolvedBugs,testCases,execCases,designCases,finishCases,iterationCnt,taskCnt,finishTaskCnt,bizDate,bugCnt,groupId,projectId,projectName,groupName;<br>
- * 表 XM.xm_project_group_state 功能状态表,无需前端维护，所有数据由汇总统计得出的所有字段名: <br>
- *	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,ctime,calc_time,plan_workhours,plan_worker_cnt,closed_bugs,active_bugs,confirmed_bugs,resolved_bugs,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,task_cnt,finish_task_cnt,biz_date,bug_cnt,group_id,project_id,project_name,group_name;<br>
+ *	planStartTime,planEndTime,actStartTime,actEndTime,planWorkload,actWorkload,planCostAmount,actCostAmount,finishRate,demandRate,designRate,devRate,uatRate,sitRate,ctime,calcTime,planWorkhours,planWorkerCnt,closedBugs,activeBugs,confirmedBugs,resolvedBugs,testCases,execCases,designCases,finishCases,iterationCnt,taskCnt,finishTaskCnt,bizDate,bugCnt,groupId,projectId,projectName,groupName;<br>
+ * 表 xm_project_group_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,calc_time,plan_workhours,plan_worker_cnt,closed_bugs,active_bugs,confirmed_bugs,resolved_bugs,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,task_cnt,finish_task_cnt,biz_date,bug_cnt,group_id,project_id,project_name,group_name;<br>
  * 当前主键(包括多主键):<br>
- *	id;<br>
+ *	group_id;<br>
  */
 @ApiModel(description="功能状态表,无需前端维护，所有数据由汇总统计得出")
 public class XmProjectGroupState  implements java.io.Serializable {
 	
 	private static final long serialVersionUID = 1L;
 	
-	@ApiModelProperty(notes="主键,主键",allowEmptyValue=true,example="",allowableValues="")
-	String id;
+	@ApiModelProperty(notes="团队编号,主键",allowEmptyValue=true,example="",allowableValues="")
+	String groupId;
   	
 	
 	@ApiModelProperty(notes="开始时间",allowEmptyValue=true,example="",allowableValues="")
@@ -117,9 +116,6 @@ public class XmProjectGroupState  implements java.io.Serializable {
 	@ApiModelProperty(notes="bug总数",allowEmptyValue=true,example="",allowableValues="")
 	Integer bugCnt;
 	
-	@ApiModelProperty(notes="团队编号",allowEmptyValue=true,example="",allowableValues="")
-	String groupId;
-	
 	@ApiModelProperty(notes="项目编号",allowEmptyValue=true,example="",allowableValues="")
 	String projectId;
 	
@@ -129,21 +125,15 @@ public class XmProjectGroupState  implements java.io.Serializable {
 	@ApiModelProperty(notes="团队名称",allowEmptyValue=true,example="",allowableValues="")
 	String groupName;
 
-	/**主键**/
-	public XmProjectGroupState(String id) {
-		this.id = id;
+	/**团队编号**/
+	public XmProjectGroupState(String groupId) {
+		this.groupId = groupId;
 	}
     
     /**功能状态表,无需前端维护，所有数据由汇总统计得出**/
 	public XmProjectGroupState() {
 	}
 	
-	/**
-	 * 主键
-	 **/
-	public void setId(String id) {
-		this.id = id;
-	}
 	/**
 	 * 开始时间
 	 **/
@@ -355,12 +345,6 @@ public class XmProjectGroupState  implements java.io.Serializable {
 		this.groupName = groupName;
 	}
 	
-	/**
-	 * 主键
-	 **/
-	public String getId() {
-		return this.id;
-	}
 	/**
 	 * 开始时间
 	 **/
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 2e094134..39c58f78 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
@@ -1,31 +1,27 @@
-package com.xm.core.entity;
+package  com.xm.core.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * 组织 com.qqkj  顶级模块 xm 大模块 core  小模块 <br> 
+ * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmProjectState所有属性名: <br>
- *	projectId,bizDate,totalFileCnt,totalBugCnt,totalTaskCnt,totalBudgetNouserAmount,projectName,id,totalStaffCnt,calcTime,calcStatus,totalCostNouserAmount,totalClosedBugCnt,totalResolvedBugCnt,totalCompleteTaskCnt,totalPhaseCnt,totalCompletePhaseCnt,totalNeedPayAmount,totalFinishPayAmount,totalNeedColAmount,totalFinishColAmount,totalCostUserAmount,totalBudgetInnerUserAmount,totalPlanWorkload,totalRiskCnt,totalCompleteRiskCnt,branchId,branchName,totalBudgetOutUserAmount,totalCompleteWorkload,totalCostInnerUserAmount,totalCostOutUserAmount,totalProgress,totalActiveBugCnt,totalConfirmedBugCnt,projectStatus,totalActWorkload,totalActOutWorkload,totalActInnerWorkload,totalTaskBudgetCostAt,totalTaskOutCnt,totalNeedPayCnt,totalFinishPayCnt,totalFinishPayUserCnt,totalNeedPayUserCnt,totalPlanInnerUserWorkload,totalPlanOutUserWorkload,testCases,execCases,designCases,finishCases,iterationCnt,productCnt,menuCnt;<br>
- * 表 XM.xm_project_state 项目指标日统计表的所有字段名: <br>
- *	project_id,biz_date,total_file_cnt,total_bug_cnt,total_task_cnt,total_budget_nouser_amount,project_name,id,total_staff_cnt,calc_time,calc_status,total_cost_nouser_amount,total_closed_bug_cnt,total_resolved_bug_cnt,total_complete_task_cnt,total_phase_cnt,total_complete_phase_cnt,total_need_pay_amount,total_finish_pay_amount,total_need_col_amount,total_finish_col_amount,total_cost_user_amount,total_budget_inner_user_amount,total_plan_workload,total_risk_cnt,total_complete_risk_cnt,branch_id,branch_name,total_budget_out_user_amount,total_complete_workload,total_cost_inner_user_amount,total_cost_out_user_amount,total_progress,total_active_bug_cnt,total_confirmed_bug_cnt,project_status,total_act_workload,total_act_out_workload,total_act_inner_workload,total_task_budget_cost_at,total_task_out_cnt,total_need_pay_cnt,total_finish_pay_cnt,total_finish_pay_user_cnt,total_need_pay_user_cnt,total_plan_inner_user_workload,total_plan_out_user_workload,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,menu_cnt;<br>
+ *	projectId,bizDate,totalFileCnt,totalBugCnt,totalTaskCnt,totalBudgetNouserAmount,projectName,totalStaffCnt,calcTime,calcStatus,totalCostNouserAmount,totalClosedBugCnt,totalResolvedBugCnt,totalCompleteTaskCnt,totalPhaseCnt,totalCompletePhaseCnt,totalNeedPayAmount,totalFinishPayAmount,totalNeedColAmount,totalFinishColAmount,totalCostUserAmount,totalBudgetInnerUserAmount,totalPlanWorkload,totalRiskCnt,totalCompleteRiskCnt,branchId,branchName,totalBudgetOutUserAmount,totalCompleteWorkload,totalCostInnerUserAmount,totalCostOutUserAmount,totalProgress,totalActiveBugCnt,totalConfirmedBugCnt,projectStatus,totalActWorkload,totalActOutWorkload,totalActInnerWorkload,totalTaskBudgetCostAt,totalTaskOutCnt,totalNeedPayCnt,totalFinishPayCnt,totalFinishPayUserCnt,totalNeedPayUserCnt,totalPlanInnerUserWorkload,totalPlanOutUserWorkload,testCases,execCases,designCases,finishCases,iterationCnt,productCnt,menuCnt;<br>
+ * 表 xm_project_state 项目指标日统计表的所有字段名: <br>
+ *	project_id,biz_date,total_file_cnt,total_bug_cnt,total_task_cnt,total_budget_nouser_amount,project_name,total_staff_cnt,calc_time,calc_status,total_cost_nouser_amount,total_closed_bug_cnt,total_resolved_bug_cnt,total_complete_task_cnt,total_phase_cnt,total_complete_phase_cnt,total_need_pay_amount,total_finish_pay_amount,total_need_col_amount,total_finish_col_amount,total_cost_user_amount,total_budget_inner_user_amount,total_plan_workload,total_risk_cnt,total_complete_risk_cnt,branch_id,branch_name,total_budget_out_user_amount,total_complete_workload,total_cost_inner_user_amount,total_cost_out_user_amount,total_progress,total_active_bug_cnt,total_confirmed_bug_cnt,project_status,total_act_workload,total_act_out_workload,total_act_inner_workload,total_task_budget_cost_at,total_task_out_cnt,total_need_pay_cnt,total_finish_pay_cnt,total_finish_pay_user_cnt,total_need_pay_user_cnt,total_plan_inner_user_workload,total_plan_out_user_workload,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,menu_cnt;<br>
  * 当前主键(包括多主键):<br>
- *	id;<br>
+ *	project_id;<br>
  */
 @ApiModel(description="项目指标日统计表")
 public class XmProjectState  implements java.io.Serializable {
 	
 	private static final long serialVersionUID = 1L;
 	
-	@ApiModelProperty(notes="主键,主键",allowEmptyValue=true,example="",allowableValues="")
-	String id;
-  	
-	
-	@ApiModelProperty(notes="项目编号",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="项目编号,主键",allowEmptyValue=true,example="",allowableValues="")
 	String projectId;
+  	
 	
 	@ApiModelProperty(notes="统计日期yyyy-mm-dd类型",allowEmptyValue=true,example="",allowableValues="")
 	String bizDate;
@@ -66,10 +62,10 @@ public class XmProjectState  implements java.io.Serializable {
 	@ApiModelProperty(notes="已完成任务总数-来自任务表",allowEmptyValue=true,example="",allowableValues="")
 	Integer totalCompleteTaskCnt;
 	
-	@ApiModelProperty(notes="项目计划数",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="项目阶段计划数",allowEmptyValue=true,example="",allowableValues="")
 	Integer totalPhaseCnt;
 	
-	@ApiModelProperty(notes="项目计划已完成数",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="项目阶段计划已完成数",allowEmptyValue=true,example="",allowableValues="")
 	Integer totalCompletePhaseCnt;
 	
 	@ApiModelProperty(notes="待付款总金额",allowEmptyValue=true,example="",allowableValues="")
@@ -142,24 +138,24 @@ public class XmProjectState  implements java.io.Serializable {
 	BigDecimal totalTaskBudgetCostAt;
 	
 	@ApiModelProperty(notes="外购任务数，来自任务表",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalTaskOutCnt;
+	BigDecimal totalTaskOutCnt;
 	
 	@ApiModelProperty(notes="待付款笔数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalNeedPayCnt;
+	BigDecimal totalNeedPayCnt;
 	
 	@ApiModelProperty(notes="完成付款总比数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalFinishPayCnt;
+	BigDecimal totalFinishPayCnt;
 	
 	@ApiModelProperty(notes="已付款总人数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalFinishPayUserCnt;
+	BigDecimal totalFinishPayUserCnt;
 	
 	@ApiModelProperty(notes="待付款总人数",allowEmptyValue=true,example="",allowableValues="")
-	Integer totalNeedPayUserCnt;
+	BigDecimal totalNeedPayUserCnt;
 	
-	@ApiModelProperty(notes="内部人力总工作量-应该大于或等于计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal totalPlanInnerUserWorkload;
 	
-	@ApiModelProperty(notes="外购人力总工作量-应该大于或等于计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal totalPlanOutUserWorkload;
 	
 	@ApiModelProperty(notes="测试案例总数",allowEmptyValue=true,example="",allowableValues="")
@@ -180,12 +176,12 @@ public class XmProjectState  implements java.io.Serializable {
 	@ApiModelProperty(notes="产品数",allowEmptyValue=true,example="",allowableValues="")
 	Integer productCnt;
 	
-	@ApiModelProperty(notes="需求数",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="故事数",allowEmptyValue=true,example="",allowableValues="")
 	Integer menuCnt;
 
-	/**主键**/
-	public XmProjectState(String id) {
-		this.id = id;
+	/**项目编号**/
+	public XmProjectState(String projectId) {
+		this.projectId = projectId;
 	}
     
     /**项目指标日统计表**/
@@ -234,12 +230,6 @@ public class XmProjectState  implements java.io.Serializable {
 	public void setProjectName(String projectName) {
 		this.projectName = projectName;
 	}
-	/**
-	 * 主键
-	 **/
-	public void setId(String id) {
-		this.id = id;
-	}
 	/**
 	 * 总参与人数
 	 **/
@@ -283,13 +273,13 @@ public class XmProjectState  implements java.io.Serializable {
 		this.totalCompleteTaskCnt = totalCompleteTaskCnt;
 	}
 	/**
-	 * 项目计划数
+	 * 项目阶段计划数
 	 **/
 	public void setTotalPhaseCnt(Integer totalPhaseCnt) {
 		this.totalPhaseCnt = totalPhaseCnt;
 	}
 	/**
-	 * 项目计划已完成数
+	 * 项目阶段计划已完成数
 	 **/
 	public void setTotalCompletePhaseCnt(Integer totalCompletePhaseCnt) {
 		this.totalCompletePhaseCnt = totalCompletePhaseCnt;
@@ -435,41 +425,41 @@ public class XmProjectState  implements java.io.Serializable {
 	/**
 	 * 外购任务数，来自任务表
 	 **/
-	public void setTotalTaskOutCnt(Integer totalTaskOutCnt) {
+	public void setTotalTaskOutCnt(BigDecimal totalTaskOutCnt) {
 		this.totalTaskOutCnt = totalTaskOutCnt;
 	}
 	/**
 	 * 待付款笔数
 	 **/
-	public void setTotalNeedPayCnt(Integer totalNeedPayCnt) {
+	public void setTotalNeedPayCnt(BigDecimal totalNeedPayCnt) {
 		this.totalNeedPayCnt = totalNeedPayCnt;
 	}
 	/**
 	 * 完成付款总比数
 	 **/
-	public void setTotalFinishPayCnt(Integer totalFinishPayCnt) {
+	public void setTotalFinishPayCnt(BigDecimal totalFinishPayCnt) {
 		this.totalFinishPayCnt = totalFinishPayCnt;
 	}
 	/**
 	 * 已付款总人数
 	 **/
-	public void setTotalFinishPayUserCnt(Integer totalFinishPayUserCnt) {
+	public void setTotalFinishPayUserCnt(BigDecimal totalFinishPayUserCnt) {
 		this.totalFinishPayUserCnt = totalFinishPayUserCnt;
 	}
 	/**
 	 * 待付款总人数
 	 **/
-	public void setTotalNeedPayUserCnt(Integer totalNeedPayUserCnt) {
+	public void setTotalNeedPayUserCnt(BigDecimal totalNeedPayUserCnt) {
 		this.totalNeedPayUserCnt = totalNeedPayUserCnt;
 	}
 	/**
-	 * 内部人力总工作量-应该大于或等于计划内部人力总成本
+	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
 	 **/
 	public void setTotalPlanInnerUserWorkload(BigDecimal totalPlanInnerUserWorkload) {
 		this.totalPlanInnerUserWorkload = totalPlanInnerUserWorkload;
 	}
 	/**
-	 * 外购人力总工作量-应该大于或等于计划外购人力总成本
+	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
 	 **/
 	public void setTotalPlanOutUserWorkload(BigDecimal totalPlanOutUserWorkload) {
 		this.totalPlanOutUserWorkload = totalPlanOutUserWorkload;
@@ -511,7 +501,7 @@ public class XmProjectState  implements java.io.Serializable {
 		this.productCnt = productCnt;
 	}
 	/**
-	 * 需求数
+	 * 故事数
 	 **/
 	public void setMenuCnt(Integer menuCnt) {
 		this.menuCnt = menuCnt;
@@ -559,12 +549,6 @@ public class XmProjectState  implements java.io.Serializable {
 	public String getProjectName() {
 		return this.projectName;
 	}
-	/**
-	 * 主键
-	 **/
-	public String getId() {
-		return this.id;
-	}
 	/**
 	 * 总参与人数
 	 **/
@@ -608,13 +592,13 @@ public class XmProjectState  implements java.io.Serializable {
 		return this.totalCompleteTaskCnt;
 	}
 	/**
-	 * 项目计划数
+	 * 项目阶段计划数
 	 **/
 	public Integer getTotalPhaseCnt() {
 		return this.totalPhaseCnt;
 	}
 	/**
-	 * 项目计划已完成数
+	 * 项目阶段计划已完成数
 	 **/
 	public Integer getTotalCompletePhaseCnt() {
 		return this.totalCompletePhaseCnt;
@@ -760,41 +744,41 @@ public class XmProjectState  implements java.io.Serializable {
 	/**
 	 * 外购任务数，来自任务表
 	 **/
-	public Integer getTotalTaskOutCnt() {
+	public BigDecimal getTotalTaskOutCnt() {
 		return this.totalTaskOutCnt;
 	}
 	/**
 	 * 待付款笔数
 	 **/
-	public Integer getTotalNeedPayCnt() {
+	public BigDecimal getTotalNeedPayCnt() {
 		return this.totalNeedPayCnt;
 	}
 	/**
 	 * 完成付款总比数
 	 **/
-	public Integer getTotalFinishPayCnt() {
+	public BigDecimal getTotalFinishPayCnt() {
 		return this.totalFinishPayCnt;
 	}
 	/**
 	 * 已付款总人数
 	 **/
-	public Integer getTotalFinishPayUserCnt() {
+	public BigDecimal getTotalFinishPayUserCnt() {
 		return this.totalFinishPayUserCnt;
 	}
 	/**
 	 * 待付款总人数
 	 **/
-	public Integer getTotalNeedPayUserCnt() {
+	public BigDecimal getTotalNeedPayUserCnt() {
 		return this.totalNeedPayUserCnt;
 	}
 	/**
-	 * 内部人力总工作量-应该大于或等于计划内部人力总成本
+	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
 	 **/
 	public BigDecimal getTotalPlanInnerUserWorkload() {
 		return this.totalPlanInnerUserWorkload;
 	}
 	/**
-	 * 外购人力总工作量-应该大于或等于计划外购人力总成本
+	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
 	 **/
 	public BigDecimal getTotalPlanOutUserWorkload() {
 		return this.totalPlanOutUserWorkload;
@@ -836,7 +820,7 @@ public class XmProjectState  implements java.io.Serializable {
 		return this.productCnt;
 	}
 	/**
-	 * 需求数
+	 * 故事数
 	 **/
 	public Integer getMenuCnt() {
 		return this.menuCnt;
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 46e13e16..26deeb28 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
@@ -3,9 +3,15 @@
 <mapper namespace="com.xm.core.entity.XmBranchState">
 	
 	
-	<!--开始 自定sql函数区域 -->
-		<!--请在此区域添加自定义函数-->
-
+	<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 -->
+	<sql id="whereForMap">
+		<if test=" branchIds != null">  and (res.branch_id) in
+			<foreach collection="branchIds" item="item" index="index" open="(" separator="," close=")" >
+				( #{item})
+			</foreach>
+		</if>
+		<if test="key != null and key !='' ">       </if>
+	</sql>
 	<select id="listPortalAllXmBranchSumState" parameterType="HashMap" resultType="HashMap">
 		SELECT
 		sum( ifnull( total_file_cnt, 0 ) ) total_file_cnt,
@@ -61,9 +67,9 @@
 </select>
 <!-- 根据条件修改若干条记录 -->
 	<update id="loadProjectStateToXmBranchState" parameterType="String" statementType="CALLABLE">
-		 {call load_project_state_to_xm_branch_state(#{branchId,mode=IN})} 
+		 {call load_project_state_to_xm_branch_state(#{branchId,mode=IN})}
 	</update>
-		
+
 	<!--结束 自定义sql函数区域-->
 	
 
@@ -71,15 +77,9 @@
 	<!-- 通过条件查询获取数据列表 返回list<map> -->
 	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
 		select * from xm_branch_state res
-		<where> 
-			<if test="ids != null">  and     
-				id in
-				    <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >  
-				        #{item}  
-				    </foreach>  
-			 </if>
+		<where>
+		    <include refid="whereForMap"/>
 			<include refid="where"/>
-			<if test="key != null and key !='' ">       </if> 
 		</where>
 	</select>
 	
@@ -95,14 +95,14 @@
 	<select id="selectOneObject" parameterType="com.xm.core.entity.XmBranchState" resultType="com.xm.core.entity.XmBranchState">
 		select * from xm_branch_state res
 		where 
-			res.id = #{id}
+			res.branch_id = #{branchId}
 	</select>
 	
 	<!-- 通过主键查询获取数据对象 返回map-->
 	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
 		select * from xm_branch_state res
 		where 
-			 res.id = #{id}
+			 res.branch_id = #{branchId}
 	</select>
 	<!-- 获取数据条目 返回long -->
 	<select id="countByWhere" parameterType="com.xm.core.entity.XmBranchState" resultType="long">
@@ -111,12 +111,12 @@
 			<include refid="where"/>
 		</where>
 	</select>
-	<!-- 新增一条记录  主键id,-->
-	<insert id="insert" parameterType="com.xm.core.entity.XmBranchState" useGeneratedKeys="false" keyProperty="id">
+	<!-- 新增一条记录  主键branch_id,-->
+	<insert id="insert" parameterType="com.xm.core.entity.XmBranchState" useGeneratedKeys="false"   keyProperty="branch_id">
 		insert into xm_branch_state(
 			<include refid="columns"/>
 		) values (
-		#{bizDate},#{totalFileCnt},#{totalBugCnt},#{totalTaskCnt},#{totalBudgetNouserAmount},#{id},#{totalStaffCnt},#{calcTime},#{calcStatus},#{totalCostNouserAmount},#{totalClosedBugCnt},#{totalResolvedBugCnt},#{totalCompleteTaskCnt},#{totalPhaseCnt},#{totalCompletePhaseCnt},#{totalNeedPayAmount},#{totalFinishPayAmount},#{totalNeedColAmount},#{totalFinishColAmount},#{totalCostUserAmount},#{totalBudgetInnerUserAmount},#{totalPlanWorkload},#{totalRiskCnt},#{totalCompleteRiskCnt},#{branchId},#{branchName},#{totalBudgetOutUserAmount},#{totalCompleteWorkload},#{totalCostInnerUserAmount},#{totalCostOutUserAmount},#{totalProgress},#{totalActiveBugCnt},#{totalConfirmedBugCnt},#{projectStatus},#{totalActWorkload},#{totalActOutWorkload},#{totalActInnerWorkload},#{totalTaskBudgetCostAt},#{totalTaskOutCnt},#{totalNeedPayCnt},#{totalFinishPayCnt},#{totalFinishPayUserCnt},#{totalNeedPayUserCnt},#{totalPlanInnerUserWorkload},#{totalPlanOutUserWorkload},#{testCases},#{execCases},#{designCases},#{finishCases},#{iterationCnt},#{productCnt},#{menuCnt}
+		#{bizDate},#{totalFileCnt},#{totalBugCnt},#{totalTaskCnt},#{totalBudgetNouserAmount},#{totalStaffCnt},#{calcTime},#{calcStatus},#{totalCostNouserAmount},#{totalClosedBugCnt},#{totalResolvedBugCnt},#{totalCompleteTaskCnt},#{totalPhaseCnt},#{totalCompletePhaseCnt},#{totalNeedPayAmount},#{totalFinishPayAmount},#{totalNeedColAmount},#{totalFinishColAmount},#{totalCostUserAmount},#{totalBudgetInnerUserAmount},#{totalPlanWorkload},#{totalRiskCnt},#{totalCompleteRiskCnt},#{branchId},#{branchName},#{totalBudgetOutUserAmount},#{totalCompleteWorkload},#{totalCostInnerUserAmount},#{totalCostOutUserAmount},#{totalProgress},#{totalActiveBugCnt},#{totalConfirmedBugCnt},#{projectStatus},#{totalActWorkload},#{totalActOutWorkload},#{totalActInnerWorkload},#{totalTaskBudgetCostAt},#{totalTaskOutCnt},#{totalNeedPayCnt},#{totalFinishPayCnt},#{totalFinishPayUserCnt},#{totalNeedPayUserCnt},#{totalPlanInnerUserWorkload},#{totalPlanOutUserWorkload},#{testCases},#{execCases},#{designCases},#{finishCases},#{iterationCnt},#{productCnt},#{menuCnt},#{projectCnt}
 		)
 	</insert>
 	
@@ -130,26 +130,26 @@
 	
 	<!-- 按主键删除一条记录-->
 	<delete id="deleteByPk" parameterType="com.xm.core.entity.XmBranchState">
-		delete from xm_branch_state
-		where id = #{id} 
+		delete from xm_branch_state 
+		where branch_id = #{branchId} 
 	</delete>
 	
 	<!-- 根据条件修改若干条记录 -->
 	<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmBranchState">
-		update  xm_branch_state
+		update  xm_branch_state 
 		<set>
 			<include refid="someFieldSet"/>
 		</set>
-		where id = #{id} 
+		where branch_id = #{branchId} 
 	</update>
 	
 		<!-- 根据主键修改一条记录 -->
 	<update id="updateByPk" parameterType="com.xm.core.entity.XmBranchState">
-		update  xm_branch_state
+		update  xm_branch_state 
 		<set>
 			<include refid="set"/>
 		</set>
-		where id = #{id} 
+		where branch_id = #{branchId} 
 	</update>
 
 	<!-- 批量新增  批量插入 借用insert 循环插入实现
@@ -160,27 +160,28 @@
 	<!-- 批量更新 -->
 	<update id="batchUpdate" parameterType="List">   
 		<foreach collection="list" item="item" index="index" separator=";" >
-   		update  xm_branch_state
+   		update  xm_branch_state 
 		set 
 			<include refid="batchSet"/>
-			where id = #{item.id}  
+			where branch_id = #{item.branchId}  
 		</foreach> 
 	</update>
 	<!-- 批量删除 -->
 	<delete id="batchDelete" parameterType="List">  
-		delete from xm_branch_state
-			where id in
-			    <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >  
-			        #{item.id }  
-			    </foreach>  
+		delete from xm_branch_state 
+			where
+			(branch_id) in
+                <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
+                    (  #{item.branchId} )
+                </foreach>
 	</delete>
 	
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		biz_date,total_file_cnt,total_bug_cnt,total_task_cnt,total_budget_nouser_amount,id,total_staff_cnt,calc_time,calc_status,total_cost_nouser_amount,total_closed_bug_cnt,total_resolved_bug_cnt,total_complete_task_cnt,total_phase_cnt,total_complete_phase_cnt,total_need_pay_amount,total_finish_pay_amount,total_need_col_amount,total_finish_col_amount,total_cost_user_amount,total_budget_inner_user_amount,total_plan_workload,total_risk_cnt,total_complete_risk_cnt,branch_id,branch_name,total_budget_out_user_amount,total_complete_workload,total_cost_inner_user_amount,total_cost_out_user_amount,total_progress,total_active_bug_cnt,total_confirmed_bug_cnt,project_status,total_act_workload,total_act_out_workload,total_act_inner_workload,total_task_budget_cost_at,total_task_out_cnt,total_need_pay_cnt,total_finish_pay_cnt,total_finish_pay_user_cnt,total_need_pay_user_cnt,total_plan_inner_user_workload,total_plan_out_user_workload,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,menu_cnt
+		biz_date,total_file_cnt,total_bug_cnt,total_task_cnt,total_budget_nouser_amount,total_staff_cnt,calc_time,calc_status,total_cost_nouser_amount,total_closed_bug_cnt,total_resolved_bug_cnt,total_complete_task_cnt,total_phase_cnt,total_complete_phase_cnt,total_need_pay_amount,total_finish_pay_amount,total_need_col_amount,total_finish_col_amount,total_cost_user_amount,total_budget_inner_user_amount,total_plan_workload,total_risk_cnt,total_complete_risk_cnt,branch_id,branch_name,total_budget_out_user_amount,total_complete_workload,total_cost_inner_user_amount,total_cost_out_user_amount,total_progress,total_active_bug_cnt,total_confirmed_bug_cnt,project_status,total_act_workload,total_act_out_workload,total_act_inner_workload,total_task_budget_cost_at,total_task_out_cnt,total_need_pay_cnt,total_finish_pay_cnt,total_finish_pay_user_cnt,total_need_pay_user_cnt,total_plan_inner_user_workload,total_plan_out_user_workload,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,menu_cnt,project_cnt
 	</sql>
-	
+
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
 	<sql id="where">
 		<if test="bizDate != null and bizDate != ''">      and res.biz_date = #{bizDate}     </if>
@@ -188,9 +189,8 @@
 		<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="id != null and id != ''">      and res.id = #{id}     </if>
 		<if test="totalStaffCnt != null and totalStaffCnt != ''">      and res.total_staff_cnt = #{totalStaffCnt}     </if>
-		<if test="calcTime != null">      and TO_CHAR(res.calc_time,'YYYY-MM-DD') = TO_CHAR(#{calcTime},'YYYY-MM-DD')     </if>
+		<if test="calcTime != null">      and date_format(res.calc_time,'%Y-%m-%d') = date_format(#{calcTime},'%Y-%m-%d')     </if>
 		<if test="calcStatus != null and calcStatus != ''">      and res.calc_status = #{calcStatus}     </if>
 		<if test="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>
@@ -235,6 +235,7 @@
 		<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>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -261,7 +262,6 @@
 		total_plan_workload = #{totalPlanWorkload},
 		total_risk_cnt = #{totalRiskCnt},
 		total_complete_risk_cnt = #{totalCompleteRiskCnt},
-		branch_id = #{branchId},
 		branch_name = #{branchName},
 		total_budget_out_user_amount = #{totalBudgetOutUserAmount},
 		total_complete_workload = #{totalCompleteWorkload},
@@ -288,7 +288,8 @@
 		finish_cases = #{finishCases},
 		iteration_cnt = #{iterationCnt},
 		product_cnt = #{productCnt},
-		menu_cnt = #{menuCnt}
+		menu_cnt = #{menuCnt},
+		project_cnt = #{projectCnt}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="bizDate != null and bizDate != ''"> biz_date = #{bizDate},     </if>
@@ -314,7 +315,6 @@
 		<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="branchId != null and branchId != ''"> branch_id = #{branchId},     </if>
 		<if test="branchName != null and branchName != ''"> branch_name = #{branchName},     </if>
 		<if test="totalBudgetOutUserAmount != null and totalBudgetOutUserAmount != ''"> total_budget_out_user_amount = #{totalBudgetOutUserAmount},     </if>
 		<if test="totalCompleteWorkload != null and totalCompleteWorkload != ''"> total_complete_workload = #{totalCompleteWorkload},     </if>
@@ -342,6 +342,7 @@
 		<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>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -368,7 +369,6 @@
 			total_plan_workload = #{item.totalPlanWorkload},
 			total_risk_cnt = #{item.totalRiskCnt},
 			total_complete_risk_cnt = #{item.totalCompleteRiskCnt},
-			branch_id = #{item.branchId},
 			branch_name = #{item.branchName},
 			total_budget_out_user_amount = #{item.totalBudgetOutUserAmount},
 			total_complete_workload = #{item.totalCompleteWorkload},
@@ -395,6 +395,7 @@
 			finish_cases = #{item.finishCases},
 			iteration_cnt = #{item.iterationCnt},
 			product_cnt = #{item.productCnt},
-			menu_cnt = #{item.menuCnt}
+			menu_cnt = #{item.menuCnt},
+			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/XmIterationStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationStateMapper.xml
index 97516a21..38e681de 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
@@ -3,14 +3,21 @@
 <mapper namespace="com.xm.core.entity.XmIterationState">
 	
 	
-	<!--开始 自定sql函数区域 -->
-		<!--请在此区域添加自定义函数-->
-		
-		
+	<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 -->
+
+    <sql id="whereForMap">
+         <if test=" iterationIds != null">  and (res.iteration_id) in
+             <foreach collection="iterationIds" item="item" index="index" open="(" separator="," close=")" >
+                 ( #{item})
+             </foreach>
+         </if>
+        <if test="key != null and key !='' ">       </if>
+    </sql>
+
 	<update id="loadTasksToXmIterationState" parameterType="String" statementType="CALLABLE">
-		 {call load_tasks_to_xm_iteration_state(#{productId,mode=IN})} 
+		 {call load_tasks_to_xm_iteration_state(#{productId,mode=IN})}
 	</update>
-		
+
 	<!--结束 自定义sql函数区域-->
 	
 
@@ -18,15 +25,9 @@
 	<!-- 通过条件查询获取数据列表 返回list<map> -->
 	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
 		select * from xm_iteration_state res
-		<where> 
-			<if test="ids != null">  and     
-				id in
-				    <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >  
-				        #{item}  
-				    </foreach>  
-			 </if>
+		<where>
+		    <include refid="whereForMap"/>
 			<include refid="where"/>
-			<if test="key != null and key !='' ">       </if> 
 		</where>
 	</select>
 	
@@ -42,14 +43,14 @@
 	<select id="selectOneObject" parameterType="com.xm.core.entity.XmIterationState" resultType="com.xm.core.entity.XmIterationState">
 		select * from xm_iteration_state res
 		where 
-			res.id = #{id}
+			res.iteration_id = #{iterationId}
 	</select>
 	
 	<!-- 通过主键查询获取数据对象 返回map-->
 	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
 		select * from xm_iteration_state res
 		where 
-			 res.id = #{id}
+			 res.iteration_id = #{iterationId}
 	</select>
 	<!-- 获取数据条目 返回long -->
 	<select id="countByWhere" parameterType="com.xm.core.entity.XmIterationState" resultType="long">
@@ -58,12 +59,12 @@
 			<include refid="where"/>
 		</where>
 	</select>
-	<!-- 新增一条记录  主键id,-->
-	<insert id="insert" parameterType="com.xm.core.entity.XmIterationState" useGeneratedKeys="false" keyProperty="id">
+	<!-- 新增一条记录  主键iteration_id,-->
+	<insert id="insert" parameterType="com.xm.core.entity.XmIterationState" useGeneratedKeys="false"   keyProperty="iteration_id">
 		insert into xm_iteration_state(
 			<include refid="columns"/>
 		) values (
-		#{id},#{distBudgetCost},#{distBudgetWorkload},#{actCost},#{actWorkload},#{actStaffNum},#{finishRate},#{testCases},#{execCases},#{designCases},#{finishCases},#{projectCnt},#{productCnt},#{menuCnt},#{taskCnt},#{finishTaskCnt},#{calcTime},#{iterationName},#{budgetCost},#{budgetWorkload},#{iterationId},#{bizDate},#{closedBugCnt},#{resolvedBugCnt},#{activeBugCnt},#{confirmedBugCnt},#{bugCnt}
+		#{distBudgetCost},#{distBudgetWorkload},#{actCost},#{actWorkload},#{actStaffNum},#{finishRate},#{testCases},#{execCases},#{designCases},#{finishCases},#{projectCnt},#{productCnt},#{menuCnt},#{taskCnt},#{finishTaskCnt},#{calcTime},#{iterationName},#{budgetCost},#{budgetWorkload},#{iterationId},#{bizDate},#{closedBugCnt},#{resolvedBugCnt},#{activeBugCnt},#{confirmedBugCnt},#{bugCnt}
 		)
 	</insert>
 	
@@ -77,26 +78,26 @@
 	
 	<!-- 按主键删除一条记录-->
 	<delete id="deleteByPk" parameterType="com.xm.core.entity.XmIterationState">
-		delete from xm_iteration_state
-		where id = #{id} 
+		delete from xm_iteration_state 
+		where iteration_id = #{iterationId} 
 	</delete>
 	
 	<!-- 根据条件修改若干条记录 -->
 	<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmIterationState">
-		update  xm_iteration_state
+		update  xm_iteration_state 
 		<set>
 			<include refid="someFieldSet"/>
 		</set>
-		where id = #{id} 
+		where iteration_id = #{iterationId} 
 	</update>
 	
 		<!-- 根据主键修改一条记录 -->
 	<update id="updateByPk" parameterType="com.xm.core.entity.XmIterationState">
-		update  xm_iteration_state
+		update  xm_iteration_state 
 		<set>
 			<include refid="set"/>
 		</set>
-		where id = #{id} 
+		where iteration_id = #{iterationId} 
 	</update>
 
 	<!-- 批量新增  批量插入 借用insert 循环插入实现
@@ -107,30 +108,30 @@
 	<!-- 批量更新 -->
 	<update id="batchUpdate" parameterType="List">   
 		<foreach collection="list" item="item" index="index" separator=";" >
-   		update  xm_iteration_state
+   		update  xm_iteration_state 
 		set 
 			<include refid="batchSet"/>
-			where id = #{item.id}  
+			where iteration_id = #{item.iterationId}  
 		</foreach> 
 	</update>
 	<!-- 批量删除 -->
 	<delete id="batchDelete" parameterType="List">  
-		delete from xm_iteration_state
-			where id in
-			    <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >  
-			        #{item.id }  
-			    </foreach>  
+		delete from xm_iteration_state 
+			where
+			(iteration_id) in
+                <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
+                    (  #{item.iterationId} )
+                </foreach>
 	</delete>
 	
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		id,dist_budget_cost,dist_budget_workload,act_cost,act_workload,act_staff_num,finish_rate,test_cases,exec_cases,design_cases,finish_cases,project_cnt,product_cnt,menu_cnt,task_cnt,finish_task_cnt,calc_time,iteration_name,budget_cost,budget_workload,iteration_id,biz_date,closed_bug_cnt,resolved_bug_cnt,active_bug_cnt,confirmed_bug_cnt,bug_cnt
+		dist_budget_cost,dist_budget_workload,act_cost,act_workload,act_staff_num,finish_rate,test_cases,exec_cases,design_cases,finish_cases,project_cnt,product_cnt,menu_cnt,task_cnt,finish_task_cnt,calc_time,iteration_name,budget_cost,budget_workload,iteration_id,biz_date,closed_bug_cnt,resolved_bug_cnt,active_bug_cnt,confirmed_bug_cnt,bug_cnt
 	</sql>
-	
+
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
 	<sql id="where">
-		<if test="id != null and id != ''">      and res.id = #{id}     </if>
 		<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>
@@ -146,7 +147,7 @@
 		<if test="menuCnt != null and menuCnt != ''">      and res.menu_cnt = #{menuCnt}     </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 TO_CHAR(res.calc_time,'YYYY-MM-DD') = TO_CHAR(#{calcTime},'YYYY-MM-DD')     </if>
+		<if test="calcTime != null">      and date_format(res.calc_time,'%Y-%m-%d') = date_format(#{calcTime},'%Y-%m-%d')     </if>
 		<if test="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>
@@ -179,7 +180,6 @@
 		iteration_name = #{iterationName},
 		budget_cost = #{budgetCost},
 		budget_workload = #{budgetWorkload},
-		iteration_id = #{iterationId},
 		biz_date = #{bizDate},
 		closed_bug_cnt = #{closedBugCnt},
 		resolved_bug_cnt = #{resolvedBugCnt},
@@ -207,7 +207,6 @@
 		<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="iterationId != null and iterationId != ''"> iteration_id = #{iterationId},     </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>
@@ -236,7 +235,6 @@
 			iteration_name = #{item.iterationName},
 			budget_cost = #{item.budgetCost},
 			budget_workload = #{item.budgetWorkload},
-			iteration_id = #{item.iterationId},
 			biz_date = #{item.bizDate},
 			closed_bug_cnt = #{item.closedBugCnt},
 			resolved_bug_cnt = #{item.resolvedBugCnt},
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuPlanMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuPlanMapper.xml
index f8d90419..e37bdd1b 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuPlanMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuPlanMapper.xml
@@ -6,9 +6,9 @@
 	<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 -->
 
     <sql id="whereForMap">
-         <if test=" ids != null">  and (res.id) in
-             <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
-                 ( #{item})
+         <if test=" pkList != null">  and (res.project_id, res.menu_id) in
+             <foreach collection="pkList" item="item" index="index" open="(" separator="," close=")" >
+                ( #{item.projectId},  #{item.menuId})
              </foreach>
          </if>
         <if test="key != null and key !='' ">       </if>
@@ -43,14 +43,16 @@
 	<select id="selectOneObject" parameterType="com.xm.core.entity.XmMenuPlan" resultType="com.xm.core.entity.XmMenuPlan">
 		select * from xm_menu_plan res
 		where 
-			res.id = #{id}
+			res.project_id = #{projectId}
+			and res.menu_id = #{menuId}
 	</select>
 	
 	<!-- 通过主键查询获取数据对象 返回map-->
 	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
 		select * from xm_menu_plan res
 		where 
-			 res.id = #{id}
+			 res.project_id = #{projectId}
+			and  res.menu_id = #{menuId}
 	</select>
 	<!-- 获取数据条目 返回long -->
 	<select id="countByWhere" parameterType="com.xm.core.entity.XmMenuPlan" resultType="long">
@@ -59,12 +61,12 @@
 			<include refid="where"/>
 		</where>
 	</select>
-	<!-- 新增一条记录  主键id,-->
-	<insert id="insert" parameterType="com.xm.core.entity.XmMenuPlan" useGeneratedKeys="false"   keyProperty="id">
+	<!-- 新增一条记录  主键project_id,menu_id,-->
+	<insert id="insert" parameterType="com.xm.core.entity.XmMenuPlan" useGeneratedKeys="false"  >
 		insert into xm_menu_plan(
 			<include refid="columns"/>
 		) values (
-		#{projectId},#{id},#{projectName},#{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},#{testCases},#{execCases},#{designCases},#{finishCases},#{iterationCnt},#{taskCnt},#{finishTaskCnt},#{productId},#{productName},#{bugCnt}
+		#{projectId},#{projectName},#{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},#{testCases},#{execCases},#{designCases},#{finishCases},#{iterationCnt},#{taskCnt},#{finishTaskCnt},#{productId},#{productName},#{bugCnt}
 		)
 	</insert>
 	
@@ -79,7 +81,7 @@
 	<!-- 按主键删除一条记录-->
 	<delete id="deleteByPk" parameterType="com.xm.core.entity.XmMenuPlan">
 		delete from xm_menu_plan 
-		where id = #{id} 
+		where project_id = #{projectId} and menu_id = #{menuId} 
 	</delete>
 	
 	<!-- 根据条件修改若干条记录 -->
@@ -88,7 +90,7 @@
 		<set>
 			<include refid="someFieldSet"/>
 		</set>
-		where id = #{id} 
+		where project_id = #{projectId} and menu_id = #{menuId} 
 	</update>
 	
 		<!-- 根据主键修改一条记录 -->
@@ -97,7 +99,7 @@
 		<set>
 			<include refid="set"/>
 		</set>
-		where id = #{id} 
+		where project_id = #{projectId} and menu_id = #{menuId} 
 	</update>
 
 	<!-- 批量新增  批量插入 借用insert 循环插入实现
@@ -111,29 +113,28 @@
    		update  xm_menu_plan 
 		set 
 			<include refid="batchSet"/>
-			where id = #{item.id}  
+			where project_id = #{item.projectId} and menu_id = #{item.menuId}  
 		</foreach> 
 	</update>
 	<!-- 批量删除 -->
 	<delete id="batchDelete" parameterType="List">  
 		delete from xm_menu_plan 
 			where
-			(id) in
+			(project_id, menu_id) in
                 <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
-                    (  #{item.id} )
+                    (  #{item.projectId},  #{item.menuId} )
                 </foreach>
 	</delete>
 	
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		project_id,id,project_name,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,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,task_cnt,finish_task_cnt,product_id,product_name,bug_cnt
+		project_id,project_name,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,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,task_cnt,finish_task_cnt,product_id,product_name,bug_cnt
 	</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="id != null and id != ''">      and res.id = #{id}     </if>
 		<if test="projectName != null and projectName != ''">      and res.project_name = #{projectName}     </if>
 		<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>
@@ -181,9 +182,7 @@
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
-		project_id = #{projectId},
 		project_name = #{projectName},
-		menu_id = #{menuId},
 		plan_start_time = #{planStartTime},
 		plan_end_time = #{planEndTime},
 		act_start_time = #{actStartTime},
@@ -228,9 +227,7 @@
 		bug_cnt = #{bugCnt}
 	</sql>
 	<sql id="someFieldSet">
-		<if test="projectId != null and projectId != ''"> project_id = #{projectId},     </if>
 		<if test="projectName != null and projectName != ''"> project_name = #{projectName},     </if>
-		<if test="menuId != null and menuId != ''"> menu_id = #{menuId},     </if>
 		<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>
@@ -276,9 +273,7 @@
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
-			project_id = #{item.projectId},
 			project_name = #{item.projectName},
-			menu_id = #{item.menuId},
 			plan_start_time = #{item.planStartTime},
 			plan_end_time = #{item.planEndTime},
 			act_start_time = #{item.actStartTime},
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 86fa2ecc..59abaa02 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
@@ -6,8 +6,8 @@
 	<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 -->
 
     <sql id="whereForMap">
-         <if test=" ids != null">  and (res.id) in
-             <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
+         <if test=" menuIds != null">  and (res.menu_id) in
+             <foreach collection="menuIds" item="item" index="index" open="(" separator="," close=")" >
                  ( #{item})
              </foreach>
          </if>
@@ -149,14 +149,14 @@
 	<select id="selectOneObject" parameterType="com.xm.core.entity.XmMenuState" resultType="com.xm.core.entity.XmMenuState">
 		select * from xm_menu_state res
 		where 
-			res.id = #{id}
+			res.menu_id = #{menuId}
 	</select>
 	
 	<!-- 通过主键查询获取数据对象 返回map-->
 	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
 		select * from xm_menu_state res
 		where 
-			 res.id = #{id}
+			 res.menu_id = #{menuId}
 	</select>
 	<!-- 获取数据条目 返回long -->
 	<select id="countByWhere" parameterType="com.xm.core.entity.XmMenuState" resultType="long">
@@ -165,12 +165,12 @@
 			<include refid="where"/>
 		</where>
 	</select>
-	<!-- 新增一条记录  主键id,-->
-	<insert id="insert" parameterType="com.xm.core.entity.XmMenuState" useGeneratedKeys="false"   keyProperty="id">
+	<!-- 新增一条记录  主键menu_id,-->
+	<insert id="insert" parameterType="com.xm.core.entity.XmMenuState" useGeneratedKeys="false"   keyProperty="menu_id">
 		insert into xm_menu_state(
 			<include refid="columns"/>
 		) values (
-		#{id},#{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},#{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}
 		)
 	</insert>
 	
@@ -185,7 +185,7 @@
 	<!-- 按主键删除一条记录-->
 	<delete id="deleteByPk" parameterType="com.xm.core.entity.XmMenuState">
 		delete from xm_menu_state 
-		where id = #{id} 
+		where menu_id = #{menuId} 
 	</delete>
 	
 	<!-- 根据条件修改若干条记录 -->
@@ -194,7 +194,7 @@
 		<set>
 			<include refid="someFieldSet"/>
 		</set>
-		where id = #{id} 
+		where menu_id = #{menuId} 
 	</update>
 	
 		<!-- 根据主键修改一条记录 -->
@@ -203,7 +203,7 @@
 		<set>
 			<include refid="set"/>
 		</set>
-		where id = #{id} 
+		where menu_id = #{menuId} 
 	</update>
 
 	<!-- 批量新增  批量插入 借用insert 循环插入实现
@@ -217,28 +217,27 @@
    		update  xm_menu_state 
 		set 
 			<include refid="batchSet"/>
-			where id = #{item.id}  
+			where menu_id = #{item.menuId}  
 		</foreach> 
 	</update>
 	<!-- 批量删除 -->
 	<delete id="batchDelete" parameterType="List">  
 		delete from xm_menu_state 
 			where
-			(id) in
+			(menu_id) in
                 <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
-                    (  #{item.id} )
+                    (  #{item.menuId} )
                 </foreach>
 	</delete>
 	
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		id,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,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
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
 	<sql id="where">
-		<if test="id != null and id != ''">      and res.id = #{id}     </if>
 		<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>
@@ -287,7 +286,6 @@
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
-		menu_id = #{menuId},
 		plan_start_time = #{planStartTime},
 		plan_end_time = #{planEndTime},
 		act_start_time = #{actStartTime},
@@ -334,7 +332,6 @@
 		bug_cnt = #{bugCnt}
 	</sql>
 	<sql id="someFieldSet">
-		<if test="menuId != null and menuId != ''"> menu_id = #{menuId},     </if>
 		<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>
@@ -382,7 +379,6 @@
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
-			menu_id = #{item.menuId},
 			plan_start_time = #{item.planStartTime},
 			plan_end_time = #{item.planEndTime},
 			act_start_time = #{item.actStartTime},
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 c192c695..f0416a06 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
@@ -3,14 +3,21 @@
 <mapper namespace="com.xm.core.entity.XmProductState">
 	
 	
-	<!--开始 自定sql函数区域 -->
-		<!--请在此区域添加自定义函数-->
-		
-		
-		
+	<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 -->
+
+    <sql id="whereForMap">
+         <if test=" productIds != null">  and (res.product_id) in
+             <foreach collection="productIds" item="item" index="index" open="(" separator="," close=")" >
+                 ( #{item})
+             </foreach>
+         </if>
+        <if test="key != null and key !='' ">       </if>
+    </sql>
 	<update id="loadTasksToXmProductState" parameterType="String" statementType="CALLABLE">
-		 {call load_tasks_to_xm_product_state(#{productId,mode=IN})} 
+		{call load_tasks_to_xm_product_state(#{productId,mode=IN})}
 	</update>
+
+
 	<!--结束 自定义sql函数区域-->
 	
 
@@ -18,15 +25,9 @@
 	<!-- 通过条件查询获取数据列表 返回list<map> -->
 	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
 		select * from xm_product_state res
-		<where> 
-			<if test="ids != null">  and     
-				id in
-				    <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >  
-				        #{item}  
-				    </foreach>  
-			 </if>
+		<where>
+		    <include refid="whereForMap"/>
 			<include refid="where"/>
-			<if test="key != null and key !='' ">       </if> 
 		</where>
 	</select>
 	
@@ -42,14 +43,14 @@
 	<select id="selectOneObject" parameterType="com.xm.core.entity.XmProductState" resultType="com.xm.core.entity.XmProductState">
 		select * from xm_product_state res
 		where 
-			res.id = #{id}
+			res.product_id = #{productId}
 	</select>
 	
 	<!-- 通过主键查询获取数据对象 返回map-->
 	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
 		select * from xm_product_state res
 		where 
-			 res.id = #{id}
+			 res.product_id = #{productId}
 	</select>
 	<!-- 获取数据条目 返回long -->
 	<select id="countByWhere" parameterType="com.xm.core.entity.XmProductState" resultType="long">
@@ -58,12 +59,12 @@
 			<include refid="where"/>
 		</where>
 	</select>
-	<!-- 新增一条记录  主键id,-->
-	<insert id="insert" parameterType="com.xm.core.entity.XmProductState" useGeneratedKeys="false" keyProperty="id">
+	<!-- 新增一条记录  主键product_id,-->
+	<insert id="insert" parameterType="com.xm.core.entity.XmProductState" useGeneratedKeys="false"   keyProperty="product_id">
 		insert into xm_product_state(
 			<include refid="columns"/>
 		) values (
-		#{id},#{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}
+		#{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}
 		)
 	</insert>
 	
@@ -77,26 +78,26 @@
 	
 	<!-- 按主键删除一条记录-->
 	<delete id="deleteByPk" parameterType="com.xm.core.entity.XmProductState">
-		delete from xm_product_state
-		where id = #{id} 
+		delete from xm_product_state 
+		where product_id = #{productId} 
 	</delete>
 	
 	<!-- 根据条件修改若干条记录 -->
 	<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProductState">
-		update  xm_product_state
+		update  xm_product_state 
 		<set>
 			<include refid="someFieldSet"/>
 		</set>
-		where id = #{id} 
+		where product_id = #{productId} 
 	</update>
 	
 		<!-- 根据主键修改一条记录 -->
 	<update id="updateByPk" parameterType="com.xm.core.entity.XmProductState">
-		update  xm_product_state
+		update  xm_product_state 
 		<set>
 			<include refid="set"/>
 		</set>
-		where id = #{id} 
+		where product_id = #{productId} 
 	</update>
 
 	<!-- 批量新增  批量插入 借用insert 循环插入实现
@@ -107,34 +108,34 @@
 	<!-- 批量更新 -->
 	<update id="batchUpdate" parameterType="List">   
 		<foreach collection="list" item="item" index="index" separator=";" >
-   		update  xm_product_state
+   		update  xm_product_state 
 		set 
 			<include refid="batchSet"/>
-			where id = #{item.id}  
+			where product_id = #{item.productId}  
 		</foreach> 
 	</update>
 	<!-- 批量删除 -->
 	<delete id="batchDelete" parameterType="List">  
-		delete from xm_product_state
-			where id in
-			    <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >  
-			        #{item.id }  
-			    </foreach>  
+		delete from xm_product_state 
+			where
+			(product_id) in
+                <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
+                    (  #{item.productId} )
+                </foreach>
 	</delete>
 	
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		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,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
+		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
 	</sql>
-	
+
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
 	<sql id="where">
-		<if test="id != null and id != ''">      and res.id = #{id}     </if>
-		<if test="planStartTime != null">      and TO_CHAR(res.plan_start_time,'YYYY-MM-DD') = TO_CHAR(#{planStartTime},'YYYY-MM-DD')     </if>
-		<if test="planEndTime != null">      and TO_CHAR(res.plan_end_time,'YYYY-MM-DD') = TO_CHAR(#{planEndTime},'YYYY-MM-DD')     </if>
-		<if test="actStartTime != null">      and TO_CHAR(res.act_start_time,'YYYY-MM-DD') = TO_CHAR(#{actStartTime},'YYYY-MM-DD')     </if>
-		<if test="actEndTime != null">      and TO_CHAR(res.act_end_time,'YYYY-MM-DD') = TO_CHAR(#{actEndTime},'YYYY-MM-DD')     </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>
@@ -145,11 +146,11 @@
 		<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 TO_CHAR(res.ctime,'YYYY-MM-DD') = TO_CHAR(#{ctime},'YYYY-MM-DD')     </if>
-		<if test="ltime != null">      and TO_CHAR(res.ltime,'YYYY-MM-DD') = TO_CHAR(#{ltime},'YYYY-MM-DD')     </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 TO_CHAR(res.calc_time,'YYYY-MM-DD') = TO_CHAR(#{calcTime},'YYYY-MM-DD')     </if>
+		<if test="calcTime != null">      and date_format(res.calc_time,'%Y-%m-%d') = date_format(#{calcTime},'%Y-%m-%d')     </if>
 		<if test="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>
@@ -169,6 +170,7 @@
 		<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="menuCnt != null and menuCnt != ''">      and res.menu_cnt = #{menuCnt}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -197,7 +199,6 @@
 		active_bugs = #{activeBugs},
 		confirmed_bugs = #{confirmedBugs},
 		resolved_bugs = #{resolvedBugs},
-		product_id = #{productId},
 		product_name = #{productName},
 		test_cases = #{testCases},
 		exec_cases = #{execCases},
@@ -209,7 +210,8 @@
 		finish_task_cnt = #{finishTaskCnt},
 		biz_date = #{bizDate},
 		branch_id = #{branchId},
-		bug_cnt = #{bugCnt}
+		bug_cnt = #{bugCnt},
+		menu_cnt = #{menuCnt}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="planStartTime != null"> plan_start_time = #{planStartTime},     </if>
@@ -237,7 +239,6 @@
 		<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="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>
@@ -250,6 +251,7 @@
 		<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="menuCnt != null and menuCnt != ''"> menu_cnt = #{menuCnt},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -278,7 +280,6 @@
 			active_bugs = #{item.activeBugs},
 			confirmed_bugs = #{item.confirmedBugs},
 			resolved_bugs = #{item.resolvedBugs},
-			product_id = #{item.productId},
 			product_name = #{item.productName},
 			test_cases = #{item.testCases},
 			exec_cases = #{item.execCases},
@@ -290,6 +291,7 @@
 			finish_task_cnt = #{item.finishTaskCnt},
 			biz_date = #{item.bizDate},
 			branch_id = #{item.branchId},
-			bug_cnt = #{item.bugCnt}
+			bug_cnt = #{item.bugCnt},
+			menu_cnt = #{item.menuCnt}
 	</sql>
 </mapper>
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupStateMapper.xml
index 2bdc7fdc..0518993c 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupStateMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupStateMapper.xml
@@ -3,14 +3,21 @@
 <mapper namespace="com.xm.core.entity.XmProjectGroupState">
 	
 	
-	<!--开始 自定sql函数区域 -->
-		<!--请在此区域添加自定义函数-->
-		
-		
+	<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 -->
+
+    <sql id="whereForMap">
+         <if test=" groupIds != null">  and (res.group_id) in
+             <foreach collection="groupIds" item="item" index="index" open="(" separator="," close=")" >
+                 ( #{item})
+             </foreach>
+         </if>
+        <if test="key != null and key !='' ">       </if>
+    </sql>
 	<update id="loadTasksToXmProjectGroupState" parameterType="String" statementType="CALLABLE">
-		 {call load_tasks_to_xm_project_group_state(#{projectId,mode=IN})} 
+		{call load_tasks_to_xm_project_group_state(#{projectId,mode=IN})}
 	</update>
-		
+
+
 	<!--结束 自定义sql函数区域-->
 	
 
@@ -18,15 +25,9 @@
 	<!-- 通过条件查询获取数据列表 返回list<map> -->
 	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
 		select * from xm_project_group_state res
-		<where> 
-			<if test="ids != null">  and     
-				id in
-				    <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >  
-				        #{item}  
-				    </foreach>  
-			 </if>
+		<where>
+		    <include refid="whereForMap"/>
 			<include refid="where"/>
-			<if test="key != null and key !='' ">       </if> 
 		</where>
 	</select>
 	
@@ -42,14 +43,14 @@
 	<select id="selectOneObject" parameterType="com.xm.core.entity.XmProjectGroupState" resultType="com.xm.core.entity.XmProjectGroupState">
 		select * from xm_project_group_state res
 		where 
-			res.id = #{id}
+			res.group_id = #{groupId}
 	</select>
 	
 	<!-- 通过主键查询获取数据对象 返回map-->
 	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
 		select * from xm_project_group_state res
 		where 
-			 res.id = #{id}
+			 res.group_id = #{groupId}
 	</select>
 	<!-- 获取数据条目 返回long -->
 	<select id="countByWhere" parameterType="com.xm.core.entity.XmProjectGroupState" resultType="long">
@@ -58,12 +59,12 @@
 			<include refid="where"/>
 		</where>
 	</select>
-	<!-- 新增一条记录  主键id,-->
-	<insert id="insert" parameterType="com.xm.core.entity.XmProjectGroupState" useGeneratedKeys="false" keyProperty="id">
+	<!-- 新增一条记录  主键group_id,-->
+	<insert id="insert" parameterType="com.xm.core.entity.XmProjectGroupState" useGeneratedKeys="false"   keyProperty="group_id">
 		insert into xm_project_group_state(
 			<include refid="columns"/>
 		) values (
-		#{id},#{planStartTime},#{planEndTime},#{actStartTime},#{actEndTime},#{planWorkload},#{actWorkload},#{planCostAmount},#{actCostAmount},#{finishRate},#{demandRate},#{designRate},#{devRate},#{uatRate},#{sitRate},#{ctime},#{calcTime},#{planWorkhours},#{planWorkerCnt},#{closedBugs},#{activeBugs},#{confirmedBugs},#{resolvedBugs},#{testCases},#{execCases},#{designCases},#{finishCases},#{iterationCnt},#{taskCnt},#{finishTaskCnt},#{bizDate},#{bugCnt},#{groupId},#{projectId},#{projectName},#{groupName}
+		#{planStartTime},#{planEndTime},#{actStartTime},#{actEndTime},#{planWorkload},#{actWorkload},#{planCostAmount},#{actCostAmount},#{finishRate},#{demandRate},#{designRate},#{devRate},#{uatRate},#{sitRate},#{ctime},#{calcTime},#{planWorkhours},#{planWorkerCnt},#{closedBugs},#{activeBugs},#{confirmedBugs},#{resolvedBugs},#{testCases},#{execCases},#{designCases},#{finishCases},#{iterationCnt},#{taskCnt},#{finishTaskCnt},#{bizDate},#{bugCnt},#{groupId},#{projectId},#{projectName},#{groupName}
 		)
 	</insert>
 	
@@ -77,26 +78,26 @@
 	
 	<!-- 按主键删除一条记录-->
 	<delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectGroupState">
-		delete from xm_project_group_state
-		where id = #{id} 
+		delete from xm_project_group_state 
+		where group_id = #{groupId} 
 	</delete>
 	
 	<!-- 根据条件修改若干条记录 -->
 	<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectGroupState">
-		update  xm_project_group_state
+		update  xm_project_group_state 
 		<set>
 			<include refid="someFieldSet"/>
 		</set>
-		where id = #{id} 
+		where group_id = #{groupId} 
 	</update>
 	
 		<!-- 根据主键修改一条记录 -->
 	<update id="updateByPk" parameterType="com.xm.core.entity.XmProjectGroupState">
-		update  xm_project_group_state
+		update  xm_project_group_state 
 		<set>
 			<include refid="set"/>
 		</set>
-		where id = #{id} 
+		where group_id = #{groupId} 
 	</update>
 
 	<!-- 批量新增  批量插入 借用insert 循环插入实现
@@ -107,34 +108,34 @@
 	<!-- 批量更新 -->
 	<update id="batchUpdate" parameterType="List">   
 		<foreach collection="list" item="item" index="index" separator=";" >
-   		update  xm_project_group_state
+   		update  xm_project_group_state 
 		set 
 			<include refid="batchSet"/>
-			where id = #{item.id}  
+			where group_id = #{item.groupId}  
 		</foreach> 
 	</update>
 	<!-- 批量删除 -->
 	<delete id="batchDelete" parameterType="List">  
-		delete from xm_project_group_state
-			where id in
-			    <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >  
-			        #{item.id }  
-			    </foreach>  
+		delete from xm_project_group_state 
+			where
+			(group_id) in
+                <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
+                    (  #{item.groupId} )
+                </foreach>
 	</delete>
 	
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		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,ctime,calc_time,plan_workhours,plan_worker_cnt,closed_bugs,active_bugs,confirmed_bugs,resolved_bugs,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,task_cnt,finish_task_cnt,biz_date,bug_cnt,group_id,project_id,project_name,group_name
+		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,calc_time,plan_workhours,plan_worker_cnt,closed_bugs,active_bugs,confirmed_bugs,resolved_bugs,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,task_cnt,finish_task_cnt,biz_date,bug_cnt,group_id,project_id,project_name,group_name
 	</sql>
-	
+
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
 	<sql id="where">
-		<if test="id != null and id != ''">      and res.id = #{id}     </if>
-		<if test="planStartTime != null">      and TO_CHAR(res.plan_start_time,'YYYY-MM-DD') = TO_CHAR(#{planStartTime},'YYYY-MM-DD')     </if>
-		<if test="planEndTime != null">      and TO_CHAR(res.plan_end_time,'YYYY-MM-DD') = TO_CHAR(#{planEndTime},'YYYY-MM-DD')     </if>
-		<if test="actStartTime != null">      and TO_CHAR(res.act_start_time,'YYYY-MM-DD') = TO_CHAR(#{actStartTime},'YYYY-MM-DD')     </if>
-		<if test="actEndTime != null">      and TO_CHAR(res.act_end_time,'YYYY-MM-DD') = TO_CHAR(#{actEndTime},'YYYY-MM-DD')     </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>
@@ -145,8 +146,8 @@
 		<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 TO_CHAR(res.ctime,'YYYY-MM-DD') = TO_CHAR(#{ctime},'YYYY-MM-DD')     </if>
-		<if test="calcTime != null">      and TO_CHAR(res.calc_time,'YYYY-MM-DD') = TO_CHAR(#{calcTime},'YYYY-MM-DD')     </if>
+		<if test="ctime != null">      and date_format(res.ctime,'%Y-%m-%d') = date_format(#{ctime},'%Y-%m-%d')     </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>
@@ -200,7 +201,6 @@
 		finish_task_cnt = #{finishTaskCnt},
 		biz_date = #{bizDate},
 		bug_cnt = #{bugCnt},
-		group_id = #{groupId},
 		project_id = #{projectId},
 		project_name = #{projectName},
 		group_name = #{groupName}
@@ -237,7 +237,6 @@
 		<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="groupId != null and groupId != ''"> group_id = #{groupId},     </if>
 		<if test="projectId != null and projectId != ''"> project_id = #{projectId},     </if>
 		<if test="projectName != null and projectName != ''"> project_name = #{projectName},     </if>
 		<if test="groupName != null and groupName != ''"> group_name = #{groupName},     </if>
@@ -275,7 +274,6 @@
 			finish_task_cnt = #{item.finishTaskCnt},
 			biz_date = #{item.bizDate},
 			bug_cnt = #{item.bugCnt},
-			group_id = #{item.groupId},
 			project_id = #{item.projectId},
 			project_name = #{item.projectName},
 			group_name = #{item.groupName}
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 98927ce5..0d1591eb 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
@@ -3,23 +3,24 @@
 <mapper namespace="com.xm.core.entity.XmProjectState">
 	
 	
-	<!--开始 自定sql函数区域 -->
-		<!--请在此区域添加自定义函数-->
+	<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 -->
 
-	<select id="selectPortalProjectStates" parameterType="HashMap" resultType="HashMap">
-		select * from xm_project_state res
-		<where>
-			res.calc_time > DATE_SUB(now(),INTERVAL 7 DAY)
-		</where>
-	</select>
-			
-	<!-- 根据条件修改若干条记录 --> 
+    <sql id="whereForMap">
+         <if test=" projectIds != null">  and (res.project_id) in
+             <foreach collection="projectIds" item="item" index="index" open="(" separator="," close=")" >
+                 ( #{item})
+             </foreach>
+         </if>
+        <if test="key != null and key !='' ">       </if>
+    </sql>
 	<update id="loadTasksToXmProjectState" parameterType="String" statementType="CALLABLE">
-		 {call load_tasks_to_xm_project_state(#{projectId,mode=IN})} 
+		{call load_tasks_to_xm_project_state(#{projectId,mode=IN})}
 	</update>
 	<update id="loadTasksSettleToXmProjectState" parameterType="String" statementType="CALLABLE">
-		 {call load_tasks_settle_to_xm_project_state(#{projectId,mode=IN})} 
+		{call load_tasks_settle_to_xm_project_state(#{projectId,mode=IN})}
 	</update>
+
+
 	<!--结束 自定义sql函数区域-->
 	
 
@@ -27,15 +28,9 @@
 	<!-- 通过条件查询获取数据列表 返回list<map> -->
 	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
 		select * from xm_project_state res
-		<where> 
-			<if test="ids != null">  and     
-				id in
-				    <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >  
-				        #{item}  
-				    </foreach>  
-			 </if>
+		<where>
+		    <include refid="whereForMap"/>
 			<include refid="where"/>
-			<if test="key != null and key !='' ">       </if> 
 		</where>
 	</select>
 	
@@ -51,14 +46,14 @@
 	<select id="selectOneObject" parameterType="com.xm.core.entity.XmProjectState" resultType="com.xm.core.entity.XmProjectState">
 		select * from xm_project_state res
 		where 
-			res.id = #{id}
+			res.project_id = #{projectId}
 	</select>
 	
 	<!-- 通过主键查询获取数据对象 返回map-->
 	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
 		select * from xm_project_state res
 		where 
-			 res.id = #{id}
+			 res.project_id = #{projectId}
 	</select>
 	<!-- 获取数据条目 返回long -->
 	<select id="countByWhere" parameterType="com.xm.core.entity.XmProjectState" resultType="long">
@@ -67,12 +62,12 @@
 			<include refid="where"/>
 		</where>
 	</select>
-	<!-- 新增一条记录  主键id,-->
-	<insert id="insert" parameterType="com.xm.core.entity.XmProjectState" useGeneratedKeys="false" keyProperty="id">
+	<!-- 新增一条记录  主键project_id,-->
+	<insert id="insert" parameterType="com.xm.core.entity.XmProjectState" useGeneratedKeys="false"   keyProperty="project_id">
 		insert into xm_project_state(
 			<include refid="columns"/>
 		) values (
-		#{projectId},#{bizDate},#{totalFileCnt},#{totalBugCnt},#{totalTaskCnt},#{totalBudgetNouserAmount},#{projectName},#{id},#{totalStaffCnt},#{calcTime},#{calcStatus},#{totalCostNouserAmount},#{totalClosedBugCnt},#{totalResolvedBugCnt},#{totalCompleteTaskCnt},#{totalPhaseCnt},#{totalCompletePhaseCnt},#{totalNeedPayAmount},#{totalFinishPayAmount},#{totalNeedColAmount},#{totalFinishColAmount},#{totalCostUserAmount},#{totalBudgetInnerUserAmount},#{totalPlanWorkload},#{totalRiskCnt},#{totalCompleteRiskCnt},#{branchId},#{branchName},#{totalBudgetOutUserAmount},#{totalCompleteWorkload},#{totalCostInnerUserAmount},#{totalCostOutUserAmount},#{totalProgress},#{totalActiveBugCnt},#{totalConfirmedBugCnt},#{projectStatus},#{totalActWorkload},#{totalActOutWorkload},#{totalActInnerWorkload},#{totalTaskBudgetCostAt},#{totalTaskOutCnt},#{totalNeedPayCnt},#{totalFinishPayCnt},#{totalFinishPayUserCnt},#{totalNeedPayUserCnt},#{totalPlanInnerUserWorkload},#{totalPlanOutUserWorkload},#{testCases},#{execCases},#{designCases},#{finishCases},#{iterationCnt},#{productCnt},#{menuCnt}
+		#{projectId},#{bizDate},#{totalFileCnt},#{totalBugCnt},#{totalTaskCnt},#{totalBudgetNouserAmount},#{projectName},#{totalStaffCnt},#{calcTime},#{calcStatus},#{totalCostNouserAmount},#{totalClosedBugCnt},#{totalResolvedBugCnt},#{totalCompleteTaskCnt},#{totalPhaseCnt},#{totalCompletePhaseCnt},#{totalNeedPayAmount},#{totalFinishPayAmount},#{totalNeedColAmount},#{totalFinishColAmount},#{totalCostUserAmount},#{totalBudgetInnerUserAmount},#{totalPlanWorkload},#{totalRiskCnt},#{totalCompleteRiskCnt},#{branchId},#{branchName},#{totalBudgetOutUserAmount},#{totalCompleteWorkload},#{totalCostInnerUserAmount},#{totalCostOutUserAmount},#{totalProgress},#{totalActiveBugCnt},#{totalConfirmedBugCnt},#{projectStatus},#{totalActWorkload},#{totalActOutWorkload},#{totalActInnerWorkload},#{totalTaskBudgetCostAt},#{totalTaskOutCnt},#{totalNeedPayCnt},#{totalFinishPayCnt},#{totalFinishPayUserCnt},#{totalNeedPayUserCnt},#{totalPlanInnerUserWorkload},#{totalPlanOutUserWorkload},#{testCases},#{execCases},#{designCases},#{finishCases},#{iterationCnt},#{productCnt},#{menuCnt}
 		)
 	</insert>
 	
@@ -86,26 +81,26 @@
 	
 	<!-- 按主键删除一条记录-->
 	<delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectState">
-		delete from xm_project_state
-		where id = #{id} 
+		delete from xm_project_state 
+		where project_id = #{projectId} 
 	</delete>
 	
 	<!-- 根据条件修改若干条记录 -->
 	<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectState">
-		update  xm_project_state
+		update  xm_project_state 
 		<set>
 			<include refid="someFieldSet"/>
 		</set>
-		where id = #{id} 
+		where project_id = #{projectId} 
 	</update>
 	
 		<!-- 根据主键修改一条记录 -->
 	<update id="updateByPk" parameterType="com.xm.core.entity.XmProjectState">
-		update  xm_project_state
+		update  xm_project_state 
 		<set>
 			<include refid="set"/>
 		</set>
-		where id = #{id} 
+		where project_id = #{projectId} 
 	</update>
 
 	<!-- 批量新增  批量插入 借用insert 循环插入实现
@@ -116,27 +111,28 @@
 	<!-- 批量更新 -->
 	<update id="batchUpdate" parameterType="List">   
 		<foreach collection="list" item="item" index="index" separator=";" >
-   		update  xm_project_state
+   		update  xm_project_state 
 		set 
 			<include refid="batchSet"/>
-			where id = #{item.id}  
+			where project_id = #{item.projectId}  
 		</foreach> 
 	</update>
 	<!-- 批量删除 -->
 	<delete id="batchDelete" parameterType="List">  
-		delete from xm_project_state
-			where id in
-			    <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >  
-			        #{item.id }  
-			    </foreach>  
+		delete from xm_project_state 
+			where
+			(project_id) in
+                <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
+                    (  #{item.projectId} )
+                </foreach>
 	</delete>
 	
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		project_id,biz_date,total_file_cnt,total_bug_cnt,total_task_cnt,total_budget_nouser_amount,project_name,id,total_staff_cnt,calc_time,calc_status,total_cost_nouser_amount,total_closed_bug_cnt,total_resolved_bug_cnt,total_complete_task_cnt,total_phase_cnt,total_complete_phase_cnt,total_need_pay_amount,total_finish_pay_amount,total_need_col_amount,total_finish_col_amount,total_cost_user_amount,total_budget_inner_user_amount,total_plan_workload,total_risk_cnt,total_complete_risk_cnt,branch_id,branch_name,total_budget_out_user_amount,total_complete_workload,total_cost_inner_user_amount,total_cost_out_user_amount,total_progress,total_active_bug_cnt,total_confirmed_bug_cnt,project_status,total_act_workload,total_act_out_workload,total_act_inner_workload,total_task_budget_cost_at,total_task_out_cnt,total_need_pay_cnt,total_finish_pay_cnt,total_finish_pay_user_cnt,total_need_pay_user_cnt,total_plan_inner_user_workload,total_plan_out_user_workload,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,menu_cnt
+		project_id,biz_date,total_file_cnt,total_bug_cnt,total_task_cnt,total_budget_nouser_amount,project_name,total_staff_cnt,calc_time,calc_status,total_cost_nouser_amount,total_closed_bug_cnt,total_resolved_bug_cnt,total_complete_task_cnt,total_phase_cnt,total_complete_phase_cnt,total_need_pay_amount,total_finish_pay_amount,total_need_col_amount,total_finish_col_amount,total_cost_user_amount,total_budget_inner_user_amount,total_plan_workload,total_risk_cnt,total_complete_risk_cnt,branch_id,branch_name,total_budget_out_user_amount,total_complete_workload,total_cost_inner_user_amount,total_cost_out_user_amount,total_progress,total_active_bug_cnt,total_confirmed_bug_cnt,project_status,total_act_workload,total_act_out_workload,total_act_inner_workload,total_task_budget_cost_at,total_task_out_cnt,total_need_pay_cnt,total_finish_pay_cnt,total_finish_pay_user_cnt,total_need_pay_user_cnt,total_plan_inner_user_workload,total_plan_out_user_workload,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,product_cnt,menu_cnt
 	</sql>
-	
+
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
 	<sql id="where">
 		<if test="projectId != null and projectId != ''">      and res.project_id = #{projectId}     </if>
@@ -146,9 +142,8 @@
 		<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="projectName != null and projectName != ''">      and res.project_name = #{projectName}     </if>
-		<if test="id != null and id != ''">      and res.id = #{id}     </if>
 		<if test="totalStaffCnt != null and totalStaffCnt != ''">      and res.total_staff_cnt = #{totalStaffCnt}     </if>
-		<if test="calcTime != null">      and TO_CHAR(res.calc_time,'YYYY-MM-DD') = TO_CHAR(#{calcTime},'YYYY-MM-DD')     </if>
+		<if test="calcTime != null">      and date_format(res.calc_time,'%Y-%m-%d') = date_format(#{calcTime},'%Y-%m-%d')     </if>
 		<if test="calcStatus != null and calcStatus != ''">      and res.calc_status = #{calcStatus}     </if>
 		<if test="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>
@@ -196,7 +191,6 @@
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
-		project_id = #{projectId},
 		biz_date = #{bizDate},
 		total_file_cnt = #{totalFileCnt},
 		total_bug_cnt = #{totalBugCnt},
@@ -251,7 +245,6 @@
 		menu_cnt = #{menuCnt}
 	</sql>
 	<sql id="someFieldSet">
-		<if test="projectId != null and projectId != ''"> project_id = #{projectId},     </if>
 		<if test="bizDate != null and bizDate != ''"> biz_date = #{bizDate},     </if>
 		<if test="totalFileCnt != null and totalFileCnt != ''"> total_file_cnt = #{totalFileCnt},     </if>
 		<if test="totalBugCnt != null and totalBugCnt != ''"> total_bug_cnt = #{totalBugCnt},     </if>
@@ -307,7 +300,6 @@
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
-			project_id = #{item.projectId},
 			biz_date = #{item.bizDate},
 			total_file_cnt = #{item.totalFileCnt},
 			total_bug_cnt = #{item.totalBugCnt},