diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectBaselineController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectBaselineController.java
deleted file mode 100644
index 7f2b6048..00000000
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectBaselineController.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package com.xm.core.ctrl;
-
-import com.mdp.core.entity.Tips;
-import com.mdp.core.utils.RequestUtils;
-import com.mdp.mybatis.PageUtils;
-import com.xm.core.entity.XmProjectBaseline;
-import com.xm.core.service.XmProjectBaselineService;
-import io.swagger.annotations.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * url编制采用rest风格,如对XM.xm_project_baseline xm_project_baseline的操作有增删改查,对应的url分别为:<br>
- *  新增: xm/xmProjectBaseline/add <br>
- *  查询: xm/xmProjectBaseline/list<br>
- *  模糊查询: xm/xmProjectBaseline/listKey<br>
- *  修改: xm/xmProjectBaseline/edit <br>
- *  删除: xm/xmProjectBaseline/del<br>
- *  批量删除: xm/xmProjectBaseline/batchDel<br>
- * 组织 com.qqkj  顶级模块 oa 大模块 xm 小模块 <br>
- * 实体 XmProjectBaseline 表 XM.xm_project_baseline 当前主键(包括多主键): id; 
- ***/
-@RestController("xm.core.xmProjectBaselineController")
-@RequestMapping(value="/**/xm/core/xmProjectBaseline")
-@Api(tags={"xm_project_baseline操作接口"})
-public class XmProjectBaselineController {
-	
-	static Log logger=LogFactory.getLog(XmProjectBaselineController.class);
-	
-	@Autowired
-	private XmProjectBaselineService xmProjectBaselineService;
-	 
-		
- 
-	
-	@ApiOperation( value = "查询xm_project_baseline信息列表",notes="listXmProjectBaseline,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
-	@ApiImplicitParams({  
-		@ApiImplicitParam(name="id",value="基线表主键,主键",required=false),
-		@ApiImplicitParam(name="code",value="项目代号",required=false),
-		@ApiImplicitParam(name="name",value="项目名称",required=false),
-		@ApiImplicitParam(name="xmType",value="项目类型",required=false),
-		@ApiImplicitParam(name="startTime",value="项目开始时间",required=false),
-		@ApiImplicitParam(name="endTime",value="项目结束时间",required=false),
-		@ApiImplicitParam(name="urgent",value="紧急程度",required=false),
-		@ApiImplicitParam(name="priority",value="优先程度",required=false),
-		@ApiImplicitParam(name="description",value="项目描述",required=false),
-		@ApiImplicitParam(name="createUserid",value="项目创建人编号",required=false),
-		@ApiImplicitParam(name="createUsername",value="项目创建人",required=false),
-		@ApiImplicitParam(name="createTime",value="创建时间",required=false),
-		@ApiImplicitParam(name="assess",value="项目考核",required=false),
-		@ApiImplicitParam(name="assessRemarks",value="考核备注",required=false),
-		@ApiImplicitParam(name="status",value="项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停",required=false),
-		@ApiImplicitParam(name="branchId",value="机构编号",required=false),
-		@ApiImplicitParam(name="planTotalCost",value="总预算",required=false),
-		@ApiImplicitParam(name="bizProcInstId",value="当前流程实例编号",required=false),
-		@ApiImplicitParam(name="bizFlowState",value="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",required=false),
-		@ApiImplicitParam(name="planNouserAt",value="非人力成本总预算-应该大于或等于计划非人力总成本",required=false),
-		@ApiImplicitParam(name="planInnerUserAt",value="内部人力成本总预算-应该大于或等于计划内部人力总成本",required=false),
-		@ApiImplicitParam(name="planOutUserAt",value="外购人力成本总预算-应该大于或等于计划外购人力总成本",required=false),
-		@ApiImplicitParam(name="locked",value="是否锁定整个项目不允许变化0否1是",required=false),
-		@ApiImplicitParam(name="baseTime",value="基线时间",required=false),
-		@ApiImplicitParam(name="baseRemark",value="基线备注",required=false),
-		@ApiImplicitParam(name="baselineId",value="基线主键",required=false),
-		@ApiImplicitParam(name="planWorkload",value="总预算工作量-应该大于或等于计划总工作量",required=false),
-		@ApiImplicitParam(name="totalReceivables",value="总预计收款金额",required=false),
-		@ApiImplicitParam(name="budgetMarginRate",value="预估毛利率",required=false),
-		@ApiImplicitParam(name="contractAmt",value="合同总金额",required=false),
-		@ApiImplicitParam(name="planInnerUserPrice",value="内部人力成本单价元/人时",required=false),
-		@ApiImplicitParam(name="planOutUserPrice",value="外购人力成本单价元/人时",required=false),
-		@ApiImplicitParam(name="planOutUserCnt",value="外购人数",required=false),
-		@ApiImplicitParam(name="planInnerUserCnt",value="内部人数",required=false),
-		@ApiImplicitParam(name="planWorkingHours",value="预计工作小时数目",required=false),
-		@ApiImplicitParam(name="taxRate",value="税率",required=false),
-		@ApiImplicitParam(name="planInnerUserWorkload",value="内部人力总工作量-应该大于或等于计划内部人力总成本",required=false),
-		@ApiImplicitParam(name="planOutUserWorkload",value="外购人力总工作量-应该大于或等于计划外购人力总成本",required=false),
-		@ApiImplicitParam(name="projectId",value="项目编号",required=false),
-		@ApiImplicitParam(name="ctime",value="创建时间",required=false),
-		@ApiImplicitParam(name="pageSize",value="每页记录数",required=false),
-		@ApiImplicitParam(name="currentPage",value="当前页码,从1开始",required=false),
-		@ApiImplicitParam(name="total",value="总记录数,服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算",required=false),
-		@ApiImplicitParam(name="orderFields",value="排序列 如性别、学生编号排序 ['sex','studentId']",required=false),
-		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
-	})
-	@ApiResponses({
-		@ApiResponse(code = 200,response= XmProjectBaseline.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
-	})
-	@RequestMapping(value="/list",method=RequestMethod.GET)
-	public Map<String,Object> listXmProjectBaseline( @RequestParam Map<String,Object> xmProjectBaseline){
-		Map<String,Object> m = new HashMap<>(); 
-		RequestUtils.transformArray(xmProjectBaseline, "ids");
-		PageUtils.startPage(xmProjectBaseline);
-		List<Map<String,Object>>	xmProjectBaselineList = xmProjectBaselineService.selectListMapByWhere(xmProjectBaseline);	//列出XmProjectBaseline列表
-		PageUtils.responePage(m, xmProjectBaselineList);
-		m.put("data",xmProjectBaselineList);
-		Tips tips=new Tips("查询成功");
-		m.put("tips", tips);
-		return m;
-	}
-	
- 
-	
-	/**
-	@ApiOperation( value = "新增一条xm_project_baseline信息",notes="addXmProjectBaseline,主键如果为空，后台自动生成")
-	@ApiResponses({
-		@ApiResponse(code = 200,response=XmProjectBaseline.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
-	}) 
-	@RequestMapping(value="/add",method=RequestMethod.POST)
-	public Map<String,Object> addXmProjectBaseline(@RequestBody XmProjectBaseline xmProjectBaseline) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功新增一条数据");
-		try{
-			if(StringUtils.isEmpty(xmProjectBaseline.getId())) {
-				xmProjectBaseline.setId(xmProjectBaselineService.createKey("id"));
-			}else{
-				 XmProjectBaseline xmProjectBaselineQuery = new  XmProjectBaseline(xmProjectBaseline.getId());
-				if(xmProjectBaselineService.countByWhere(xmProjectBaselineQuery)>0){
-					tips.setFailureMsg("编号重复，请修改编号再提交");
-					m.put("tips", tips);
-					return m;
-				}
-			}
-			xmProjectBaselineService.insert(xmProjectBaseline);
-			m.put("data",xmProjectBaseline);
-		}catch (BizException e) { 
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}  
-		m.put("tips", tips);
-		return m;
-	}
-	*/
-	
-	/**
-	@ApiOperation( value = "删除一条xm_project_baseline信息",notes="delXmProjectBaseline,仅需要上传主键字段")
-	@ApiResponses({
-		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}")
-	}) 
-	@RequestMapping(value="/del",method=RequestMethod.POST)
-	public Map<String,Object> delXmProjectBaseline(@RequestBody XmProjectBaseline xmProjectBaseline){
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功删除一条数据");
-		try{
-			xmProjectBaselineService.deleteByPk(xmProjectBaseline);
-		}catch (BizException e) { 
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}  
-		m.put("tips", tips);
-		return m;
-	}
-	 */
-	
-	/**
-	@ApiOperation( value = "根据主键修改一条xm_project_baseline信息",notes="editXmProjectBaseline")
-	@ApiResponses({
-		@ApiResponse(code = 200,response=XmProjectBaseline.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
-	}) 
-	@RequestMapping(value="/edit",method=RequestMethod.POST)
-	public Map<String,Object> editXmProjectBaseline(@RequestBody XmProjectBaseline xmProjectBaseline) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功更新一条数据");
-		try{
-			xmProjectBaselineService.updateByPk(xmProjectBaseline);
-			m.put("data",xmProjectBaseline);
-		}catch (BizException e) { 
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}  
-		m.put("tips", tips);
-		return m;
-	}
-	*/
-	
-
-	
-	/**
-	@ApiOperation( value = "根据主键列表批量删除xm_project_baseline信息",notes="batchDelXmProjectBaseline,仅需要上传主键字段")
-	@ApiResponses({
-		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
-	}) 
-	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
-	public Map<String,Object> batchDelXmProjectBaseline(@RequestBody List<XmProjectBaseline> xmProjectBaselines) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功删除"+xmProjectBaselines.size()+"条数据"); 
-		try{ 
-			xmProjectBaselineService.batchDelete(xmProjectBaselines);
-		}catch (BizException e) { 
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}  
-		m.put("tips", tips);
-		return m;
-	} 
-	*/
-}
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseBaselineController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseBaselineController.java
deleted file mode 100644
index b0ca380e..00000000
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseBaselineController.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package com.xm.core.ctrl;
-
-import com.mdp.core.entity.Tips;
-import com.mdp.core.utils.RequestUtils;
-import com.mdp.mybatis.PageUtils;
-import com.xm.core.entity.XmProjectPhaseBaseline;
-import com.xm.core.service.XmProjectPhaseBaselineService;
-import io.swagger.annotations.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * url编制采用rest风格,如对XM.xm_project_phase_baseline xm_project_phase_baseline的操作有增删改查,对应的url分别为:<br>
- *  新增: xm/xmProjectPhaseBaseline/add <br>
- *  查询: xm/xmProjectPhaseBaseline/list<br>
- *  模糊查询: xm/xmProjectPhaseBaseline/listKey<br>
- *  修改: xm/xmProjectPhaseBaseline/edit <br>
- *  删除: xm/xmProjectPhaseBaseline/del<br>
- *  批量删除: xm/xmProjectPhaseBaseline/batchDel<br>
- * 组织 com.qqkj  顶级模块 oa 大模块 xm 小模块 <br>
- * 实体 XmProjectPhaseBaseline 表 XM.xm_project_phase_baseline 当前主键(包括多主键): id; 
- ***/
-@RestController("xm.core.xmProjectPhaseBaselineController")
-@RequestMapping(value="/**/xm/core/xmProjectPhaseBaseline")
-@Api(tags={"xm_project_phase_baseline操作接口"})
-public class XmProjectPhaseBaselineController {
-	
-	static Log logger=LogFactory.getLog(XmProjectPhaseBaselineController.class);
-	
-	@Autowired
-	private XmProjectPhaseBaselineService xmProjectPhaseBaselineService;
-	 
-		
- 
-	
-	@ApiOperation( value = "查询xm_project_phase_baseline信息列表",notes="listXmProjectPhaseBaseline,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
-	@ApiImplicitParams({  
-		@ApiImplicitParam(name="id",value="基线主键,主键",required=false),
-		@ApiImplicitParam(name="baseCtime",value="基线建立时间",required=false),
-		@ApiImplicitParam(name="projectPhaseId",value="计划主键",required=false),
-		@ApiImplicitParam(name="phaseName",value="计划名称",required=false),
-		@ApiImplicitParam(name="remark",value="备注",required=false),
-		@ApiImplicitParam(name="parentPhaseId",value="上级计划编号",required=false),
-		@ApiImplicitParam(name="branchId",value="机构编号",required=false),
-		@ApiImplicitParam(name="projectId",value="当前项目编号",required=false),
-		@ApiImplicitParam(name="beginDate",value="开始时间",required=false),
-		@ApiImplicitParam(name="endDate",value="结束时间",required=false),
-		@ApiImplicitParam(name="planWorkingHours",value="工时",required=false),
-		@ApiImplicitParam(name="planWorkingStaffNu",value="投入人员数",required=false),
-		@ApiImplicitParam(name="ctime",value="创建时间",required=false),
-		@ApiImplicitParam(name="totalBudgetNouser",value="非人力成本总预算",required=false),
-		@ApiImplicitParam(name="totalBudgetInnerUser",value="内部人力成本总预算",required=false),
-		@ApiImplicitParam(name="totalBudgetOutUser",value="外购人力成本总预算",required=false),
-		@ApiImplicitParam(name="baseRemark",value="基线备注",required=false),
-		@ApiImplicitParam(name="projectBaselineId",value="项目级基线",required=false),
-		@ApiImplicitParam(name="bizProcInstId",value="当前流程实例编号",required=false),
-		@ApiImplicitParam(name="bizFlowState",value="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",required=false),
-		@ApiImplicitParam(name="pageSize",value="每页记录数",required=false),
-		@ApiImplicitParam(name="currentPage",value="当前页码,从1开始",required=false),
-		@ApiImplicitParam(name="total",value="总记录数,服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算",required=false),
-		@ApiImplicitParam(name="orderFields",value="排序列 如性别、学生编号排序 ['sex','studentId']",required=false),
-		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
-	})
-	@ApiResponses({
-		@ApiResponse(code = 200,response= XmProjectPhaseBaseline.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
-	})
-	@RequestMapping(value="/list",method=RequestMethod.GET)
-	public Map<String,Object> listXmProjectPhaseBaseline( @RequestParam Map<String,Object> xmProjectPhaseBaseline){
-		Map<String,Object> m = new HashMap<>(); 
-		RequestUtils.transformArray(xmProjectPhaseBaseline, "ids");
-		PageUtils.startPage(xmProjectPhaseBaseline);
-		List<Map<String,Object>>	xmProjectPhaseBaselineList = xmProjectPhaseBaselineService.selectListMapByWhere(xmProjectPhaseBaseline);	//列出XmProjectPhaseBaseline列表
-		PageUtils.responePage(m, xmProjectPhaseBaselineList);
-		m.put("data",xmProjectPhaseBaselineList);
-		Tips tips=new Tips("查询成功");
-		m.put("tips", tips);
-		return m;
-	}
-	
- 
-	
-	/**
-	@ApiOperation( value = "新增一条xm_project_phase_baseline信息",notes="addXmProjectPhaseBaseline,主键如果为空，后台自动生成")
-	@ApiResponses({
-		@ApiResponse(code = 200,response=XmProjectPhaseBaseline.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
-	}) 
-	@RequestMapping(value="/add",method=RequestMethod.POST)
-	public Map<String,Object> addXmProjectPhaseBaseline(@RequestBody XmProjectPhaseBaseline xmProjectPhaseBaseline) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功新增一条数据");
-		try{
-			if(StringUtils.isEmpty(xmProjectPhaseBaseline.getId())) {
-				xmProjectPhaseBaseline.setId(xmProjectPhaseBaselineService.createKey("id"));
-			}else{
-				 XmProjectPhaseBaseline xmProjectPhaseBaselineQuery = new  XmProjectPhaseBaseline(xmProjectPhaseBaseline.getId());
-				if(xmProjectPhaseBaselineService.countByWhere(xmProjectPhaseBaselineQuery)>0){
-					tips.setFailureMsg("编号重复，请修改编号再提交");
-					m.put("tips", tips);
-					return m;
-				}
-			}
-			xmProjectPhaseBaselineService.insert(xmProjectPhaseBaseline);
-			m.put("data",xmProjectPhaseBaseline);
-		}catch (BizException e) { 
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}  
-		m.put("tips", tips);
-		return m;
-	}
-	*/
-	
-	/**
-	@ApiOperation( value = "删除一条xm_project_phase_baseline信息",notes="delXmProjectPhaseBaseline,仅需要上传主键字段")
-	@ApiResponses({
-		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}")
-	}) 
-	@RequestMapping(value="/del",method=RequestMethod.POST)
-	public Map<String,Object> delXmProjectPhaseBaseline(@RequestBody XmProjectPhaseBaseline xmProjectPhaseBaseline){
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功删除一条数据");
-		try{
-			xmProjectPhaseBaselineService.deleteByPk(xmProjectPhaseBaseline);
-		}catch (BizException e) { 
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}  
-		m.put("tips", tips);
-		return m;
-	}
-	 */
-	
-	/**
-	@ApiOperation( value = "根据主键修改一条xm_project_phase_baseline信息",notes="editXmProjectPhaseBaseline")
-	@ApiResponses({
-		@ApiResponse(code = 200,response=XmProjectPhaseBaseline.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
-	}) 
-	@RequestMapping(value="/edit",method=RequestMethod.POST)
-	public Map<String,Object> editXmProjectPhaseBaseline(@RequestBody XmProjectPhaseBaseline xmProjectPhaseBaseline) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功更新一条数据");
-		try{
-			xmProjectPhaseBaselineService.updateByPk(xmProjectPhaseBaseline);
-			m.put("data",xmProjectPhaseBaseline);
-		}catch (BizException e) { 
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}  
-		m.put("tips", tips);
-		return m;
-	}
-	*/
-	
-
-	
-	/**
-	@ApiOperation( value = "根据主键列表批量删除xm_project_phase_baseline信息",notes="batchDelXmProjectPhaseBaseline,仅需要上传主键字段")
-	@ApiResponses({
-		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
-	}) 
-	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
-	public Map<String,Object> batchDelXmProjectPhaseBaseline(@RequestBody List<XmProjectPhaseBaseline> xmProjectPhaseBaselines) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功删除"+xmProjectPhaseBaselines.size()+"条数据"); 
-		try{ 
-			xmProjectPhaseBaselineService.batchDelete(xmProjectPhaseBaselines);
-		}catch (BizException e) { 
-			tips=e.getTips();
-			logger.error("",e);
-		}catch (Exception e) {
-			tips.setFailureMsg(e.getMessage());
-			logger.error("",e);
-		}  
-		m.put("tips", tips);
-		return m;
-	} 
-	*/
-}
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectBaseline.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectBaseline.java
deleted file mode 100644
index 0fb4ccaa..00000000
--- a/xm-core/src/main/java/com/xm/core/entity/XmProjectBaseline.java
+++ /dev/null
@@ -1,664 +0,0 @@
-package  com.xm.core.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import java.math.BigDecimal;
-
-/**
- * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
- * 实体 XmProjectBaseline所有属性名: <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,projectId;<br>
- * 表 XM.xm_project_baseline xm_project_baseline的所有字段名: <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,project_id;<br>
- * 当前主键(包括多主键):<br>
- *	id;<br>
- */
-@ApiModel(description="xm_project_baseline")
-public class XmProjectBaseline  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 code;
-	
-	@ApiModelProperty(notes="项目名称",allowEmptyValue=true,example="",allowableValues="")
-	String name;
-	
-	@ApiModelProperty(notes="项目类型",allowEmptyValue=true,example="",allowableValues="")
-	String xmType;
-	
-	@ApiModelProperty(notes="项目开始时间",allowEmptyValue=true,example="",allowableValues="")
-	Date startTime;
-	
-	@ApiModelProperty(notes="项目结束时间",allowEmptyValue=true,example="",allowableValues="")
-	Date endTime;
-	
-	@ApiModelProperty(notes="紧急程度",allowEmptyValue=true,example="",allowableValues="")
-	String urgent;
-	
-	@ApiModelProperty(notes="优先程度",allowEmptyValue=true,example="",allowableValues="")
-	String priority;
-	
-	@ApiModelProperty(notes="项目描述",allowEmptyValue=true,example="",allowableValues="")
-	String description;
-	
-	@ApiModelProperty(notes="项目创建人编号",allowEmptyValue=true,example="",allowableValues="")
-	String createUserid;
-	
-	@ApiModelProperty(notes="项目创建人",allowEmptyValue=true,example="",allowableValues="")
-	String createUsername;
-	
-	@ApiModelProperty(notes="创建时间",allowEmptyValue=true,example="",allowableValues="")
-	Date createTime;
-	
-	@ApiModelProperty(notes="项目考核",allowEmptyValue=true,example="",allowableValues="")
-	String assess;
-	
-	@ApiModelProperty(notes="考核备注",allowEmptyValue=true,example="",allowableValues="")
-	String assessRemarks;
-	
-	@ApiModelProperty(notes="项目状态，cs-初始，lxz-立项中，ssz-执行中，jxz-结项中，yjx-已结项，ztz-暂停，sq-售前，sh-售后",allowEmptyValue=true,example="",allowableValues="")
-	String status;
-	
-	@ApiModelProperty(notes="机构编号",allowEmptyValue=true,example="",allowableValues="")
-	String branchId;
-	
-	@ApiModelProperty(notes="总预算",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal planTotalCost;
-	
-	@ApiModelProperty(notes="当前流程实例编号",allowEmptyValue=true,example="",allowableValues="")
-	String bizProcInstId;
-	
-	@ApiModelProperty(notes="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",allowEmptyValue=true,example="",allowableValues="")
-	String bizFlowState;
-	
-	@ApiModelProperty(notes="非人力成本总预算-应该大于或等于计划非人力总成本",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal planNouserAt;
-	
-	@ApiModelProperty(notes="内部人力成本总预算-应该大于或等于计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal planInnerUserAt;
-	
-	@ApiModelProperty(notes="外购人力成本总预算-应该大于或等于计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal planOutUserAt;
-	
-	@ApiModelProperty(notes="是否锁定整个项目不允许变化0否1是",allowEmptyValue=true,example="",allowableValues="")
-	String locked;
-	
-	@ApiModelProperty(notes="基线时间",allowEmptyValue=true,example="",allowableValues="")
-	Date baseTime;
-	
-	@ApiModelProperty(notes="基线备注",allowEmptyValue=true,example="",allowableValues="")
-	String baseRemark;
-	
-	@ApiModelProperty(notes="基线主键",allowEmptyValue=true,example="",allowableValues="")
-	String baselineId;
-	
-	@ApiModelProperty(notes="总预算工作量-应该大于或等于计划总工作量",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal planWorkload;
-	
-	@ApiModelProperty(notes="总预计收款金额",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalReceivables;
-	
-	@ApiModelProperty(notes="预估毛利率",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal budgetMarginRate;
-	
-	@ApiModelProperty(notes="合同总金额",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal contractAmt;
-	
-	@ApiModelProperty(notes="内部人力成本单价元/人时",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal planInnerUserPrice;
-	
-	@ApiModelProperty(notes="外购人力成本单价元/人时",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal planOutUserPrice;
-	
-	@ApiModelProperty(notes="外购人数",allowEmptyValue=true,example="",allowableValues="")
-	Integer planOutUserCnt;
-	
-	@ApiModelProperty(notes="内部人数",allowEmptyValue=true,example="",allowableValues="")
-	Integer planInnerUserCnt;
-	
-	@ApiModelProperty(notes="预计工作小时数目",allowEmptyValue=true,example="",allowableValues="")
-	Integer planWorkingHours;
-	
-	@ApiModelProperty(notes="税率",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal taxRate;
-	
-	@ApiModelProperty(notes="内部人力总工作量-应该大于或等于计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal planInnerUserWorkload;
-	
-	@ApiModelProperty(notes="外购人力总工作量-应该大于或等于计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal planOutUserWorkload;
-	
-	@ApiModelProperty(notes="关联模板编号",allowEmptyValue=true,example="",allowableValues="")
-	String fromTplId;
-	
-	@ApiModelProperty(notes="是否进行预算控制",allowEmptyValue=true,example="",allowableValues="")
-	String budgetCtrl;
-	
-	@ApiModelProperty(notes="部门编号",allowEmptyValue=true,example="",allowableValues="")
-	String deptid;
-	
-	@ApiModelProperty(notes="项目编号",allowEmptyValue=true,example="",allowableValues="")
-	String projectId;
-
-	/**项目基线编号**/
-	public XmProjectBaseline(String id) {
-		this.id = id;
-	}
-    
-    /**xm_project_baseline**/
-	public XmProjectBaseline() {
-	}
-	
-	/**
-	 * 项目基线编号
-	 **/
-	public void setId(String id) {
-		this.id = id;
-	}
-	/**
-	 * 项目代号
-	 **/
-	public void setCode(String code) {
-		this.code = code;
-	}
-	/**
-	 * 项目名称
-	 **/
-	public void setName(String name) {
-		this.name = name;
-	}
-	/**
-	 * 项目类型
-	 **/
-	public void setXmType(String xmType) {
-		this.xmType = xmType;
-	}
-	/**
-	 * 项目开始时间
-	 **/
-	public void setStartTime(Date startTime) {
-		this.startTime = startTime;
-	}
-	/**
-	 * 项目结束时间
-	 **/
-	public void setEndTime(Date endTime) {
-		this.endTime = endTime;
-	}
-	/**
-	 * 紧急程度
-	 **/
-	public void setUrgent(String urgent) {
-		this.urgent = urgent;
-	}
-	/**
-	 * 优先程度
-	 **/
-	public void setPriority(String priority) {
-		this.priority = priority;
-	}
-	/**
-	 * 项目描述
-	 **/
-	public void setDescription(String description) {
-		this.description = description;
-	}
-	/**
-	 * 项目创建人编号
-	 **/
-	public void setCreateUserid(String createUserid) {
-		this.createUserid = createUserid;
-	}
-	/**
-	 * 项目创建人
-	 **/
-	public void setCreateUsername(String createUsername) {
-		this.createUsername = createUsername;
-	}
-	/**
-	 * 创建时间
-	 **/
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-	/**
-	 * 项目考核
-	 **/
-	public void setAssess(String assess) {
-		this.assess = assess;
-	}
-	/**
-	 * 考核备注
-	 **/
-	public void setAssessRemarks(String assessRemarks) {
-		this.assessRemarks = assessRemarks;
-	}
-	/**
-	 * 项目状态，cs-初始，lxz-立项中，ssz-执行中，jxz-结项中，yjx-已结项，ztz-暂停，sq-售前，sh-售后
-	 **/
-	public void setStatus(String status) {
-		this.status = status;
-	}
-	/**
-	 * 机构编号
-	 **/
-	public void setBranchId(String branchId) {
-		this.branchId = branchId;
-	}
-	/**
-	 * 总预算
-	 **/
-	public void setPlanTotalCost(BigDecimal planTotalCost) {
-		this.planTotalCost = planTotalCost;
-	}
-	/**
-	 * 当前流程实例编号
-	 **/
-	public void setBizProcInstId(String bizProcInstId) {
-		this.bizProcInstId = bizProcInstId;
-	}
-	/**
-	 * 当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除
-	 **/
-	public void setBizFlowState(String bizFlowState) {
-		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;
-	}
-	/**
-	 * 是否锁定整个项目不允许变化0否1是
-	 **/
-	public void setLocked(String locked) {
-		this.locked = locked;
-	}
-	/**
-	 * 基线时间
-	 **/
-	public void setBaseTime(Date baseTime) {
-		this.baseTime = baseTime;
-	}
-	/**
-	 * 基线备注
-	 **/
-	public void setBaseRemark(String baseRemark) {
-		this.baseRemark = baseRemark;
-	}
-	/**
-	 * 基线主键
-	 **/
-	public void setBaselineId(String baselineId) {
-		this.baselineId = baselineId;
-	}
-	/**
-	 * 总预算工作量-应该大于或等于计划总工作量
-	 **/
-	public void setPlanWorkload(BigDecimal planWorkload) {
-		this.planWorkload = planWorkload;
-	}
-	/**
-	 * 总预计收款金额
-	 **/
-	public void setTotalReceivables(BigDecimal totalReceivables) {
-		this.totalReceivables = totalReceivables;
-	}
-	/**
-	 * 预估毛利率
-	 **/
-	public void setBudgetMarginRate(BigDecimal budgetMarginRate) {
-		this.budgetMarginRate = budgetMarginRate;
-	}
-	/**
-	 * 合同总金额
-	 **/
-	public void setContractAmt(BigDecimal contractAmt) {
-		this.contractAmt = contractAmt;
-	}
-	/**
-	 * 内部人力成本单价元/人时
-	 **/
-	public void setPlanInnerUserPrice(BigDecimal planInnerUserPrice) {
-		this.planInnerUserPrice = planInnerUserPrice;
-	}
-	/**
-	 * 外购人力成本单价元/人时
-	 **/
-	public void setPlanOutUserPrice(BigDecimal planOutUserPrice) {
-		this.planOutUserPrice = planOutUserPrice;
-	}
-	/**
-	 * 外购人数
-	 **/
-	public void setPlanOutUserCnt(Integer planOutUserCnt) {
-		this.planOutUserCnt = planOutUserCnt;
-	}
-	/**
-	 * 内部人数
-	 **/
-	public void setPlanInnerUserCnt(Integer planInnerUserCnt) {
-		this.planInnerUserCnt = planInnerUserCnt;
-	}
-	/**
-	 * 预计工作小时数目
-	 **/
-	public void setPlanWorkingHours(Integer planWorkingHours) {
-		this.planWorkingHours = planWorkingHours;
-	}
-	/**
-	 * 税率
-	 **/
-	public void setTaxRate(BigDecimal taxRate) {
-		this.taxRate = taxRate;
-	}
-	/**
-	 * 内部人力总工作量-应该大于或等于计划内部人力总成本
-	 **/
-	public void setPlanInnerUserWorkload(BigDecimal planInnerUserWorkload) {
-		this.planInnerUserWorkload = planInnerUserWorkload;
-	}
-	/**
-	 * 外购人力总工作量-应该大于或等于计划外购人力总成本
-	 **/
-	public void setPlanOutUserWorkload(BigDecimal planOutUserWorkload) {
-		this.planOutUserWorkload = planOutUserWorkload;
-	}
-	/**
-	 * 关联模板编号
-	 **/
-	public void setFromTplId(String fromTplId) {
-		this.fromTplId = fromTplId;
-	}
-	/**
-	 * 是否进行预算控制
-	 **/
-	public void setBudgetCtrl(String budgetCtrl) {
-		this.budgetCtrl = budgetCtrl;
-	}
-	/**
-	 * 部门编号
-	 **/
-	public void setDeptid(String deptid) {
-		this.deptid = deptid;
-	}
-	/**
-	 * 项目编号
-	 **/
-	public void setProjectId(String projectId) {
-		this.projectId = projectId;
-	}
-	
-	/**
-	 * 项目基线编号
-	 **/
-	public String getId() {
-		return this.id;
-	}
-	/**
-	 * 项目代号
-	 **/
-	public String getCode() {
-		return this.code;
-	}
-	/**
-	 * 项目名称
-	 **/
-	public String getName() {
-		return this.name;
-	}
-	/**
-	 * 项目类型
-	 **/
-	public String getXmType() {
-		return this.xmType;
-	}
-	/**
-	 * 项目开始时间
-	 **/
-	public Date getStartTime() {
-		return this.startTime;
-	}
-	/**
-	 * 项目结束时间
-	 **/
-	public Date getEndTime() {
-		return this.endTime;
-	}
-	/**
-	 * 紧急程度
-	 **/
-	public String getUrgent() {
-		return this.urgent;
-	}
-	/**
-	 * 优先程度
-	 **/
-	public String getPriority() {
-		return this.priority;
-	}
-	/**
-	 * 项目描述
-	 **/
-	public String getDescription() {
-		return this.description;
-	}
-	/**
-	 * 项目创建人编号
-	 **/
-	public String getCreateUserid() {
-		return this.createUserid;
-	}
-	/**
-	 * 项目创建人
-	 **/
-	public String getCreateUsername() {
-		return this.createUsername;
-	}
-	/**
-	 * 创建时间
-	 **/
-	public Date getCreateTime() {
-		return this.createTime;
-	}
-	/**
-	 * 项目考核
-	 **/
-	public String getAssess() {
-		return this.assess;
-	}
-	/**
-	 * 考核备注
-	 **/
-	public String getAssessRemarks() {
-		return this.assessRemarks;
-	}
-	/**
-	 * 项目状态，cs-初始，lxz-立项中，ssz-执行中，jxz-结项中，yjx-已结项，ztz-暂停，sq-售前，sh-售后
-	 **/
-	public String getStatus() {
-		return this.status;
-	}
-	/**
-	 * 机构编号
-	 **/
-	public String getBranchId() {
-		return this.branchId;
-	}
-	/**
-	 * 总预算
-	 **/
-	public BigDecimal getPlanTotalCost() {
-		return this.planTotalCost;
-	}
-	/**
-	 * 当前流程实例编号
-	 **/
-	public String getBizProcInstId() {
-		return this.bizProcInstId;
-	}
-	/**
-	 * 当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除
-	 **/
-	public String getBizFlowState() {
-		return this.bizFlowState;
-	}
-	/**
-	 * 非人力成本总预算-应该大于或等于计划非人力总成本
-	 **/
-	public BigDecimal getPlanNouserAt() {
-		return this.planNouserAt;
-	}
-	/**
-	 * 内部人力成本总预算-应该大于或等于计划内部人力总成本
-	 **/
-	public BigDecimal getPlanInnerUserAt() {
-		return this.planInnerUserAt;
-	}
-	/**
-	 * 外购人力成本总预算-应该大于或等于计划外购人力总成本
-	 **/
-	public BigDecimal getPlanOutUserAt() {
-		return this.planOutUserAt;
-	}
-	/**
-	 * 是否锁定整个项目不允许变化0否1是
-	 **/
-	public String getLocked() {
-		return this.locked;
-	}
-	/**
-	 * 基线时间
-	 **/
-	public Date getBaseTime() {
-		return this.baseTime;
-	}
-	/**
-	 * 基线备注
-	 **/
-	public String getBaseRemark() {
-		return this.baseRemark;
-	}
-	/**
-	 * 基线主键
-	 **/
-	public String getBaselineId() {
-		return this.baselineId;
-	}
-	/**
-	 * 总预算工作量-应该大于或等于计划总工作量
-	 **/
-	public BigDecimal getPlanWorkload() {
-		return this.planWorkload;
-	}
-	/**
-	 * 总预计收款金额
-	 **/
-	public BigDecimal getTotalReceivables() {
-		return this.totalReceivables;
-	}
-	/**
-	 * 预估毛利率
-	 **/
-	public BigDecimal getBudgetMarginRate() {
-		return this.budgetMarginRate;
-	}
-	/**
-	 * 合同总金额
-	 **/
-	public BigDecimal getContractAmt() {
-		return this.contractAmt;
-	}
-	/**
-	 * 内部人力成本单价元/人时
-	 **/
-	public BigDecimal getPlanInnerUserPrice() {
-		return this.planInnerUserPrice;
-	}
-	/**
-	 * 外购人力成本单价元/人时
-	 **/
-	public BigDecimal getPlanOutUserPrice() {
-		return this.planOutUserPrice;
-	}
-	/**
-	 * 外购人数
-	 **/
-	public Integer getPlanOutUserCnt() {
-		return this.planOutUserCnt;
-	}
-	/**
-	 * 内部人数
-	 **/
-	public Integer getPlanInnerUserCnt() {
-		return this.planInnerUserCnt;
-	}
-	/**
-	 * 预计工作小时数目
-	 **/
-	public Integer getPlanWorkingHours() {
-		return this.planWorkingHours;
-	}
-	/**
-	 * 税率
-	 **/
-	public BigDecimal getTaxRate() {
-		return this.taxRate;
-	}
-	/**
-	 * 内部人力总工作量-应该大于或等于计划内部人力总成本
-	 **/
-	public BigDecimal getPlanInnerUserWorkload() {
-		return this.planInnerUserWorkload;
-	}
-	/**
-	 * 外购人力总工作量-应该大于或等于计划外购人力总成本
-	 **/
-	public BigDecimal getPlanOutUserWorkload() {
-		return this.planOutUserWorkload;
-	}
-	/**
-	 * 关联模板编号
-	 **/
-	public String getFromTplId() {
-		return this.fromTplId;
-	}
-	/**
-	 * 是否进行预算控制
-	 **/
-	public String getBudgetCtrl() {
-		return this.budgetCtrl;
-	}
-	/**
-	 * 部门编号
-	 **/
-	public String getDeptid() {
-		return this.deptid;
-	}
-	/**
-	 * 项目编号
-	 **/
-	public String getProjectId() {
-		return this.projectId;
-	}
-
-}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectPhaseBaseline.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectPhaseBaseline.java
deleted file mode 100644
index 4e756ab2..00000000
--- a/xm-core/src/main/java/com/xm/core/entity/XmProjectPhaseBaseline.java
+++ /dev/null
@@ -1,365 +0,0 @@
-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  顶级模块 oa 大模块 xm  小模块 <br> 
- * 实体 XmProjectPhaseBaseline所有属性名: <br>
- *	baseCtime,projectPhaseId,phaseName,remark,parentPhaseId,branchId,projectId,beginDate,endDate,planWorkingHours,planWorkingStaffNu,ctime,totalBudgetNouser,totalBudgetInnerUser,totalBudgetOutUser,id,baseRemark,projectBaselineId,bizProcInstId,bizFlowState,totalBudgetWorkload,totalActWorkload;<br>
- * 表 XM.xm_project_phase_baseline xm_project_phase_baseline的所有字段名: <br>
- *	base_ctime,project_phase_id,phase_name,remark,parent_phase_id,branch_id,project_id,begin_date,end_date,plan_working_hours,plan_working_staff_nu,ctime,total_budget_nouser,total_budget_inner_user,total_budget_out_user,id,base_remark,project_baseline_id,biz_proc_inst_id,biz_flow_state,total_budget_workload,total_act_workload;<br>
- * 当前主键(包括多主键):<br>
- *	id;<br>
- */
-@ApiModel(description="xm_project_phase_baseline")
-public class XmProjectPhaseBaseline  implements java.io.Serializable {
-	
-	private static final long serialVersionUID = 1L;
-	
-	@ApiModelProperty(notes="基线主键,主键",allowEmptyValue=true,example="",allowableValues="")
-	String id;
-  	
-	
-	@ApiModelProperty(notes="基线建立时间",allowEmptyValue=true,example="",allowableValues="")
-	Date baseCtime;
-	
-	@ApiModelProperty(notes="阶段主键",allowEmptyValue=true,example="",allowableValues="")
-	String projectPhaseId;
-	
-	@ApiModelProperty(notes="阶段名称",allowEmptyValue=true,example="",allowableValues="")
-	String phaseName;
-	
-	@ApiModelProperty(notes="备注",allowEmptyValue=true,example="",allowableValues="")
-	String remark;
-	
-	@ApiModelProperty(notes="上级阶段编号",allowEmptyValue=true,example="",allowableValues="")
-	String parentPhaseId;
-	
-	@ApiModelProperty(notes="机构编号",allowEmptyValue=true,example="",allowableValues="")
-	String branchId;
-	
-	@ApiModelProperty(notes="当前项目编号",allowEmptyValue=true,example="",allowableValues="")
-	String projectId;
-	
-	@ApiModelProperty(notes="开始时间",allowEmptyValue=true,example="",allowableValues="")
-	Date beginDate;
-	
-	@ApiModelProperty(notes="结束时间",allowEmptyValue=true,example="",allowableValues="")
-	Date endDate;
-	
-	@ApiModelProperty(notes="工时",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal planWorkingHours;
-	
-	@ApiModelProperty(notes="投入人员数",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal planWorkingStaffNu;
-	
-	@ApiModelProperty(notes="创建时间",allowEmptyValue=true,example="",allowableValues="")
-	Date ctime;
-	
-	@ApiModelProperty(notes="非人力成本总预算",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalBudgetNouser;
-	
-	@ApiModelProperty(notes="内部人力成本总预算",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalBudgetInnerUser;
-	
-	@ApiModelProperty(notes="外购人力成本总预算",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalBudgetOutUser;
-	
-	@ApiModelProperty(notes="基线备注",allowEmptyValue=true,example="",allowableValues="")
-	String baseRemark;
-	
-	@ApiModelProperty(notes="项目级基线",allowEmptyValue=true,example="",allowableValues="")
-	String projectBaselineId;
-	
-	@ApiModelProperty(notes="当前流程实例编号",allowEmptyValue=true,example="",allowableValues="")
-	String bizProcInstId;
-	
-	@ApiModelProperty(notes="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",allowEmptyValue=true,example="",allowableValues="")
-	String bizFlowState;
-	
-	@ApiModelProperty(notes="总工作量单位人时",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalBudgetWorkload;
-	
-	@ApiModelProperty(notes="已完成工作量单位人时",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal totalActWorkload;
-
-	/**基线主键**/
-	public XmProjectPhaseBaseline(String id) {
-		this.id = id;
-	}
-    
-    /**xm_project_phase_baseline**/
-	public XmProjectPhaseBaseline() {
-	}
-	
-	/**
-	 * 基线建立时间
-	 **/
-	public void setBaseCtime(Date baseCtime) {
-		this.baseCtime = baseCtime;
-	}
-	/**
-	 * 阶段主键
-	 **/
-	public void setProjectPhaseId(String projectPhaseId) {
-		this.projectPhaseId = projectPhaseId;
-	}
-	/**
-	 * 阶段名称
-	 **/
-	public void setPhaseName(String phaseName) {
-		this.phaseName = phaseName;
-	}
-	/**
-	 * 备注
-	 **/
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-	/**
-	 * 上级阶段编号
-	 **/
-	public void setParentPhaseId(String parentPhaseId) {
-		this.parentPhaseId = parentPhaseId;
-	}
-	/**
-	 * 机构编号
-	 **/
-	public void setBranchId(String branchId) {
-		this.branchId = branchId;
-	}
-	/**
-	 * 当前项目编号
-	 **/
-	public void setProjectId(String projectId) {
-		this.projectId = projectId;
-	}
-	/**
-	 * 开始时间
-	 **/
-	public void setBeginDate(Date beginDate) {
-		this.beginDate = beginDate;
-	}
-	/**
-	 * 结束时间
-	 **/
-	public void setEndDate(Date endDate) {
-		this.endDate = endDate;
-	}
-	/**
-	 * 工时
-	 **/
-	public void setPlanWorkingHours(BigDecimal planWorkingHours) {
-		this.planWorkingHours = planWorkingHours;
-	}
-	/**
-	 * 投入人员数
-	 **/
-	public void setPlanWorkingStaffNu(BigDecimal planWorkingStaffNu) {
-		this.planWorkingStaffNu = planWorkingStaffNu;
-	}
-	/**
-	 * 创建时间
-	 **/
-	public void setCtime(Date ctime) {
-		this.ctime = ctime;
-	}
-	/**
-	 * 非人力成本总预算
-	 **/
-	public void setTotalBudgetNouser(BigDecimal totalBudgetNouser) {
-		this.totalBudgetNouser = totalBudgetNouser;
-	}
-	/**
-	 * 内部人力成本总预算
-	 **/
-	public void setTotalBudgetInnerUser(BigDecimal totalBudgetInnerUser) {
-		this.totalBudgetInnerUser = totalBudgetInnerUser;
-	}
-	/**
-	 * 外购人力成本总预算
-	 **/
-	public void setTotalBudgetOutUser(BigDecimal totalBudgetOutUser) {
-		this.totalBudgetOutUser = totalBudgetOutUser;
-	}
-	/**
-	 * 基线主键
-	 **/
-	public void setId(String id) {
-		this.id = id;
-	}
-	/**
-	 * 基线备注
-	 **/
-	public void setBaseRemark(String baseRemark) {
-		this.baseRemark = baseRemark;
-	}
-	/**
-	 * 项目级基线
-	 **/
-	public void setProjectBaselineId(String projectBaselineId) {
-		this.projectBaselineId = projectBaselineId;
-	}
-	/**
-	 * 当前流程实例编号
-	 **/
-	public void setBizProcInstId(String bizProcInstId) {
-		this.bizProcInstId = bizProcInstId;
-	}
-	/**
-	 * 当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除
-	 **/
-	public void setBizFlowState(String bizFlowState) {
-		this.bizFlowState = bizFlowState;
-	}
-	/**
-	 * 总工作量单位人时
-	 **/
-	public void setTotalBudgetWorkload(BigDecimal totalBudgetWorkload) {
-		this.totalBudgetWorkload = totalBudgetWorkload;
-	}
-	/**
-	 * 已完成工作量单位人时
-	 **/
-	public void setTotalActWorkload(BigDecimal totalActWorkload) {
-		this.totalActWorkload = totalActWorkload;
-	}
-	
-	/**
-	 * 基线建立时间
-	 **/
-	public Date getBaseCtime() {
-		return this.baseCtime;
-	}
-	/**
-	 * 阶段主键
-	 **/
-	public String getProjectPhaseId() {
-		return this.projectPhaseId;
-	}
-	/**
-	 * 阶段名称
-	 **/
-	public String getPhaseName() {
-		return this.phaseName;
-	}
-	/**
-	 * 备注
-	 **/
-	public String getRemark() {
-		return this.remark;
-	}
-	/**
-	 * 上级阶段编号
-	 **/
-	public String getParentPhaseId() {
-		return this.parentPhaseId;
-	}
-	/**
-	 * 机构编号
-	 **/
-	public String getBranchId() {
-		return this.branchId;
-	}
-	/**
-	 * 当前项目编号
-	 **/
-	public String getProjectId() {
-		return this.projectId;
-	}
-	/**
-	 * 开始时间
-	 **/
-	public Date getBeginDate() {
-		return this.beginDate;
-	}
-	/**
-	 * 结束时间
-	 **/
-	public Date getEndDate() {
-		return this.endDate;
-	}
-	/**
-	 * 工时
-	 **/
-	public BigDecimal getPlanWorkingHours() {
-		return this.planWorkingHours;
-	}
-	/**
-	 * 投入人员数
-	 **/
-	public BigDecimal getPlanWorkingStaffNu() {
-		return this.planWorkingStaffNu;
-	}
-	/**
-	 * 创建时间
-	 **/
-	public Date getCtime() {
-		return this.ctime;
-	}
-	/**
-	 * 非人力成本总预算
-	 **/
-	public BigDecimal getTotalBudgetNouser() {
-		return this.totalBudgetNouser;
-	}
-	/**
-	 * 内部人力成本总预算
-	 **/
-	public BigDecimal getTotalBudgetInnerUser() {
-		return this.totalBudgetInnerUser;
-	}
-	/**
-	 * 外购人力成本总预算
-	 **/
-	public BigDecimal getTotalBudgetOutUser() {
-		return this.totalBudgetOutUser;
-	}
-	/**
-	 * 基线主键
-	 **/
-	public String getId() {
-		return this.id;
-	}
-	/**
-	 * 基线备注
-	 **/
-	public String getBaseRemark() {
-		return this.baseRemark;
-	}
-	/**
-	 * 项目级基线
-	 **/
-	public String getProjectBaselineId() {
-		return this.projectBaselineId;
-	}
-	/**
-	 * 当前流程实例编号
-	 **/
-	public String getBizProcInstId() {
-		return this.bizProcInstId;
-	}
-	/**
-	 * 当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除
-	 **/
-	public String getBizFlowState() {
-		return this.bizFlowState;
-	}
-	/**
-	 * 总工作量单位人时
-	 **/
-	public BigDecimal getTotalBudgetWorkload() {
-		return this.totalBudgetWorkload;
-	}
-	/**
-	 * 已完成工作量单位人时
-	 **/
-	public BigDecimal getTotalActWorkload() {
-		return this.totalActWorkload;
-	}
-
-}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectBaselineService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectBaselineService.java
deleted file mode 100644
index f3d71e28..00000000
--- a/xm-core/src/main/java/com/xm/core/service/XmProjectBaselineService.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.xm.core.service;
-
-import com.mdp.core.service.BaseService;
-import com.mdp.core.service.SequenceService;
-import com.xm.core.entity.XmProject;
-import com.xm.core.entity.XmProjectBaseline;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-/**
- * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
- * 组织 com.qqkj  顶级模块 oa 大模块 xm 小模块 <br>
- * 实体 XmProjectBaseline 表 XM.xm_project_baseline 当前主键(包括多主键): id; 
- ***/
-@Service("xm.core.xmProjectBaselineService")
-public class XmProjectBaselineService extends BaseService {
-	
-	/** 请在此类添加自定义函数 */
-	@Autowired
-	SequenceService sequenceService;
-	
-	/**
-	 * 创建基线
-	 * @param project 一定要从数据库先查询，否则基线数据不全
-	 * @return
-	 */
-	public  XmProjectBaseline createBaseline(XmProject project,String remark){
-		XmProjectBaseline projectBase=new XmProjectBaseline();
-		BeanUtils.copyProperties(project, projectBase);
-		projectBase.setId(this.createKey("id"));
-		projectBase.setProjectId(project.getId());
-		projectBase.setBaseTime(new Date());
-		projectBase.setBaseRemark(remark);
-		projectBase.setBaselineId(sequenceService.getCommonNo("{date:yyyyMMddHHmmssS}-{rand:4}"));
-		this.insert(projectBase);
-		return projectBase;
-	}
-	
-
-}
-
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseBaselineService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseBaselineService.java
deleted file mode 100644
index 76bd61da..00000000
--- a/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseBaselineService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.xm.core.service;
-
-import com.mdp.core.service.BaseService;
-import org.springframework.stereotype.Service;
-
-/**
- * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
- * 组织 com.qqkj  顶级模块 oa 大模块 xm 小模块 <br>
- * 实体 XmProjectPhaseBaseline 表 XM.xm_project_phase_baseline 当前主键(包括多主键): id; 
- ***/
-@Service("xm.core.xmProjectPhaseBaselineService")
-public class XmProjectPhaseBaselineService extends BaseService {
-	
-	/** 请在此类添加自定义函数 */
-
-}
-
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectBaselineMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectBaselineMapper.xml
deleted file mode 100644
index 4716a9fb..00000000
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectBaselineMapper.xml
+++ /dev/null
@@ -1,307 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xm.core.entity.XmProjectBaseline">
-	
-	
-	<!--开始 自定sql函数区域 -->
-		<!--请在此区域添加自定义函数-->
-		
-		
-		
-	<!--结束 自定义sql函数区域-->
-	
-
-	
-	<!-- 通过条件查询获取数据列表 返回list<map> -->
-	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
-		select * from xm_project_baseline res
-		<where> 
-			<if test="ids != null">  and     
-				id in
-				    <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >  
-				        #{item}  
-				    </foreach>  
-			 </if>
-			<include refid="where"/>
-			<if test="key != null and key !='' ">       </if> 
-		</where>
-	</select>
-	
-	<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->
-	<select id="selectListByWhere" parameterType="com.xm.core.entity.XmProjectBaseline" resultType="com.xm.core.entity.XmProjectBaseline">
-		select * from xm_project_baseline res
-		<where>
-			<include refid="where"/>
-		</where>
-	</select>
-	
-		<!-- 通过主键查询获取数据对象 返回object -->
-	<select id="selectOneObject" parameterType="com.xm.core.entity.XmProjectBaseline" resultType="com.xm.core.entity.XmProjectBaseline">
-		select * from xm_project_baseline res
-		where 
-			res.id = #{id}
-	</select>
-	
-	<!-- 通过主键查询获取数据对象 返回map-->
-	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
-		select * from xm_project_baseline res
-		where 
-			 res.id = #{id}
-	</select>
-	<!-- 获取数据条目 返回long -->
-	<select id="countByWhere" parameterType="com.xm.core.entity.XmProjectBaseline" resultType="long">
-		select count(1) from xm_project_baseline res
-		<where>
-			<include refid="where"/>
-		</where>
-	</select>
-	<!-- 新增一条记录  主键id,-->
-	<insert id="insert" parameterType="com.xm.core.entity.XmProjectBaseline" useGeneratedKeys="false"   keyProperty="id">
-		insert into xm_project_baseline(
-			<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},#{projectId}
-		)
-	</insert>
-	
-	<!-- 按条件删除若干条记录-->
-	<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmProjectBaseline">
-		delete from xm_project_baseline
-		<where>  
-			1=2
-		</where>
-	</delete>
-	
-	<!-- 按主键删除一条记录-->
-	<delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectBaseline">
-		delete from xm_project_baseline
-		where id = #{id} 
-	</delete>
-	
-	<!-- 根据条件修改若干条记录 -->
-	<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectBaseline">
-		update  xm_project_baseline
-		<set>
-			<include refid="someFieldSet"/>
-		</set>
-		where id = #{id} 
-	</update>
-	
-		<!-- 根据主键修改一条记录 -->
-	<update id="updateByPk" parameterType="com.xm.core.entity.XmProjectBaseline">
-		update  xm_project_baseline
-		<set>
-			<include refid="set"/>
-		</set>
-		where id = #{id} 
-	</update>
-
-	<!-- 批量新增  批量插入 借用insert 循环插入实现
-	<insert id="batchInsert" parameterType="List">
- 	</insert>
- 	-->
- 	
-	<!-- 批量更新 -->
-	<update id="batchUpdate" parameterType="List">   
-		<foreach collection="list" item="item" index="index" separator=";" >
-   		update  xm_project_baseline
-		set 
-			<include refid="batchSet"/>
-			where id = #{item.id}  
-		</foreach> 
-	</update>
-	<!-- 批量删除 -->
-	<delete id="batchDelete" parameterType="List">  
-		delete from xm_project_baseline
-			where
-			(id)
-			    in
-                <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
-                    ( #{item.id}
-                    )
-                </foreach>
-	</delete>
-	
-	
-	<!--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,project_id
-	</sql>
-
-	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
-	<sql id="where">
-		<if test="id != null and id != ''">      and res.id = #{id}     </if>
-		<if test="code != null and code != ''">      and res.code = #{code}     </if>
-		<if test="name != null and name != ''">      and res.name = #{name}     </if>
-		<if test="xmType != null and xmType != ''">      and res.xm_type = #{xmType}     </if>
-		<if test="startTime != null">      and date_format(res.start_time,'%Y-%m-%d') = date_format(#{startTime},'%Y-%m-%d')     </if>
-		<if test="endTime != null">      and date_format(res.end_time,'%Y-%m-%d') = date_format(#{endTime},'%Y-%m-%d')     </if>
-		<if test="urgent != null and urgent != ''">      and res.urgent = #{urgent}     </if>
-		<if test="priority != null and priority != ''">      and res.priority = #{priority}     </if>
-		<if test="description != null and description != ''">      and res.description = #{description}     </if>
-		<if test="createUserid != null and createUserid != ''">      and res.create_userid = #{createUserid}     </if>
-		<if test="createUsername != null and createUsername != ''">      and res.create_username = #{createUsername}     </if>
-		<if test="createTime != null">      and date_format(res.create_time,'%Y-%m-%d') = date_format(#{createTime},'%Y-%m-%d')     </if>
-		<if test="assess != null and assess != ''">      and res.assess = #{assess}     </if>
-		<if test="assessRemarks != null and assessRemarks != ''">      and res.assess_remarks = #{assessRemarks}     </if>
-		<if test="status != null and status != ''">      and res.status = #{status}     </if>
-		<if test="branchId != null and branchId != ''">      and res.branch_id = #{branchId}     </if>
-		<if test="planTotalCost != null and planTotalCost != ''">      and res.plan_total_cost = #{planTotalCost}     </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="planNouserAt != null and planNouserAt != ''">      and res.plan_nouser_at = #{planNouserAt}     </if>
-		<if test="planInnerUserAt != null and planInnerUserAt != ''">      and res.plan_inner_user_at = #{planInnerUserAt}     </if>
-		<if test="planOutUserAt != null and planOutUserAt != ''">      and res.plan_out_user_at = #{planOutUserAt}     </if>
-		<if test="locked != null and locked != ''">      and res.locked = #{locked}     </if>
-		<if test="baseTime != null">      and date_format(res.base_time,'%Y-%m-%d') = date_format(#{baseTime},'%Y-%m-%d')     </if>
-		<if test="baseRemark != null and baseRemark != ''">      and res.base_remark = #{baseRemark}     </if>
-		<if test="baselineId != null and baselineId != ''">      and res.baseline_id = #{baselineId}     </if>
-		<if test="planWorkload != null and planWorkload != ''">      and res.plan_workload = #{planWorkload}     </if>
-		<if test="totalReceivables != null and totalReceivables != ''">      and res.total_receivables = #{totalReceivables}     </if>
-		<if test="budgetMarginRate != null and budgetMarginRate != ''">      and res.budget_margin_rate = #{budgetMarginRate}     </if>
-		<if test="contractAmt != null and contractAmt != ''">      and res.contract_amt = #{contractAmt}     </if>
-		<if test="planInnerUserPrice != null and planInnerUserPrice != ''">      and res.plan_inner_user_price = #{planInnerUserPrice}     </if>
-		<if test="planOutUserPrice != null and planOutUserPrice != ''">      and res.plan_out_user_price = #{planOutUserPrice}     </if>
-		<if test="planOutUserCnt != null and planOutUserCnt != ''">      and res.plan_out_user_cnt = #{planOutUserCnt}     </if>
-		<if test="planInnerUserCnt != null and planInnerUserCnt != ''">      and res.plan_inner_user_cnt = #{planInnerUserCnt}     </if>
-		<if test="planWorkingHours != null and planWorkingHours != ''">      and res.plan_working_hours = #{planWorkingHours}     </if>
-		<if test="taxRate != null and taxRate != ''">      and res.tax_rate = #{taxRate}     </if>
-		<if test="planInnerUserWorkload != null and planInnerUserWorkload != ''">      and res.plan_inner_user_workload = #{planInnerUserWorkload}     </if>
-		<if test="planOutUserWorkload != null and planOutUserWorkload != ''">      and res.plan_out_user_workload = #{planOutUserWorkload}     </if>
-		<if test="fromTplId != null and fromTplId != ''">      and res.from_tpl_id = #{fromTplId}     </if>
-		<if test="budgetCtrl != null and budgetCtrl != ''">      and res.budget_ctrl = #{budgetCtrl}     </if>
-		<if test="deptid != null and deptid != ''">      and res.deptid = #{deptid}     </if>
-		<if test="projectId != null and projectId != ''">      and res.project_id = #{projectId}     </if>
-	</sql>
-	<!--sql片段 更新字段 -->
-	<sql id="set">
-		code = #{code},
-		name = #{name},
-		xm_type = #{xmType},
-		start_time = #{startTime},
-		end_time = #{endTime},
-		urgent = #{urgent},
-		priority = #{priority},
-		description = #{description},
-		create_userid = #{createUserid},
-		create_username = #{createUsername},
-		create_time = #{createTime},
-		assess = #{assess},
-		assess_remarks = #{assessRemarks},
-		status = #{status},
-		branch_id = #{branchId},
-		plan_total_cost = #{planTotalCost},
-		biz_proc_inst_id = #{bizProcInstId},
-		biz_flow_state = #{bizFlowState},
-		plan_nouser_at = #{planNouserAt},
-		plan_inner_user_at = #{planInnerUserAt},
-		plan_out_user_at = #{planOutUserAt},
-		locked = #{locked},
-		base_time = #{baseTime},
-		base_remark = #{baseRemark},
-		baseline_id = #{baselineId},
-		plan_workload = #{planWorkload},
-		total_receivables = #{totalReceivables},
-		budget_margin_rate = #{budgetMarginRate},
-		contract_amt = #{contractAmt},
-		plan_inner_user_price = #{planInnerUserPrice},
-		plan_out_user_price = #{planOutUserPrice},
-		plan_out_user_cnt = #{planOutUserCnt},
-		plan_inner_user_cnt = #{planInnerUserCnt},
-		plan_working_hours = #{planWorkingHours},
-		tax_rate = #{taxRate},
-		plan_inner_user_workload = #{planInnerUserWorkload},
-		plan_out_user_workload = #{planOutUserWorkload},
-		from_tpl_id = #{fromTplId},
-		budget_ctrl = #{budgetCtrl},
-		deptid = #{deptid},
-		project_id = #{projectId}
-	</sql>
-	<sql id="someFieldSet">
-		<if test="code != null and code != ''"> code = #{code},     </if>
-		<if test="name != null and name != ''"> name = #{name},     </if>
-		<if test="xmType != null and xmType != ''"> xm_type = #{xmType},     </if>
-		<if test="startTime != null"> start_time = #{startTime},     </if>
-		<if test="endTime != null"> end_time = #{endTime},     </if>
-		<if test="urgent != null and urgent != ''"> urgent = #{urgent},     </if>
-		<if test="priority != null and priority != ''"> priority = #{priority},     </if>
-		<if test="description != null and description != ''"> description = #{description},     </if>
-		<if test="createUserid != null and createUserid != ''"> create_userid = #{createUserid},     </if>
-		<if test="createUsername != null and createUsername != ''"> create_username = #{createUsername},     </if>
-		<if test="createTime != null"> create_time = #{createTime},     </if>
-		<if test="assess != null and assess != ''"> assess = #{assess},     </if>
-		<if test="assessRemarks != null and assessRemarks != ''"> assess_remarks = #{assessRemarks},     </if>
-		<if test="status != null and status != ''"> status = #{status},     </if>
-		<if test="branchId != null and branchId != ''"> branch_id = #{branchId},     </if>
-		<if test="planTotalCost != null and planTotalCost != ''"> plan_total_cost = #{planTotalCost},     </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="planNouserAt != null and planNouserAt != ''"> plan_nouser_at = #{planNouserAt},     </if>
-		<if test="planInnerUserAt != null and planInnerUserAt != ''"> plan_inner_user_at = #{planInnerUserAt},     </if>
-		<if test="planOutUserAt != null and planOutUserAt != ''"> plan_out_user_at = #{planOutUserAt},     </if>
-		<if test="locked != null and locked != ''"> locked = #{locked},     </if>
-		<if test="baseTime != null"> base_time = #{baseTime},     </if>
-		<if test="baseRemark != null and baseRemark != ''"> base_remark = #{baseRemark},     </if>
-		<if test="baselineId != null and baselineId != ''"> baseline_id = #{baselineId},     </if>
-		<if test="planWorkload != null and planWorkload != ''"> plan_workload = #{planWorkload},     </if>
-		<if test="totalReceivables != null and totalReceivables != ''"> total_receivables = #{totalReceivables},     </if>
-		<if test="budgetMarginRate != null and budgetMarginRate != ''"> budget_margin_rate = #{budgetMarginRate},     </if>
-		<if test="contractAmt != null and contractAmt != ''"> contract_amt = #{contractAmt},     </if>
-		<if test="planInnerUserPrice != null and planInnerUserPrice != ''"> plan_inner_user_price = #{planInnerUserPrice},     </if>
-		<if test="planOutUserPrice != null and planOutUserPrice != ''"> plan_out_user_price = #{planOutUserPrice},     </if>
-		<if test="planOutUserCnt != null and planOutUserCnt != ''"> plan_out_user_cnt = #{planOutUserCnt},     </if>
-		<if test="planInnerUserCnt != null and planInnerUserCnt != ''"> plan_inner_user_cnt = #{planInnerUserCnt},     </if>
-		<if test="planWorkingHours != null and planWorkingHours != ''"> plan_working_hours = #{planWorkingHours},     </if>
-		<if test="taxRate != null and taxRate != ''"> tax_rate = #{taxRate},     </if>
-		<if test="planInnerUserWorkload != null and planInnerUserWorkload != ''"> plan_inner_user_workload = #{planInnerUserWorkload},     </if>
-		<if test="planOutUserWorkload != null and planOutUserWorkload != ''"> plan_out_user_workload = #{planOutUserWorkload},     </if>
-		<if test="fromTplId != null and fromTplId != ''"> from_tpl_id = #{fromTplId},     </if>
-		<if test="budgetCtrl != null and budgetCtrl != ''"> budget_ctrl = #{budgetCtrl},     </if>
-		<if test="deptid != null and deptid != ''"> deptid = #{deptid},     </if>
-		<if test="projectId != null and projectId != ''"> project_id = #{projectId},     </if>
-	</sql>
-	<!--sql片段 批量更新 -->
-	<sql id="batchSet">
-			code = #{item.code},
-			name = #{item.name},
-			xm_type = #{item.xmType},
-			start_time = #{item.startTime},
-			end_time = #{item.endTime},
-			urgent = #{item.urgent},
-			priority = #{item.priority},
-			description = #{item.description},
-			create_userid = #{item.createUserid},
-			create_username = #{item.createUsername},
-			create_time = #{item.createTime},
-			assess = #{item.assess},
-			assess_remarks = #{item.assessRemarks},
-			status = #{item.status},
-			branch_id = #{item.branchId},
-			plan_total_cost = #{item.planTotalCost},
-			biz_proc_inst_id = #{item.bizProcInstId},
-			biz_flow_state = #{item.bizFlowState},
-			plan_nouser_at = #{item.planNouserAt},
-			plan_inner_user_at = #{item.planInnerUserAt},
-			plan_out_user_at = #{item.planOutUserAt},
-			locked = #{item.locked},
-			base_time = #{item.baseTime},
-			base_remark = #{item.baseRemark},
-			baseline_id = #{item.baselineId},
-			plan_workload = #{item.planWorkload},
-			total_receivables = #{item.totalReceivables},
-			budget_margin_rate = #{item.budgetMarginRate},
-			contract_amt = #{item.contractAmt},
-			plan_inner_user_price = #{item.planInnerUserPrice},
-			plan_out_user_price = #{item.planOutUserPrice},
-			plan_out_user_cnt = #{item.planOutUserCnt},
-			plan_inner_user_cnt = #{item.planInnerUserCnt},
-			plan_working_hours = #{item.planWorkingHours},
-			tax_rate = #{item.taxRate},
-			plan_inner_user_workload = #{item.planInnerUserWorkload},
-			plan_out_user_workload = #{item.planOutUserWorkload},
-			from_tpl_id = #{item.fromTplId},
-			budget_ctrl = #{item.budgetCtrl},
-			deptid = #{item.deptid},
-			project_id = #{item.projectId}
-	</sql>
-</mapper>
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseBaselineMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseBaselineMapper.xml
deleted file mode 100644
index ad520f98..00000000
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseBaselineMapper.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xm.core.entity.XmProjectPhaseBaseline">
-	
-	
-	<!--开始 自定sql函数区域 -->
-		<!--请在此区域添加自定义函数-->
-		
-		
-		
-	<!--结束 自定义sql函数区域-->
-	
-
-	
-	<!-- 通过条件查询获取数据列表 返回list<map> -->
-	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
-		select * from xm_project_phase_baseline res
-		<where> 
-			<if test="ids != null">  and     
-				id in
-				    <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >  
-				        #{item}  
-				    </foreach>  
-			 </if>
-			<include refid="where"/>
-			<if test="key != null and key !='' ">       </if> 
-		</where>
-	</select>
-	
-	<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->
-	<select id="selectListByWhere" parameterType="com.xm.core.entity.XmProjectPhaseBaseline" resultType="com.xm.core.entity.XmProjectPhaseBaseline">
-		select * from xm_project_phase_baseline res
-		<where>
-			<include refid="where"/>
-		</where>
-	</select>
-	
-		<!-- 通过主键查询获取数据对象 返回object -->
-	<select id="selectOneObject" parameterType="com.xm.core.entity.XmProjectPhaseBaseline" resultType="com.xm.core.entity.XmProjectPhaseBaseline">
-		select * from xm_project_phase_baseline res
-		where 
-			res.id = #{id}
-	</select>
-	
-	<!-- 通过主键查询获取数据对象 返回map-->
-	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
-		select * from xm_project_phase_baseline res
-		where 
-			 res.id = #{id}
-	</select>
-	<!-- 获取数据条目 返回long -->
-	<select id="countByWhere" parameterType="com.xm.core.entity.XmProjectPhaseBaseline" resultType="long">
-		select count(1) from xm_project_phase_baseline res
-		<where>
-			<include refid="where"/>
-		</where>
-	</select>
-	<!-- 新增一条记录  主键id,-->
-	<insert id="insert" parameterType="com.xm.core.entity.XmProjectPhaseBaseline" useGeneratedKeys="false" keyProperty="id">
-		insert into xm_project_phase_baseline(
-			<include refid="columns"/>
-		) values (
-		#{baseCtime},#{projectPhaseId},#{phaseName},#{remark},#{parentPhaseId},#{branchId},#{projectId},#{beginDate},#{endDate},#{planWorkingHours},#{planWorkingStaffNu},#{ctime},#{totalBudgetNouser},#{totalBudgetInnerUser},#{totalBudgetOutUser},#{id},#{baseRemark},#{projectBaselineId},#{bizProcInstId},#{bizFlowState},#{totalBudgetWorkload},#{totalActWorkload}
-		)
-	</insert>
-	
-	<!-- 按条件删除若干条记录-->
-	<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmProjectPhaseBaseline">
-		delete from xm_project_phase_baseline res
-		<where>  
-			<include refid="where"/>
-		</where>
-	</delete>
-	
-	<!-- 按主键删除一条记录-->
-	<delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectPhaseBaseline">
-		delete from xm_project_phase_baseline
-		where id = #{id} 
-	</delete>
-	
-	<!-- 根据条件修改若干条记录 -->
-	<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectPhaseBaseline">
-		update  xm_project_phase_baseline
-		<set>
-			<include refid="someFieldSet"/>
-		</set>
-		where id = #{id} 
-	</update>
-	
-		<!-- 根据主键修改一条记录 -->
-	<update id="updateByPk" parameterType="com.xm.core.entity.XmProjectPhaseBaseline">
-		update  xm_project_phase_baseline
-		<set>
-			<include refid="set"/>
-		</set>
-		where id = #{id} 
-	</update>
-
-	<!-- 批量新增  批量插入 借用insert 循环插入实现
-	<insert id="batchInsert" parameterType="List">
- 	</insert>
- 	-->
- 	
-	<!-- 批量更新 -->
-	<update id="batchUpdate" parameterType="List">   
-		<foreach collection="list" item="item" index="index" separator=";" >
-   		update  xm_project_phase_baseline
-		set 
-			<include refid="batchSet"/>
-			where id = #{item.id}  
-		</foreach> 
-	</update>
-	<!-- 批量删除 -->
-	<delete id="batchDelete" parameterType="List">  
-		delete from xm_project_phase_baseline
-			where id in
-			    <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >  
-			        #{item.id }  
-			    </foreach>  
-	</delete>
-	
-	
-	<!--sql片段 列-->
-	<sql id="columns">
-		base_ctime,project_phase_id,phase_name,remark,parent_phase_id,branch_id,project_id,begin_date,end_date,plan_working_hours,plan_working_staff_nu,ctime,total_budget_nouser,total_budget_inner_user,total_budget_out_user,id,base_remark,project_baseline_id,biz_proc_inst_id,biz_flow_state,total_budget_workload,total_act_workload
-	</sql>
-	
-	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
-	<sql id="where">
-		<if test="baseCtime != null">      and TO_CHAR(res.base_ctime,'YYYY-MM-DD') = TO_CHAR(#{baseCtime},'YYYY-MM-DD')     </if>
-		<if test="projectPhaseId != null and projectPhaseId != ''">      and res.project_phase_id = #{projectPhaseId}     </if>
-		<if test="phaseName != null and phaseName != ''">      and res.phase_name = #{phaseName}     </if>
-		<if test="remark != null and remark != ''">      and res.remark = #{remark}     </if>
-		<if test="parentPhaseId != null and parentPhaseId != ''">      and res.parent_phase_id = #{parentPhaseId}     </if>
-		<if test="branchId != null and branchId != ''">      and res.branch_id = #{branchId}     </if>
-		<if test="projectId != null and projectId != ''">      and res.project_id = #{projectId}     </if>
-		<if test="beginDate != null">      and TO_CHAR(res.begin_date,'YYYY-MM-DD') = TO_CHAR(#{beginDate},'YYYY-MM-DD')     </if>
-		<if test="endDate != null">      and TO_CHAR(res.end_date,'YYYY-MM-DD') = TO_CHAR(#{endDate},'YYYY-MM-DD')     </if>
-		<if test="planWorkingHours != null and planWorkingHours != ''">      and res.plan_working_hours = #{planWorkingHours}     </if>
-		<if test="planWorkingStaffNu != null and planWorkingStaffNu != ''">      and res.plan_working_staff_nu = #{planWorkingStaffNu}     </if>
-		<if test="ctime != null">      and TO_CHAR(res.ctime,'YYYY-MM-DD') = TO_CHAR(#{ctime},'YYYY-MM-DD')     </if>
-		<if test="totalBudgetNouser != null and totalBudgetNouser != ''">      and res.total_budget_nouser = #{totalBudgetNouser}     </if>
-		<if test="totalBudgetInnerUser != null and totalBudgetInnerUser != ''">      and res.total_budget_inner_user = #{totalBudgetInnerUser}     </if>
-		<if test="totalBudgetOutUser != null and totalBudgetOutUser != ''">      and res.total_budget_out_user = #{totalBudgetOutUser}     </if>
-		<if test="id != null and id != ''">      and res.id = #{id}     </if>
-		<if test="baseRemark != null and baseRemark != ''">      and res.base_remark = #{baseRemark}     </if>
-		<if test="projectBaselineId != null and projectBaselineId != ''">      and res.project_baseline_id = #{projectBaselineId}     </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="totalBudgetWorkload != null and totalBudgetWorkload != ''">      and res.total_budget_workload = #{totalBudgetWorkload}     </if>
-		<if test="totalActWorkload != null and totalActWorkload != ''">      and res.total_act_workload = #{totalActWorkload}     </if>
-	</sql>
-	<!--sql片段 更新字段 -->
-	<sql id="set">
-		base_ctime = #{baseCtime},
-		project_phase_id = #{projectPhaseId},
-		phase_name = #{phaseName},
-		remark = #{remark},
-		parent_phase_id = #{parentPhaseId},
-		branch_id = #{branchId},
-		project_id = #{projectId},
-		begin_date = #{beginDate},
-		end_date = #{endDate},
-		plan_working_hours = #{planWorkingHours},
-		plan_working_staff_nu = #{planWorkingStaffNu},
-		ctime = #{ctime},
-		total_budget_nouser = #{totalBudgetNouser},
-		total_budget_inner_user = #{totalBudgetInnerUser},
-		total_budget_out_user = #{totalBudgetOutUser},
-		base_remark = #{baseRemark},
-		project_baseline_id = #{projectBaselineId},
-		biz_proc_inst_id = #{bizProcInstId},
-		biz_flow_state = #{bizFlowState},
-		total_budget_workload = #{totalBudgetWorkload},
-		total_act_workload = #{totalActWorkload}
-	</sql>
-	<sql id="someFieldSet">
-		<if test="baseCtime != null"> base_ctime = #{baseCtime},     </if>
-		<if test="projectPhaseId != null and projectPhaseId != ''"> project_phase_id = #{projectPhaseId},     </if>
-		<if test="phaseName != null and phaseName != ''"> phase_name = #{phaseName},     </if>
-		<if test="remark != null and remark != ''"> remark = #{remark},     </if>
-		<if test="parentPhaseId != null and parentPhaseId != ''"> parent_phase_id = #{parentPhaseId},     </if>
-		<if test="branchId != null and branchId != ''"> branch_id = #{branchId},     </if>
-		<if test="projectId != null and projectId != ''"> project_id = #{projectId},     </if>
-		<if test="beginDate != null"> begin_date = #{beginDate},     </if>
-		<if test="endDate != null"> end_date = #{endDate},     </if>
-		<if test="planWorkingHours != null and planWorkingHours != ''"> plan_working_hours = #{planWorkingHours},     </if>
-		<if test="planWorkingStaffNu != null and planWorkingStaffNu != ''"> plan_working_staff_nu = #{planWorkingStaffNu},     </if>
-		<if test="ctime != null"> ctime = #{ctime},     </if>
-		<if test="totalBudgetNouser != null and totalBudgetNouser != ''"> total_budget_nouser = #{totalBudgetNouser},     </if>
-		<if test="totalBudgetInnerUser != null and totalBudgetInnerUser != ''"> total_budget_inner_user = #{totalBudgetInnerUser},     </if>
-		<if test="totalBudgetOutUser != null and totalBudgetOutUser != ''"> total_budget_out_user = #{totalBudgetOutUser},     </if>
-		<if test="baseRemark != null and baseRemark != ''"> base_remark = #{baseRemark},     </if>
-		<if test="projectBaselineId != null and projectBaselineId != ''"> project_baseline_id = #{projectBaselineId},     </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="totalBudgetWorkload != null and totalBudgetWorkload != ''"> total_budget_workload = #{totalBudgetWorkload},     </if>
-		<if test="totalActWorkload != null and totalActWorkload != ''"> total_act_workload = #{totalActWorkload},     </if>
-	</sql>
-	<!--sql片段 批量更新 -->
-	<sql id="batchSet">
-			base_ctime = #{item.baseCtime},
-			project_phase_id = #{item.projectPhaseId},
-			phase_name = #{item.phaseName},
-			remark = #{item.remark},
-			parent_phase_id = #{item.parentPhaseId},
-			branch_id = #{item.branchId},
-			project_id = #{item.projectId},
-			begin_date = #{item.beginDate},
-			end_date = #{item.endDate},
-			plan_working_hours = #{item.planWorkingHours},
-			plan_working_staff_nu = #{item.planWorkingStaffNu},
-			ctime = #{item.ctime},
-			total_budget_nouser = #{item.totalBudgetNouser},
-			total_budget_inner_user = #{item.totalBudgetInnerUser},
-			total_budget_out_user = #{item.totalBudgetOutUser},
-			base_remark = #{item.baseRemark},
-			project_baseline_id = #{item.projectBaselineId},
-			biz_proc_inst_id = #{item.bizProcInstId},
-			biz_flow_state = #{item.bizFlowState},
-			total_budget_workload = #{item.totalBudgetWorkload},
-			total_act_workload = #{item.totalActWorkload}
-	</sql>
-</mapper>
\ No newline at end of file