diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProduct.java b/xm-core/src/main/java/com/xm/core/entity/XmProduct.java
index aeda4d3a..550b3a0a 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProduct.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProduct.java
@@ -8,9 +8,9 @@ import java.math.BigDecimal;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmProduct所有属性名: <br>
- *	id,productName,branchId,remark,version,pmUserid,pmUsername,ctime,deptid,pstatus,startTime,endTime,deptName,admUserid,admUsername,assistantUserid,assistantUsername,bizProcInstId,bizFlowState,isTpl,baselineId,baseTime,code,pbudgetWorkload,pbudgetAmount,pmenuBudgetWorkload,pmenuBudgetAmount;<br>
+ *	id,productName,branchId,remark,version,pmUserid,pmUsername,ctime,deptid,pstatus,startTime,endTime,deptName,admUserid,admUsername,assUserid,assUsername,bizProcInstId,bizFlowState,isTpl,baselineId,baseTime,code,pbudgetWorkload,pbudgetAmount,pmenuBudgetWorkload,pmenuBudgetAmount;<br>
  * 表 xm_product 产品表的所有字段名: <br>
- *	id,product_name,branch_id,remark,version,pm_userid,pm_username,ctime,deptid,pstatus,start_time,end_time,dept_name,adm_userid,adm_username,assistant_userid,assistant_username,biz_proc_inst_id,biz_flow_state,is_tpl,baseline_id,base_time,code,pbudget_workload,pbudget_amount,pmenu_budget_workload,pmenu_budget_amount;<br>
+ *	id,product_name,branch_id,remark,version,pm_userid,pm_username,ctime,deptid,pstatus,start_time,end_time,dept_name,adm_userid,adm_username,ass_userid,ass_username,biz_proc_inst_id,biz_flow_state,is_tpl,baseline_id,base_time,code,pbudget_workload,pbudget_amount,pmenu_budget_workload,pmenu_budget_amount;<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -66,10 +66,10 @@ public class XmProduct  implements java.io.Serializable {
 	String admUsername;
 	
 	@ApiModelProperty(notes="副经理编号",allowEmptyValue=true,example="",allowableValues="")
-	String assistantUserid;
+	String assUserid;
 	
 	@ApiModelProperty(notes="副经理名称",allowEmptyValue=true,example="",allowableValues="")
-	String assistantUsername;
+	String assUsername;
 	
 	@ApiModelProperty(notes="当前流程实例编号",allowEmptyValue=true,example="",allowableValues="")
 	String bizProcInstId;
@@ -203,14 +203,14 @@ public class XmProduct  implements java.io.Serializable {
 	/**
 	 * 副经理编号
 	 **/
-	public void setAssistantUserid(String assistantUserid) {
-		this.assistantUserid = assistantUserid;
+	public void setAssUserid(String assUserid) {
+		this.assUserid = assUserid;
 	}
 	/**
 	 * 副经理名称
 	 **/
-	public void setAssistantUsername(String assistantUsername) {
-		this.assistantUsername = assistantUsername;
+	public void setAssUsername(String assUsername) {
+		this.assUsername = assUsername;
 	}
 	/**
 	 * 当前流程实例编号
@@ -366,14 +366,14 @@ public class XmProduct  implements java.io.Serializable {
 	/**
 	 * 副经理编号
 	 **/
-	public String getAssistantUserid() {
-		return this.assistantUserid;
+	public String getAssUserid() {
+		return this.assUserid;
 	}
 	/**
 	 * 副经理名称
 	 **/
-	public String getAssistantUsername() {
-		return this.assistantUsername;
+	public String getAssUsername() {
+		return this.assUsername;
 	}
 	/**
 	 * 当前流程实例编号
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProject.java b/xm-core/src/main/java/com/xm/core/entity/XmProject.java
index 7366e752..6c4735b0 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProject.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProject.java
@@ -8,9 +8,9 @@ import java.math.BigDecimal;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmProject所有属性名: <br>
- *	id,code,name,xmType,startTime,endTime,urgent,priority,description,createUserid,createUsername,createTime,assess,assessRemarks,status,branchId,planTotalCost,bizProcInstId,bizFlowState,planNouserAt,planInnerUserAt,planOutUserAt,locked,baseTime,baseRemark,baselineId,planWorkload,totalReceivables,budgetMarginRate,contractAmt,planInnerUserPrice,planOutUserPrice,planOutUserCnt,planInnerUserCnt,planWorkingHours,taxRate,planInnerUserWorkload,planOutUserWorkload,fromTplId,budgetCtrl,deptid,showOut,isTpl;<br>
+ *	id,code,name,xmType,startTime,endTime,urgent,priority,description,createUserid,createUsername,createTime,assess,assessRemarks,status,branchId,planTotalCost,bizProcInstId,bizFlowState,planNouserAt,planInnerUserAt,planOutUserAt,locked,baseTime,baseRemark,baselineId,planWorkload,totalReceivables,budgetMarginRate,contractAmt,planInnerUserPrice,planOutUserPrice,planOutUserCnt,planInnerUserCnt,planWorkingHours,taxRate,planInnerUserWorkload,planOutUserWorkload,fromTplId,budgetCtrl,deptid,showOut,isTpl,pmUserid,pmUsername,assUserid,assUsername,admUserid,admUsername;<br>
  * 表 xm_project xm_project的所有字段名: <br>
- *	id,code,name,xm_type,start_time,end_time,urgent,priority,description,create_userid,create_username,create_time,assess,assess_remarks,status,branch_id,plan_total_cost,biz_proc_inst_id,biz_flow_state,plan_nouser_at,plan_inner_user_at,plan_out_user_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_inner_user_price,plan_out_user_price,plan_out_user_cnt,plan_inner_user_cnt,plan_working_hours,tax_rate,plan_inner_user_workload,plan_out_user_workload,from_tpl_id,budget_ctrl,deptid,show_out,is_tpl;<br>
+ *	id,code,name,xm_type,start_time,end_time,urgent,priority,description,create_userid,create_username,create_time,assess,assess_remarks,status,branch_id,plan_total_cost,biz_proc_inst_id,biz_flow_state,plan_nouser_at,plan_inner_user_at,plan_out_user_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_inner_user_price,plan_out_user_price,plan_out_user_cnt,plan_inner_user_cnt,plan_working_hours,tax_rate,plan_inner_user_workload,plan_out_user_workload,from_tpl_id,budget_ctrl,deptid,show_out,is_tpl,pm_userid,pm_username,ass_userid,ass_username,adm_userid,adm_username;<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -62,16 +62,7 @@ public class XmProject  implements java.io.Serializable {
 	@ApiModelProperty(notes="考核备注",allowEmptyValue=true,example="",allowableValues="")
 	String assessRemarks;
 	
-	@ApiModelProperty(notes="项目状态，0|初始\n" +
-			"1|售前\n" +
-			"2|立项中\n" +
-			"3|实施中\n" +
-			"4|暂停中\n" +
-			"5|结项中\n" +
-			"6|已结项\n" +
-			"7|售后\n" +
-			"8|已完成\n" +
-			"9|已关闭",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="0|初始",allowEmptyValue=true,example="",allowableValues="")
 	String status;
 	
 	@ApiModelProperty(notes="机构编号",allowEmptyValue=true,example="",allowableValues="")
@@ -86,13 +77,13 @@ public class XmProject  implements java.io.Serializable {
 	@ApiModelProperty(notes="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",allowEmptyValue=true,example="",allowableValues="")
 	String bizFlowState;
 	
-	@ApiModelProperty(notes="非人力成本总预算-应该大于或等于计划非人力总成本",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="非人力成本总预算-应该大于或等于阶段计划非人力总成本",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal planNouserAt;
 	
-	@ApiModelProperty(notes="内部人力成本总预算-应该大于或等于计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="内部人力成本总预算-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal planInnerUserAt;
 	
-	@ApiModelProperty(notes="外购人力成本总预算-应该大于或等于计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="外购人力成本总预算-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal planOutUserAt;
 	
 	@ApiModelProperty(notes="是否锁定整个项目不允许变化0否1是",allowEmptyValue=true,example="",allowableValues="")
@@ -107,7 +98,7 @@ public class XmProject  implements java.io.Serializable {
 	@ApiModelProperty(notes="基线主键",allowEmptyValue=true,example="",allowableValues="")
 	String baselineId;
 	
-	@ApiModelProperty(notes="总预算工作量-应该大于或等于计划总工作量",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="总预算工作量-应该大于或等于阶段计划总工作量",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal planWorkload;
 	
 	@ApiModelProperty(notes="总预计收款金额",allowEmptyValue=true,example="",allowableValues="")
@@ -137,10 +128,10 @@ public class XmProject  implements java.io.Serializable {
 	@ApiModelProperty(notes="税率",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal taxRate;
 	
-	@ApiModelProperty(notes="内部人力总工作量-应该大于或等于计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal planInnerUserWorkload;
 	
-	@ApiModelProperty(notes="外购人力总工作量-应该大于或等于计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal planOutUserWorkload;
 	
 	@ApiModelProperty(notes="关联模板编号",allowEmptyValue=true,example="",allowableValues="")
@@ -157,6 +148,24 @@ public class XmProject  implements java.io.Serializable {
 	
 	@ApiModelProperty(notes="是否为模板",allowEmptyValue=true,example="",allowableValues="")
 	String isTpl;
+	
+	@ApiModelProperty(notes="项目经理编号",allowEmptyValue=true,example="",allowableValues="")
+	String pmUserid;
+	
+	@ApiModelProperty(notes="项目经理名称",allowEmptyValue=true,example="",allowableValues="")
+	String pmUsername;
+	
+	@ApiModelProperty(notes="助理、副经理编号",allowEmptyValue=true,example="",allowableValues="")
+	String assUserid;
+	
+	@ApiModelProperty(notes="助理、副经理姓名",allowEmptyValue=true,example="",allowableValues="")
+	String assUsername;
+	
+	@ApiModelProperty(notes="主管领导编号",allowEmptyValue=true,example="",allowableValues="")
+	String admUserid;
+	
+	@ApiModelProperty(notes="主管领导姓名",allowEmptyValue=true,example="",allowableValues="")
+	String admUsername;
 
 	/**项目编号**/
 	public XmProject(String id) {
@@ -252,17 +261,7 @@ public class XmProject  implements java.io.Serializable {
 		this.assessRemarks = assessRemarks;
 	}
 	/**
-	 * 项目状态，
 	 * 0|初始
-	 * 1|售前
-	 * 2|立项中
-	 * 3|实施中
-	 * 4|暂停中
-	 * 5|结项中
-	 * 6|已结项
-	 * 7|售后
-	 * 8|已完成
-	 * 9|已关闭
 	 **/
 	public void setStatus(String status) {
 		this.status = status;
@@ -292,19 +291,19 @@ public class XmProject  implements java.io.Serializable {
 		this.bizFlowState = bizFlowState;
 	}
 	/**
-	 * 非人力成本总预算-应该大于或等于计划非人力总成本
+	 * 非人力成本总预算-应该大于或等于阶段计划非人力总成本
 	 **/
 	public void setPlanNouserAt(BigDecimal planNouserAt) {
 		this.planNouserAt = planNouserAt;
 	}
 	/**
-	 * 内部人力成本总预算-应该大于或等于计划内部人力总成本
+	 * 内部人力成本总预算-应该大于或等于阶段计划内部人力总成本
 	 **/
 	public void setPlanInnerUserAt(BigDecimal planInnerUserAt) {
 		this.planInnerUserAt = planInnerUserAt;
 	}
 	/**
-	 * 外购人力成本总预算-应该大于或等于计划外购人力总成本
+	 * 外购人力成本总预算-应该大于或等于阶段计划外购人力总成本
 	 **/
 	public void setPlanOutUserAt(BigDecimal planOutUserAt) {
 		this.planOutUserAt = planOutUserAt;
@@ -334,7 +333,7 @@ public class XmProject  implements java.io.Serializable {
 		this.baselineId = baselineId;
 	}
 	/**
-	 * 总预算工作量-应该大于或等于计划总工作量
+	 * 总预算工作量-应该大于或等于阶段计划总工作量
 	 **/
 	public void setPlanWorkload(BigDecimal planWorkload) {
 		this.planWorkload = planWorkload;
@@ -394,13 +393,13 @@ public class XmProject  implements java.io.Serializable {
 		this.taxRate = taxRate;
 	}
 	/**
-	 * 内部人力总工作量-应该大于或等于计划内部人力总成本
+	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
 	 **/
 	public void setPlanInnerUserWorkload(BigDecimal planInnerUserWorkload) {
 		this.planInnerUserWorkload = planInnerUserWorkload;
 	}
 	/**
-	 * 外购人力总工作量-应该大于或等于计划外购人力总成本
+	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
 	 **/
 	public void setPlanOutUserWorkload(BigDecimal planOutUserWorkload) {
 		this.planOutUserWorkload = planOutUserWorkload;
@@ -435,6 +434,42 @@ public class XmProject  implements java.io.Serializable {
 	public void setIsTpl(String isTpl) {
 		this.isTpl = isTpl;
 	}
+	/**
+	 * 项目经理编号
+	 **/
+	public void setPmUserid(String pmUserid) {
+		this.pmUserid = pmUserid;
+	}
+	/**
+	 * 项目经理名称
+	 **/
+	public void setPmUsername(String pmUsername) {
+		this.pmUsername = pmUsername;
+	}
+	/**
+	 * 助理、副经理编号
+	 **/
+	public void setAssUserid(String assUserid) {
+		this.assUserid = assUserid;
+	}
+	/**
+	 * 助理、副经理姓名
+	 **/
+	public void setAssUsername(String assUsername) {
+		this.assUsername = assUsername;
+	}
+	/**
+	 * 主管领导编号
+	 **/
+	public void setAdmUserid(String admUserid) {
+		this.admUserid = admUserid;
+	}
+	/**
+	 * 主管领导姓名
+	 **/
+	public void setAdmUsername(String admUsername) {
+		this.admUsername = admUsername;
+	}
 	
 	/**
 	 * 项目编号
@@ -521,17 +556,7 @@ public class XmProject  implements java.io.Serializable {
 		return this.assessRemarks;
 	}
 	/**
-	 * 项目状态，
 	 * 0|初始
-	 * 1|售前
-	 * 2|立项中
-	 * 3|实施中
-	 * 4|暂停中
-	 * 5|结项中
-	 * 6|已结项
-	 * 7|售后
-	 * 8|已完成
-	 * 9|已关闭
 	 **/
 	public String getStatus() {
 		return this.status;
@@ -561,19 +586,19 @@ public class XmProject  implements java.io.Serializable {
 		return this.bizFlowState;
 	}
 	/**
-	 * 非人力成本总预算-应该大于或等于计划非人力总成本
+	 * 非人力成本总预算-应该大于或等于阶段计划非人力总成本
 	 **/
 	public BigDecimal getPlanNouserAt() {
 		return this.planNouserAt;
 	}
 	/**
-	 * 内部人力成本总预算-应该大于或等于计划内部人力总成本
+	 * 内部人力成本总预算-应该大于或等于阶段计划内部人力总成本
 	 **/
 	public BigDecimal getPlanInnerUserAt() {
 		return this.planInnerUserAt;
 	}
 	/**
-	 * 外购人力成本总预算-应该大于或等于计划外购人力总成本
+	 * 外购人力成本总预算-应该大于或等于阶段计划外购人力总成本
 	 **/
 	public BigDecimal getPlanOutUserAt() {
 		return this.planOutUserAt;
@@ -603,7 +628,7 @@ public class XmProject  implements java.io.Serializable {
 		return this.baselineId;
 	}
 	/**
-	 * 总预算工作量-应该大于或等于计划总工作量
+	 * 总预算工作量-应该大于或等于阶段计划总工作量
 	 **/
 	public BigDecimal getPlanWorkload() {
 		return this.planWorkload;
@@ -663,13 +688,13 @@ public class XmProject  implements java.io.Serializable {
 		return this.taxRate;
 	}
 	/**
-	 * 内部人力总工作量-应该大于或等于计划内部人力总成本
+	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
 	 **/
 	public BigDecimal getPlanInnerUserWorkload() {
 		return this.planInnerUserWorkload;
 	}
 	/**
-	 * 外购人力总工作量-应该大于或等于计划外购人力总成本
+	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
 	 **/
 	public BigDecimal getPlanOutUserWorkload() {
 		return this.planOutUserWorkload;
@@ -704,5 +729,41 @@ public class XmProject  implements java.io.Serializable {
 	public String getIsTpl() {
 		return this.isTpl;
 	}
+	/**
+	 * 项目经理编号
+	 **/
+	public String getPmUserid() {
+		return this.pmUserid;
+	}
+	/**
+	 * 项目经理名称
+	 **/
+	public String getPmUsername() {
+		return this.pmUsername;
+	}
+	/**
+	 * 助理、副经理编号
+	 **/
+	public String getAssUserid() {
+		return this.assUserid;
+	}
+	/**
+	 * 助理、副经理姓名
+	 **/
+	public String getAssUsername() {
+		return this.assUsername;
+	}
+	/**
+	 * 主管领导编号
+	 **/
+	public String getAdmUserid() {
+		return this.admUserid;
+	}
+	/**
+	 * 主管领导姓名
+	 **/
+	public String getAdmUsername() {
+		return this.admUsername;
+	}
 
 }
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
index 2b9383e4..35e8032e 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
@@ -106,7 +106,7 @@
 		insert into xm_product(
 			<include refid="columns"/>
 		) values (
-		#{id},#{productName},#{branchId},#{remark},#{version},#{pmUserid},#{pmUsername},#{ctime},#{deptid},#{pstatus},#{startTime},#{endTime},#{deptName},#{admUserid},#{admUsername},#{assistantUserid},#{assistantUsername},#{bizProcInstId},#{bizFlowState},#{isTpl},#{baselineId},#{baseTime},#{code},#{pbudgetWorkload},#{pbudgetAmount},#{pmenuBudgetWorkload},#{pmenuBudgetAmount}
+		#{id},#{productName},#{branchId},#{remark},#{version},#{pmUserid},#{pmUsername},#{ctime},#{deptid},#{pstatus},#{startTime},#{endTime},#{deptName},#{admUserid},#{admUsername},#{assUserid},#{assUsername},#{bizProcInstId},#{bizFlowState},#{isTpl},#{baselineId},#{baseTime},#{code},#{pbudgetWorkload},#{pbudgetAmount},#{pmenuBudgetWorkload},#{pmenuBudgetAmount}
 		)
 	</insert>
 	
@@ -169,7 +169,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		id,product_name,branch_id,remark,version,pm_userid,pm_username,ctime,deptid,pstatus,start_time,end_time,dept_name,adm_userid,adm_username,assistant_userid,assistant_username,biz_proc_inst_id,biz_flow_state,is_tpl,baseline_id,base_time,code,pbudget_workload,pbudget_amount,pmenu_budget_workload,pmenu_budget_amount
+		id,product_name,branch_id,remark,version,pm_userid,pm_username,ctime,deptid,pstatus,start_time,end_time,dept_name,adm_userid,adm_username,ass_userid,ass_username,biz_proc_inst_id,biz_flow_state,is_tpl,baseline_id,base_time,code,pbudget_workload,pbudget_amount,pmenu_budget_workload,pmenu_budget_amount
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -189,8 +189,8 @@
 		<if test="deptName != null and deptName != ''">      and res.dept_name = #{deptName}     </if>
 		<if test="admUserid != null and admUserid != ''">      and res.adm_userid = #{admUserid}     </if>
 		<if test="admUsername != null and admUsername != ''">      and res.adm_username = #{admUsername}     </if>
-		<if test="assistantUserid != null and assistantUserid != ''">      and res.assistant_userid = #{assistantUserid}     </if>
-		<if test="assistantUsername != null and assistantUsername != ''">      and res.assistant_username = #{assistantUsername}     </if>
+		<if test="assUserid != null and assUserid != ''">      and res.ass_userid = #{assUserid}     </if>
+		<if test="assUsername != null and assUsername != ''">      and res.ass_username = #{assUsername}     </if>
 		<if test="bizProcInstId != null and bizProcInstId != ''">      and res.biz_proc_inst_id = #{bizProcInstId}     </if>
 		<if test="bizFlowState != null and bizFlowState != ''">      and res.biz_flow_state = #{bizFlowState}     </if>
 		<if test="isTpl != null and isTpl != ''">      and res.is_tpl = #{isTpl}     </if>
@@ -218,8 +218,8 @@
 		dept_name = #{deptName},
 		adm_userid = #{admUserid},
 		adm_username = #{admUsername},
-		assistant_userid = #{assistantUserid},
-		assistant_username = #{assistantUsername},
+		ass_userid = #{assUserid},
+		ass_username = #{assUsername},
 		biz_proc_inst_id = #{bizProcInstId},
 		biz_flow_state = #{bizFlowState},
 		is_tpl = #{isTpl},
@@ -246,8 +246,8 @@
 		<if test="deptName != null and deptName != ''"> dept_name = #{deptName},     </if>
 		<if test="admUserid != null and admUserid != ''"> adm_userid = #{admUserid},     </if>
 		<if test="admUsername != null and admUsername != ''"> adm_username = #{admUsername},     </if>
-		<if test="assistantUserid != null and assistantUserid != ''"> assistant_userid = #{assistantUserid},     </if>
-		<if test="assistantUsername != null and assistantUsername != ''"> assistant_username = #{assistantUsername},     </if>
+		<if test="assUserid != null and assUserid != ''"> ass_userid = #{assUserid},     </if>
+		<if test="assUsername != null and assUsername != ''"> ass_username = #{assUsername},     </if>
 		<if test="bizProcInstId != null and bizProcInstId != ''"> biz_proc_inst_id = #{bizProcInstId},     </if>
 		<if test="bizFlowState != null and bizFlowState != ''"> biz_flow_state = #{bizFlowState},     </if>
 		<if test="isTpl != null and isTpl != ''"> is_tpl = #{isTpl},     </if>
@@ -275,8 +275,8 @@
 			dept_name = #{item.deptName},
 			adm_userid = #{item.admUserid},
 			adm_username = #{item.admUsername},
-			assistant_userid = #{item.assistantUserid},
-			assistant_username = #{item.assistantUsername},
+			ass_userid = #{item.assUserid},
+			ass_username = #{item.assUsername},
 			biz_proc_inst_id = #{item.bizProcInstId},
 			biz_flow_state = #{item.bizFlowState},
 			is_tpl = #{item.isTpl},
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
index 18ca0714..4c5e995f 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
@@ -3,43 +3,101 @@
 <mapper namespace="com.xm.core.entity.XmProject">
 	
 	
-	<!--开始 自定sql函数区域 -->
-		<!--请在此区域添加自定义函数-->
+	<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 -->
 
-		<!-- 插入流程审批表数据 -->
+    <sql id="whereForMap">
+         <if test=" ids != null">  and (res.id) in
+             <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
+                 ( #{item})
+             </foreach>
+         </if><!-- 筛选属于当前年份的项目 -->
+		<if test="startYear != null and startYear != ''" >and (
+			date_format(start_time,'%Y') = #{startYear}
+			or date_format(end_time,'%Y') = #{startYear}
+			or ( date_format(start_time,'%Y') &lt; #{startYear} and date_format(end_time,'%Y') &gt; #{startYear} )
+			)
+		</if>
+		<!-- 筛选掉已结束项目 -->
+		<if test="hideStatus != null and hideStatus != ''">
+			and res.status != #{hideStatus}
+		</if>
+		<!-- 我参与的  包括我创建的，我监控的，我审核的-->
+		<if test=" compete !=null and compete !='' ">
+			and (    exists ( select 1 from xm_project_group g,XM.xm_project_group_user gu where gu.group_id=g.id and gu.userid=#{userid} and g.project_id=res.id )
+			or  res.create_userid=#{compete}
+			or  exists ( select 1 from xm_task_execuser exe where exe.project_id=res.id and exe.userid=#{compete} )
+			)
+		</if>
+		<!-- 按参与角色查询等-->
+		<if test="pgTypeIds != null ">
+			and  exists ( select 1 from xm_project_group g,XM.xm_project_group_user gu where gu.group_id=g.id and gu.userid=#{userid} and g.project_id=res.id
+			and   g.pg_type_id in
+			<foreach collection="pgTypeIds" item="item" index="index" open="(" separator="," close=")" >
+				#{item}
+			</foreach>
+			)
+		</if>
+
+		<if test=" myExecuserStatus != null and myExecuserStatus != ''">
+			and  exists ( select 1 from xm_task_execuser exe where exe.project_id=res.id and exe.userid=#{userid}
+			<if test=' myExecuserStatus != "all" '>
+				and exe.status=#{myExecuserStatus}
+			</if>
+			)
+		</if>
+
+		<if test="myFocus != null and myFocus != ''">
+			and exists ( select 1 from xm_my_focus f where f.userid=#{userid} and f.project_id=res.id  )
+		</if>
+		<if test=" productId !=null and productId!='' ">
+			and exists( select 1 from  xm_product_project_link ppl
+			where ppl.product_id=#{productId}  and ppl.project_id=res.id
+			)
+		</if>
+		<if test="iterationId!=null and iterationId!=''">
+			and exists( select 1 from xm_iteration_product_link ipl inner join xm_product_project_link ppl
+			on ipl.product_id=ppl.product_id
+			where ppl.project_id =res.id and ipl.iteration_id=#{iterationId}
+			)
+		</if>
+		<if test="key != null and key !='' ">  and res.name like #{key}  </if>
+		<if test="isTpl!=null and isTpl=='1'">
+			and (res.branch_id in( #{platformBranchId},#{myBranchId}) and res.is_tpl='1')
+		</if>
+    </sql>
 	<insert id="insertProcessApprova"
-		parameterType="HashMap"
-		useGeneratedKeys="false" keyProperty="id">
+			parameterType="HashMap"
+			useGeneratedKeys="false" keyProperty="id">
 		insert into xm_project_process_approva (
-		 id,project_id,flow_branch_id,agree,act_id,task_name,proc_inst_id,main_title,comment_msg,flow_last_time,event_name,biz_key,model_key,assignee,start_userid,proc_def_id
+		id,project_id,flow_branch_id,agree,act_id,task_name,proc_inst_id,main_title,comment_msg,flow_last_time,event_name,biz_key,model_key,assignee,start_userid,proc_def_id
 		) values (
-			#{id},#{projectId},#{flowBranchId},#{agree},#{actId},#{taskName},#{procInstId},#{mainTitle},#{commentMsg},#{flowLastTime},#{eventName},#{bizKey},#{modelKey},#{assignee},#{startUserid},#{procDefId}
+		#{id},#{projectId},#{flowBranchId},#{agree},#{actId},#{taskName},#{procInstId},#{mainTitle},#{commentMsg},#{flowLastTime},#{eventName},#{bizKey},#{modelKey},#{assignee},#{startUserid},#{procDefId}
 		)
 	</insert>
 
-		<!-- 同时修改业务表及流程审批表数据状态 -->
+	<!-- 同时修改业务表及流程审批表数据状态 -->
 	<update id="updateProcessApprova"
-		parameterType="HashMap">
+			parameterType="HashMap">
 		update xm_project  b ,XM.xm_project_process_approva pa
-			<set>
-				<if test=' agree != null and agree !="" '> pa.agree = #{agree},</if>
-				<if test=' actId != null and actId !="" '> pa.act_id = #{actId},</if>
-				<if test=' assignee != null and assignee !="" '> pa.assignee = #{assignee},</if>
-				<if test=' assigneeName != null and assigneeName !="" '> pa.assignee_name = #{assigneeName},</if>
-				<if test=' taskName != null and taskName !="" '> pa.task_name = #{taskName},</if>
-				<if test=' commentMsg != null and commentMsg !="" '> pa.comment_msg = #{commentMsg},</if>
-				 pa.flow_last_time = now(),
-				<if test=' eventName != null and eventName !="" '> pa.event_name = #{eventName},</if>
-				<if test=' flowState != null and flowState !="" '> pa.flow_state=#{flowState},</if>
-				<if test=' bizFlowState != null and bizFlowState !="" '> b.biz_flow_state=#{bizFlowState},</if>
-				<if test=' bizProcInstId != null and bizProcInstId !="" '> b.biz_proc_inst_id=#{bizProcInstId},</if>
-			</set>
+		<set>
+			<if test=' agree != null and agree !="" '> pa.agree = #{agree},</if>
+			<if test=' actId != null and actId !="" '> pa.act_id = #{actId},</if>
+			<if test=' assignee != null and assignee !="" '> pa.assignee = #{assignee},</if>
+			<if test=' assigneeName != null and assigneeName !="" '> pa.assignee_name = #{assigneeName},</if>
+			<if test=' taskName != null and taskName !="" '> pa.task_name = #{taskName},</if>
+			<if test=' commentMsg != null and commentMsg !="" '> pa.comment_msg = #{commentMsg},</if>
+			pa.flow_last_time = now(),
+			<if test=' eventName != null and eventName !="" '> pa.event_name = #{eventName},</if>
+			<if test=' flowState != null and flowState !="" '> pa.flow_state=#{flowState},</if>
+			<if test=' bizFlowState != null and bizFlowState !="" '> b.biz_flow_state=#{bizFlowState},</if>
+			<if test=' bizProcInstId != null and bizProcInstId !="" '> b.biz_proc_inst_id=#{bizProcInstId},</if>
+		</set>
 		where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
-		      and b.id=pa.project_id
+		and b.id=pa.project_id
 	</update>
 
 	<update id="updateFlowStateByProcInstForDeleteSuccess"
-		parameterType="HashMap">
+			parameterType="HashMap">
 		update xm_project_process_approva pa set pa.flow_state='2'
 		where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
 	</update>
@@ -47,7 +105,7 @@
 	<!-- 按条件删除若干条记录-->
 	<delete id="deleteByProcInstId" parameterType="HashMap">
 		delete from xm_project
-		 where biz_proc_inst_id=#{procInstId}
+		where biz_proc_inst_id=#{procInstId}
 	</delete>
 
 	<!--结束 自定义sql函数区域-->
@@ -57,79 +115,18 @@
 	<!-- 通过条件查询获取数据列表 返回list<map> -->
 	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
 		select res.*,s.project_id,s.biz_date,s.total_file_cnt,s.total_bug_cnt,s.total_task_cnt,s.total_budget_nouser_amount,s.project_name,s.total_staff_cnt,s.calc_time,s.calc_status,
-		       s.total_cost_nouser_amount,s.total_closed_bug_cnt,s.total_resolved_bug_cnt,s.total_complete_task_cnt,s.total_phase_cnt,s.total_complete_phase_cnt,s.total_need_pay_amount,
-		       s.total_finish_pay_amount,s.total_need_col_amount,s.total_finish_col_amount,s.total_cost_user_amount,s.total_budget_inner_user_amount,s.total_plan_workload,
-		       s.total_risk_cnt,s.total_complete_risk_cnt,s.branch_name,s.total_budget_out_user_amount,s.total_complete_workload,s.total_cost_inner_user_amount,s.total_cost_out_user_amount,
-		       s.total_progress,s.total_active_bug_cnt,s.total_confirmed_bug_cnt,s.project_status,s.total_act_workload,s.total_act_out_workload,s.total_act_inner_workload,
-		       s.total_task_budget_cost_at,s.total_task_out_cnt,s.total_need_pay_cnt,s.total_finish_pay_cnt,s.total_finish_pay_user_cnt,s.total_need_pay_user_cnt,s.total_plan_inner_user_workload,
-		       s.total_plan_out_user_workload,s.test_cases,s.exec_cases,s.design_cases,s.finish_cases,s.iteration_cnt,s.product_cnt,s.menu_cnt,
+		s.total_cost_nouser_amount,s.total_closed_bug_cnt,s.total_resolved_bug_cnt,s.total_complete_task_cnt,s.total_phase_cnt,s.total_complete_phase_cnt,s.total_need_pay_amount,
+		s.total_finish_pay_amount,s.total_need_col_amount,s.total_finish_col_amount,s.total_cost_user_amount,s.total_budget_inner_user_amount,s.total_plan_workload,
+		s.total_risk_cnt,s.total_complete_risk_cnt,s.branch_name,s.total_budget_out_user_amount,s.total_complete_workload,s.total_cost_inner_user_amount,s.total_cost_out_user_amount,
+		s.total_progress,s.total_active_bug_cnt,s.total_confirmed_bug_cnt,s.project_status,s.total_act_workload,s.total_act_out_workload,s.total_act_inner_workload,
+		s.total_task_budget_cost_at,s.total_task_out_cnt,s.total_need_pay_cnt,s.total_finish_pay_cnt,s.total_finish_pay_user_cnt,s.total_need_pay_user_cnt,s.total_plan_inner_user_workload,
+		s.total_plan_out_user_workload,s.test_cases,s.exec_cases,s.design_cases,s.finish_cases,s.iteration_cnt,s.product_cnt,s.menu_cnt,
 		pa.proc_inst_id,pa.assignee,pa.assignee_name,pa.main_title,pa.flow_branch_id,pa.task_name,pa.agree,pa.flow_last_time,pa.comment_msg,pa.proc_def_id,pa.flow_state from xm_project res
-		 left join xm_project_state s on s.project_id=res.id
-		 left join  xm_project_process_approva pa on res.id=pa.project_id and res.biz_proc_inst_id=pa.proc_inst_id
-
+		left join xm_project_state s on s.project_id=res.id
+		left join  xm_project_process_approva pa on res.id=pa.project_id and res.biz_proc_inst_id=pa.proc_inst_id
 		<where>
-			<if test="ids != null">  and
-				id in
-				    <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
-				        #{item}
-				    </foreach>
-			 </if>
+		    <include refid="whereForMap"/>
 			<include refid="where"/>
-
- 			<!-- 筛选属于当前年份的项目 -->
-			<if test="startYear != null and startYear != ''" >and (
-				date_format(start_time,'%Y') = #{startYear}
-				or date_format(end_time,'%Y') = #{startYear}
-				or ( date_format(start_time,'%Y') &lt; #{startYear} and date_format(end_time,'%Y') &gt; #{startYear} )
-				)
-			</if>
-			<!-- 筛选掉已结束项目 -->
-			<if test="hideStatus != null and hideStatus != ''">
-				and res.status != #{hideStatus}
-			</if>
-			<!-- 我参与的  包括我创建的，我监控的，我审核的-->
-			<if test=" compete !=null and compete !='' ">
-				and (    exists ( select 1 from xm_project_group g,XM.xm_project_group_user gu where gu.group_id=g.id and gu.userid=#{userid} and g.project_id=res.id )
-					 or  res.create_userid=#{compete}
-					 or  exists ( select 1 from xm_task_execuser exe where exe.project_id=res.id and exe.userid=#{compete} )
-					)
-			</if>
-			<!-- 按参与角色查询等-->
-			<if test="pgTypeIds != null ">
-				and  exists ( select 1 from xm_project_group g,XM.xm_project_group_user gu where gu.group_id=g.id and gu.userid=#{userid} and g.project_id=res.id
-								and   g.pg_type_id in
-							    <foreach collection="pgTypeIds" item="item" index="index" open="(" separator="," close=")" >
-							        #{item}
-							    </foreach>
-				)
-			</if>
-
-			<if test=" myExecuserStatus != null and myExecuserStatus != ''">
-				and  exists ( select 1 from xm_task_execuser exe where exe.project_id=res.id and exe.userid=#{userid}
-					<if test=' myExecuserStatus != "all" '>
-					and exe.status=#{myExecuserStatus}
-					</if>
-				)
-			</if>
-
-			<if test="myFocus != null and myFocus != ''">
-				and exists ( select 1 from xm_my_focus f where f.userid=#{userid} and f.project_id=res.id  )
-			</if>
-			<if test=" productId !=null and productId!='' ">
-				and exists( select 1 from  xm_product_project_link ppl
-				where ppl.product_id=#{productId}  and ppl.project_id=res.id
-				)
-			</if>
-			<if test="iterationId!=null and iterationId!=''">
-				and exists( select 1 from xm_iteration_product_link ipl inner join xm_product_project_link ppl
-				on ipl.product_id=ppl.product_id
-				where ppl.project_id =res.id and ipl.iteration_id=#{iterationId}
-				)
-			</if>
-			<if test="key != null and key !='' ">  and res.name like #{key}  </if>
-			<if test="isTpl!=null and isTpl=='1'">
-				and (res.branch_id in( #{platformBranchId},#{myBranchId}) and res.is_tpl='1')
-			</if>
 		</where>
 	</select>
 	
@@ -166,7 +163,7 @@
 		insert into xm_project(
 			<include refid="columns"/>
 		) values (
-		#{id},#{code},#{name},#{xmType},#{startTime},#{endTime},#{urgent},#{priority},#{description},#{createUserid},#{createUsername},#{createTime},#{assess},#{assessRemarks},#{status},#{branchId},#{planTotalCost},#{bizProcInstId},#{bizFlowState},#{planNouserAt},#{planInnerUserAt},#{planOutUserAt},#{locked},#{baseTime},#{baseRemark},#{baselineId},#{planWorkload},#{totalReceivables},#{budgetMarginRate},#{contractAmt},#{planInnerUserPrice},#{planOutUserPrice},#{planOutUserCnt},#{planInnerUserCnt},#{planWorkingHours},#{taxRate},#{planInnerUserWorkload},#{planOutUserWorkload},#{fromTplId},#{budgetCtrl},#{deptid},#{showOut},#{isTpl}
+		#{id},#{code},#{name},#{xmType},#{startTime},#{endTime},#{urgent},#{priority},#{description},#{createUserid},#{createUsername},#{createTime},#{assess},#{assessRemarks},#{status},#{branchId},#{planTotalCost},#{bizProcInstId},#{bizFlowState},#{planNouserAt},#{planInnerUserAt},#{planOutUserAt},#{locked},#{baseTime},#{baseRemark},#{baselineId},#{planWorkload},#{totalReceivables},#{budgetMarginRate},#{contractAmt},#{planInnerUserPrice},#{planOutUserPrice},#{planOutUserCnt},#{planInnerUserCnt},#{planWorkingHours},#{taxRate},#{planInnerUserWorkload},#{planOutUserWorkload},#{fromTplId},#{budgetCtrl},#{deptid},#{showOut},#{isTpl},#{pmUserid},#{pmUsername},#{assUserid},#{assUsername},#{admUserid},#{admUsername}
 		)
 	</insert>
 	
@@ -229,7 +226,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		id,code,name,xm_type,start_time,end_time,urgent,priority,description,create_userid,create_username,create_time,assess,assess_remarks,status,branch_id,plan_total_cost,biz_proc_inst_id,biz_flow_state,plan_nouser_at,plan_inner_user_at,plan_out_user_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_inner_user_price,plan_out_user_price,plan_out_user_cnt,plan_inner_user_cnt,plan_working_hours,tax_rate,plan_inner_user_workload,plan_out_user_workload,from_tpl_id,budget_ctrl,deptid,show_out,is_tpl
+		id,code,name,xm_type,start_time,end_time,urgent,priority,description,create_userid,create_username,create_time,assess,assess_remarks,status,branch_id,plan_total_cost,biz_proc_inst_id,biz_flow_state,plan_nouser_at,plan_inner_user_at,plan_out_user_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_inner_user_price,plan_out_user_price,plan_out_user_cnt,plan_inner_user_cnt,plan_working_hours,tax_rate,plan_inner_user_workload,plan_out_user_workload,from_tpl_id,budget_ctrl,deptid,show_out,is_tpl,pm_userid,pm_username,ass_userid,ass_username,adm_userid,adm_username
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -277,6 +274,12 @@
 		<if test="deptid != null and deptid != ''">      and res.deptid = #{deptid}     </if>
 		<if test="showOut != null and showOut != ''">      and res.show_out = #{showOut}     </if>
 		<if test="isTpl != null and isTpl != ''">      and res.is_tpl = #{isTpl}     </if>
+		<if test="pmUserid != null and pmUserid != ''">      and res.pm_userid = #{pmUserid}     </if>
+		<if test="pmUsername != null and pmUsername != ''">      and res.pm_username = #{pmUsername}     </if>
+		<if test="assUserid != null and assUserid != ''">      and res.ass_userid = #{assUserid}     </if>
+		<if test="assUsername != null and assUsername != ''">      and res.ass_username = #{assUsername}     </if>
+		<if test="admUserid != null and admUserid != ''">      and res.adm_userid = #{admUserid}     </if>
+		<if test="admUsername != null and admUsername != ''">      and res.adm_username = #{admUsername}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -321,7 +324,13 @@
 		budget_ctrl = #{budgetCtrl},
 		deptid = #{deptid},
 		show_out = #{showOut},
-		is_tpl = #{isTpl}
+		is_tpl = #{isTpl},
+		pm_userid = #{pmUserid},
+		pm_username = #{pmUsername},
+		ass_userid = #{assUserid},
+		ass_username = #{assUsername},
+		adm_userid = #{admUserid},
+		adm_username = #{admUsername}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="code != null and code != ''"> code = #{code},     </if>
@@ -366,6 +375,12 @@
 		<if test="deptid != null and deptid != ''"> deptid = #{deptid},     </if>
 		<if test="showOut != null and showOut != ''"> show_out = #{showOut},     </if>
 		<if test="isTpl != null and isTpl != ''"> is_tpl = #{isTpl},     </if>
+		<if test="pmUserid != null and pmUserid != ''"> pm_userid = #{pmUserid},     </if>
+		<if test="pmUsername != null and pmUsername != ''"> pm_username = #{pmUsername},     </if>
+		<if test="assUserid != null and assUserid != ''"> ass_userid = #{assUserid},     </if>
+		<if test="assUsername != null and assUsername != ''"> ass_username = #{assUsername},     </if>
+		<if test="admUserid != null and admUserid != ''"> adm_userid = #{admUserid},     </if>
+		<if test="admUsername != null and admUsername != ''"> adm_username = #{admUsername},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -410,6 +425,12 @@
 			budget_ctrl = #{item.budgetCtrl},
 			deptid = #{item.deptid},
 			show_out = #{item.showOut},
-			is_tpl = #{item.isTpl}
+			is_tpl = #{item.isTpl},
+			pm_userid = #{item.pmUserid},
+			pm_username = #{item.pmUsername},
+			ass_userid = #{item.assUserid},
+			ass_username = #{item.assUsername},
+			adm_userid = #{item.admUserid},
+			adm_username = #{item.admUsername}
 	</sql>
 </mapper>
\ No newline at end of file