添加节点类型、标签等

xm-core/src/main/java/com/xm/core/ctrl/XmMenuTemplateController.java

@@ -1,220 +0,0 @@
-package com.xm.core.ctrl;
-
-import com.mdp.core.entity.Tips;
-import com.mdp.core.err.BizException;
-import com.mdp.core.utils.RequestUtils;
-import com.mdp.mybatis.PageUtils;
-import com.xm.core.entity.XmMenuTemplate;
-import com.xm.core.service.XmMenuTemplateService;
-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.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * url编制采用rest风格,如对XM.xm_menu_template 功能表的操作有增删改查,对应的url分别为:<br>
- *  新增: xm/xmMenuTemplate/add <br>
- *  查询: xm/xmMenuTemplate/list<br>
- *  模糊查询: xm/xmMenuTemplate/listKey<br>
- *  修改: xm/xmMenuTemplate/edit <br>
- *  删除: xm/xmMenuTemplate/del<br>
- *  批量删除: xm/xmMenuTemplate/batchDel<br>
- * 组织 com.qqkj  顶级模块 oa 大模块 xm 小模块 <br>
- * 实体 XmMenuTemplate 表 XM.xm_menu_template 当前主键(包括多主键): menu_id; 
- ***/
-@RestController("xm.core.xmMenuTemplateController")
-@RequestMapping(value="/**/xm/core/xmMenuTemplate")
-@Api(tags={"功能表操作接口"})
-public class XmMenuTemplateController {
-	
-	static Log logger=LogFactory.getLog(XmMenuTemplateController.class);
-	
-	@Autowired
-	private XmMenuTemplateService xmMenuTemplateService;
-	 
-		
- 
-	
-	@ApiOperation( value = "查询功能表信息列表",notes="listXmMenuTemplate,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
-	@ApiImplicitParams({  
-		@ApiImplicitParam(name="menuId",value="功能编号,主键",required=false),
-		@ApiImplicitParam(name="menuName",value="功能名称",required=false),
-		@ApiImplicitParam(name="pmenuId",value="上级功能",required=false),
-		@ApiImplicitParam(name="productId",value="归属产品编号",required=false),
-		@ApiImplicitParam(name="remark",value="备注",required=false),
-		@ApiImplicitParam(name="status",value="状态0初始1设计中2开发中3测试中4uat测试2已上线3已下线4已删除",required=false),
-		@ApiImplicitParam(name="online",value="是否已上线",required=false),
-		@ApiImplicitParam(name="demandUrl",value="需求链接",required=false),
-		@ApiImplicitParam(name="codeUrl",value="代码链接",required=false),
-		@ApiImplicitParam(name="designUrl",value="设计链接",required=false),
-		@ApiImplicitParam(name="docUrl",value="文档链接",required=false),
-		@ApiImplicitParam(name="helpUrl",value="帮助文档链接",required=false),
-		@ApiImplicitParam(name="operDocUrl",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= XmMenuTemplate.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
-	})
-	@RequestMapping(value="/list",method=RequestMethod.GET)
-	public Map<String,Object> listXmMenuTemplate( @RequestParam Map<String,Object> xmMenuTemplate){
-		Map<String,Object> m = new HashMap<>(); 
-		RequestUtils.transformArray(xmMenuTemplate, "menuIds");
-		PageUtils.startPage(xmMenuTemplate);
-		List<Map<String,Object>>	xmMenuTemplateList = xmMenuTemplateService.selectListMapByWhere(xmMenuTemplate);	//列出XmMenuTemplate列表
-		PageUtils.responePage(m, xmMenuTemplateList);
-		m.put("data",xmMenuTemplateList);
-		Tips tips=new Tips("查询成功");
-		m.put("tips", tips);
-		return m;
-	}
-	
- 
-	
-	/***/
-	@ApiOperation( value = "新增一条功能表信息",notes="addXmMenuTemplate,主键如果为空，后台自动生成")
-	@ApiResponses({
-		@ApiResponse(code = 200,response=XmMenuTemplate.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
-	}) 
-	@RequestMapping(value="/add",method=RequestMethod.POST)
-	public Map<String,Object> addXmMenuTemplate(@RequestBody XmMenuTemplate xmMenuTemplate) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功新增一条数据");
-		try{
-			if(StringUtils.isEmpty(xmMenuTemplate.getMenuId())) {
-				xmMenuTemplate.setMenuId(xmMenuTemplateService.createKey("menuId"));
-			}else{
-				 XmMenuTemplate xmMenuTemplateQuery = new  XmMenuTemplate(xmMenuTemplate.getMenuId());
-				if(xmMenuTemplateService.countByWhere(xmMenuTemplateQuery)>0){
-					tips.setFailureMsg("编号重复，请修改编号再提交");
-					m.put("tips", tips);
-					return m;
-				}
-			}
-			xmMenuTemplateService.insert(xmMenuTemplate);
-			m.put("data",xmMenuTemplate);
-		}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 = "删除一条功能表信息",notes="delXmMenuTemplate,仅需要上传主键字段")
-	@ApiResponses({
-		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}")
-	}) 
-	@RequestMapping(value="/del",method=RequestMethod.POST)
-	public Map<String,Object> delXmMenuTemplate(@RequestBody XmMenuTemplate xmMenuTemplate){
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功删除一条数据");
-		try{
-			xmMenuTemplateService.deleteByPk(xmMenuTemplate);
-		}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 = "根据主键修改一条功能表信息",notes="editXmMenuTemplate")
-	@ApiResponses({
-		@ApiResponse(code = 200,response=XmMenuTemplate.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
-	}) 
-	@RequestMapping(value="/edit",method=RequestMethod.POST)
-	public Map<String,Object> editXmMenuTemplate(@RequestBody XmMenuTemplate xmMenuTemplate) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功更新一条数据");
-		try{
-			xmMenuTemplateService.updateByPk(xmMenuTemplate);
-			m.put("data",xmMenuTemplate);
-		}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 = "根据主键列表批量删除功能表信息",notes="batchDelXmMenuTemplate,仅需要上传主键字段")
-	@ApiResponses({
-		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
-	}) 
-	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
-	public Map<String,Object> batchDelXmMenuTemplate(@RequestBody List<XmMenuTemplate> xmMenuTemplates) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功删除"+xmMenuTemplates.size()+"条数据"); 
-		try{ 
-			xmMenuTemplateService.batchDelete(xmMenuTemplates);
-		}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;
-	} 
-	@RequestMapping(value="/batchAdd",method=RequestMethod.POST)
-	public Map<String,Object> batchAddXmMenuTemplate(@RequestBody List<XmMenuTemplate> xmMenuTemplates) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功新增"+xmMenuTemplates.size()+"条数据"); 
-		try{ 
-			xmMenuTemplateService.batchInsert(xmMenuTemplates);
-		}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;
-	} 
-
-	@RequestMapping(value="/batchEdit",method=RequestMethod.POST)
-	public Map<String,Object> batchEditXmMenuTemplate(@RequestBody List<XmMenuTemplate> xmMenuTemplates) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功修改"+xmMenuTemplates.size()+"条数据"); 
-		try{ 
-			xmMenuTemplateService.batchUpdate(xmMenuTemplates);
-		}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;
-	} 
-}

xm-core/src/main/java/com/xm/core/ctrl/XmProductTemplateController.java

@@ -1,186 +0,0 @@
-package com.xm.core.ctrl;
-
-import com.mdp.core.entity.Tips;
-import com.mdp.core.err.BizException;
-import com.mdp.core.utils.RequestUtils;
-import com.mdp.mybatis.PageUtils;
-import com.xm.core.entity.XmProductTemplate;
-import com.xm.core.service.XmProductTemplateService;
-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.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * url编制采用rest风格,如对XM.xm_product_template 产品表的操作有增删改查,对应的url分别为:<br>
- *  新增: xm/xmProductTemplate/add <br>
- *  查询: xm/xmProductTemplate/list<br>
- *  模糊查询: xm/xmProductTemplate/listKey<br>
- *  修改: xm/xmProductTemplate/edit <br>
- *  删除: xm/xmProductTemplate/del<br>
- *  批量删除: xm/xmProductTemplate/batchDel<br>
- * 组织 com.qqkj  顶级模块 oa 大模块 xm 小模块 <br>
- * 实体 XmProductTemplate 表 XM.xm_product_template 当前主键(包括多主键): id; 
- ***/
-@RestController("xm.core.xmProductTemplateController")
-@RequestMapping(value="/**/xm/core/xmProductTemplate")
-@Api(tags={"产品表操作接口"})
-public class XmProductTemplateController {
-	
-	static Log logger=LogFactory.getLog(XmProductTemplateController.class);
-	
-	@Autowired
-	private XmProductTemplateService xmProductTemplateService;
-	 
-		
- 
-	
-	@ApiOperation( value = "查询产品表信息列表",notes="listXmProductTemplate,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
-	@ApiImplicitParams({  
-		@ApiImplicitParam(name="id",value="产品编号,主键",required=false),
-		@ApiImplicitParam(name="productName",value="产品名称",required=false),
-		@ApiImplicitParam(name="branchId",value="机构号",required=false),
-		@ApiImplicitParam(name="remark",value="备注",required=false),
-		@ApiImplicitParam(name="templateId",value="项目模板编号",required=false),
-		@ApiImplicitParam(name="tcuserid",value="模板创建人编号",required=false),
-		@ApiImplicitParam(name="tcusername",value="模板创建人姓名",required=false),
-		@ApiImplicitParam(name="tremark",value="模板备注",required=false),
-		@ApiImplicitParam(name="tctime",value="模板创建时间",required=false),
-		@ApiImplicitParam(name="tcbranchId",value="模板创建机构编号",required=false),
-		@ApiImplicitParam(name="shareScope",value="共享范围0-全部,1-本机构",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= XmProductTemplate.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
-	})
-	@RequestMapping(value="/list",method=RequestMethod.GET)
-	public Map<String,Object> listXmProductTemplate( @RequestParam Map<String,Object> xmProductTemplate){
-		Map<String,Object> m = new HashMap<>(); 
-		RequestUtils.transformArray(xmProductTemplate, "ids");
-		PageUtils.startPage(xmProductTemplate);
-		List<Map<String,Object>>	xmProductTemplateList = xmProductTemplateService.selectListMapByWhere(xmProductTemplate);	//列出XmProductTemplate列表
-		PageUtils.responePage(m, xmProductTemplateList);
-		m.put("data",xmProductTemplateList);
-		Tips tips=new Tips("查询成功");
-		m.put("tips", tips);
-		return m;
-	}
-	
- 
-	
-	/***/
-	@ApiOperation( value = "新增一条产品表信息",notes="addXmProductTemplate,主键如果为空，后台自动生成")
-	@ApiResponses({
-		@ApiResponse(code = 200,response=XmProductTemplate.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
-	}) 
-	@RequestMapping(value="/add",method=RequestMethod.POST)
-	public Map<String,Object> addXmProductTemplate(@RequestBody XmProductTemplate xmProductTemplate) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功新增一条数据");
-		try{
-			if(StringUtils.isEmpty(xmProductTemplate.getId())) {
-				xmProductTemplate.setId(xmProductTemplateService.createKey("id"));
-			}else{
-				 XmProductTemplate xmProductTemplateQuery = new  XmProductTemplate(xmProductTemplate.getId());
-				if(xmProductTemplateService.countByWhere(xmProductTemplateQuery)>0){
-					tips.setFailureMsg("编号重复，请修改编号再提交");
-					m.put("tips", tips);
-					return m;
-				}
-			}
-			xmProductTemplateService.insert(xmProductTemplate);
-			m.put("data",xmProductTemplate);
-		}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 = "删除一条产品表信息",notes="delXmProductTemplate,仅需要上传主键字段")
-	@ApiResponses({
-		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}")
-	}) 
-	@RequestMapping(value="/del",method=RequestMethod.POST)
-	public Map<String,Object> delXmProductTemplate(@RequestBody XmProductTemplate xmProductTemplate){
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功删除一条数据");
-		try{
-			xmProductTemplateService.deleteByPk(xmProductTemplate);
-		}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 = "根据主键修改一条产品表信息",notes="editXmProductTemplate")
-	@ApiResponses({
-		@ApiResponse(code = 200,response=XmProductTemplate.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
-	}) 
-	@RequestMapping(value="/edit",method=RequestMethod.POST)
-	public Map<String,Object> editXmProductTemplate(@RequestBody XmProductTemplate xmProductTemplate) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功更新一条数据");
-		try{
-			xmProductTemplateService.updateByPk(xmProductTemplate);
-			m.put("data",xmProductTemplate);
-		}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 = "根据主键列表批量删除产品表信息",notes="batchDelXmProductTemplate,仅需要上传主键字段")
-	@ApiResponses({
-		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
-	}) 
-	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
-	public Map<String,Object> batchDelXmProductTemplate(@RequestBody List<XmProductTemplate> xmProductTemplates) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功删除"+xmProductTemplates.size()+"条数据"); 
-		try{ 
-			xmProductTemplateService.batchDelete(xmProductTemplates);
-		}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;
-	} 
-	
-}

xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseTemplateController.java

@@ -1,231 +0,0 @@
-package com.xm.core.ctrl;
-
-import com.mdp.core.entity.Tips;
-import com.mdp.core.err.BizException;
-import com.mdp.core.utils.RequestUtils;
-import com.mdp.mybatis.PageUtils;
-import com.xm.core.entity.XmProjectPhaseTemplate;
-import com.xm.core.service.XmProjectPhaseTemplateService;
-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.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * url编制采用rest风格,如对XM.xm_project_phase_template 项目计划模板的操作有增删改查,对应的url分别为:<br>
- *  新增: xm/xmProjectPhaseTemplate/add <br>
- *  查询: xm/xmProjectPhaseTemplate/list<br>
- *  模糊查询: xm/xmProjectPhaseTemplate/listKey<br>
- *  修改: xm/xmProjectPhaseTemplate/edit <br>
- *  删除: xm/xmProjectPhaseTemplate/del<br>
- *  批量删除: xm/xmProjectPhaseTemplate/batchDel<br>
- * 组织 com.qqkj  顶级模块 oa 大模块 xm 小模块 <br>
- * 实体 XmProjectPhaseTemplate 表 XM.xm_project_phase_template 当前主键(包括多主键): id; 
- ***/
-@RestController("xm.core.xmProjectPhaseTemplateController")
-@RequestMapping(value="/**/xm/core/xmProjectPhaseTemplate")
-@Api(tags={"项目计划模板操作接口"})
-public class XmProjectPhaseTemplateController {
-	
-	static Log logger=LogFactory.getLog(XmProjectPhaseTemplateController.class);
-	
-	@Autowired
-	private XmProjectPhaseTemplateService xmProjectPhaseTemplateService;
-	 
-		
- 
-	
-	@ApiOperation( value = "查询项目计划模板信息列表",notes="listXmProjectPhaseTemplate,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
-	@ApiImplicitParams({  
-		@ApiImplicitParam(name="id",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="phaseBudgetHours",value="工时(不包括下一级)-应该大于或等于task中总工时",required=false),
-		@ApiImplicitParam(name="phaseBudgetStaffNu",value="投入人员数(不包括下一级)-应该大于或等于task中总人数",required=false),
-		@ApiImplicitParam(name="ctime",value="创建时间",required=false),
-		@ApiImplicitParam(name="phaseBudgetNouserAt",value="非人力成本总预算(不包括下一级)-应该大于或等于task中非人力总成本",required=false),
-		@ApiImplicitParam(name="phaseBudgetInnerUserAt",value="内部人力成本总预算(不包括下一级)-应该大于或等于task中内部人力总成本",required=false),
-		@ApiImplicitParam(name="phaseBudgetOutUserAt",value="外购人力成本总预算(不包括下一级)-应该大于或等于task中外购总成本",required=false),
-		@ApiImplicitParam(name="phaseBudgetWorkload",value="总工作量单位人时-应该大于或者等于task中的预算总工作量",required=false),
-		@ApiImplicitParam(name="taskType",value="0售前方案1投标2需求3设计4开发5测试6验收7部署8运维--来自基础数据表taskType",required=false),
-		@ApiImplicitParam(name="planType",value="计划类型w1-周,w2-2周,w3-3周,m1-1月,m2-2月,q1-季,q2-半年，y1-年",required=false),
-		@ApiImplicitParam(name="seqNo",value="顺序号",required=false),
-		@ApiImplicitParam(name="phaseBudgetInnerUserWorkload",value="内部人力工作量总预算(不包括下一级)-应该大于或等于task中内部人力总成本",required=false),
-		@ApiImplicitParam(name="phaseBudgetOutUserWorkload",value="外购人力工作量总预算(不包括下一级)-应该大于或等于task中外购总成本",required=false),
-		@ApiImplicitParam(name="phaseBudgetInnerUserPrice",value="内部人力成本单价元/人时",required=false),
-		@ApiImplicitParam(name="phaseBudgetOutUserPrice",value="外购人力成本单价元/人时",required=false),
-		@ApiImplicitParam(name="phaseBudgetOutUserCnt",value="外购人数",required=false),
-		@ApiImplicitParam(name="phaseBudgetInnerUserCnt",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= XmProjectPhaseTemplate.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
-	})
-	@RequestMapping(value="/list",method=RequestMethod.GET)
-	public Map<String,Object> listXmProjectPhaseTemplate( @RequestParam Map<String,Object> xmProjectPhaseTemplate){
-		Map<String,Object> m = new HashMap<>(); 
-		RequestUtils.transformArray(xmProjectPhaseTemplate, "ids");
-		PageUtils.startPage(xmProjectPhaseTemplate);
-		List<Map<String,Object>>	xmProjectPhaseTemplateList = xmProjectPhaseTemplateService.selectListMapByWhere(xmProjectPhaseTemplate);	//列出XmProjectPhaseTemplate列表
-		PageUtils.responePage(m, xmProjectPhaseTemplateList);
-		m.put("data",xmProjectPhaseTemplateList);
-		Tips tips=new Tips("查询成功");
-		m.put("tips", tips);
-		return m;
-	}
-	
- 
-	
-	/***/
-	@ApiOperation( value = "新增一条项目计划模板信息",notes="addXmProjectPhaseTemplate,主键如果为空，后台自动生成")
-	@ApiResponses({
-		@ApiResponse(code = 200,response=XmProjectPhaseTemplate.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
-	}) 
-	@RequestMapping(value="/add",method=RequestMethod.POST)
-	public Map<String,Object> addXmProjectPhaseTemplate(@RequestBody XmProjectPhaseTemplate xmProjectPhaseTemplate) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功新增一条数据");
-		try{
-			if(StringUtils.isEmpty(xmProjectPhaseTemplate.getId())) {
-				xmProjectPhaseTemplate.setId(xmProjectPhaseTemplateService.createKey("id"));
-			}else{
-				 XmProjectPhaseTemplate xmProjectPhaseTemplateQuery = new  XmProjectPhaseTemplate(xmProjectPhaseTemplate.getId());
-				if(xmProjectPhaseTemplateService.countByWhere(xmProjectPhaseTemplateQuery)>0){
-					tips.setFailureMsg("编号重复，请修改编号再提交");
-					m.put("tips", tips);
-					return m;
-				}
-			}
-			xmProjectPhaseTemplateService.insert(xmProjectPhaseTemplate);
-			m.put("data",xmProjectPhaseTemplate);
-		}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 = "删除一条项目计划模板信息",notes="delXmProjectPhaseTemplate,仅需要上传主键字段")
-	@ApiResponses({
-		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}")
-	}) 
-	@RequestMapping(value="/del",method=RequestMethod.POST)
-	public Map<String,Object> delXmProjectPhaseTemplate(@RequestBody XmProjectPhaseTemplate xmProjectPhaseTemplate){
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功删除一条数据");
-		try{
-			xmProjectPhaseTemplateService.deleteByPk(xmProjectPhaseTemplate);
-		}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 = "根据主键修改一条项目计划模板信息",notes="editXmProjectPhaseTemplate")
-	@ApiResponses({
-		@ApiResponse(code = 200,response=XmProjectPhaseTemplate.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
-	}) 
-	@RequestMapping(value="/edit",method=RequestMethod.POST)
-	public Map<String,Object> editXmProjectPhaseTemplate(@RequestBody XmProjectPhaseTemplate xmProjectPhaseTemplate) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功更新一条数据");
-		try{
-			xmProjectPhaseTemplateService.updateByPk(xmProjectPhaseTemplate);
-			m.put("data",xmProjectPhaseTemplate);
-		}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 = "根据主键列表批量删除项目计划模板信息",notes="batchDelXmProjectPhaseTemplate,仅需要上传主键字段")
-	@ApiResponses({
-		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
-	}) 
-	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
-	public Map<String,Object> batchDelXmProjectPhaseTemplate(@RequestBody List<XmProjectPhaseTemplate> xmProjectPhaseTemplates) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功删除"+xmProjectPhaseTemplates.size()+"条数据"); 
-		try{ 
-			xmProjectPhaseTemplateService.batchDelete(xmProjectPhaseTemplates);
-		}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;
-	} 
-
-	@RequestMapping(value="/batchAdd",method=RequestMethod.POST)
-	public Map<String,Object> batchAddXmProjectPhaseTemplate(@RequestBody List<XmProjectPhaseTemplate> xmProjectPhaseTemplates) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功删除"+xmProjectPhaseTemplates.size()+"条数据"); 
-		try{ 
-			xmProjectPhaseTemplateService.batchInsert(xmProjectPhaseTemplates);
-		}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;
-	} 
-	@RequestMapping(value="/batchEdit",method=RequestMethod.POST)
-	public Map<String,Object> batchEditXmProjectPhaseTemplate(@RequestBody List<XmProjectPhaseTemplate> xmProjectPhaseTemplates) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功删除"+xmProjectPhaseTemplates.size()+"条数据"); 
-		try{ 
-			xmProjectPhaseTemplateService.batchUpdate(xmProjectPhaseTemplates);
-		}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;
-	} 
-}

xm-core/src/main/java/com/xm/core/ctrl/XmTaskTemplateController.java

@@ -1,230 +0,0 @@
-package com.xm.core.ctrl;
-
-import com.mdp.core.entity.Tips;
-import com.mdp.core.err.BizException;
-import com.mdp.core.utils.RequestUtils;
-import com.mdp.mybatis.PageUtils;
-import com.xm.core.entity.XmTaskTemplate;
-import com.xm.core.service.XmTaskTemplateService;
-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.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * url编制采用rest风格,如对XM.xm_task_template xm_task_template的操作有增删改查,对应的url分别为:<br>
- *  新增: xm/xmTaskTemplate/add <br>
- *  查询: xm/xmTaskTemplate/list<br>
- *  模糊查询: xm/xmTaskTemplate/listKey<br>
- *  修改: xm/xmTaskTemplate/edit <br>
- *  删除: xm/xmTaskTemplate/del<br>
- *  批量删除: xm/xmTaskTemplate/batchDel<br>
- * 组织 com.qqkj  顶级模块 oa 大模块 xm 小模块 <br>
- * 实体 XmTaskTemplate 表 XM.xm_task_template 当前主键(包括多主键): id; 
- ***/
-@RestController("xm.core.xmTaskTemplateController")
-@RequestMapping(value="/**/xm/core/xmTaskTemplate")
-@Api(tags={"xm_task_template操作接口"})
-public class XmTaskTemplateController {
-	
-	static Log logger=LogFactory.getLog(XmTaskTemplateController.class);
-	
-	@Autowired
-	private XmTaskTemplateService xmTaskTemplateService;
-	 
-		
- 
-	
-	@ApiOperation( value = "查询xm_task_template信息列表",notes="listXmTaskTemplate,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
-	@ApiImplicitParams({  
-		@ApiImplicitParam(name="id",value="任务编号,主键",required=false),
-		@ApiImplicitParam(name="name",value="任务名称",required=false),
-		@ApiImplicitParam(name="parentTaskid",value="父任务编号",required=false),
-		@ApiImplicitParam(name="parentTaskname",value="父任务名称",required=false),
-		@ApiImplicitParam(name="level",value="任务级别",required=false),
-		@ApiImplicitParam(name="sortLevel",value="排序级别",required=false),
-		@ApiImplicitParam(name="preTaskid",value="前置任务编号",required=false),
-		@ApiImplicitParam(name="preTaskname",value="前置任务名称",required=false),
-		@ApiImplicitParam(name="milestone",value="里程碑",required=false),
-		@ApiImplicitParam(name="description",value="任务描述",required=false),
-		@ApiImplicitParam(name="remarks",value="备注",required=false),
-		@ApiImplicitParam(name="createUserid",value="任务创建人编号",required=false),
-		@ApiImplicitParam(name="createUsername",value="任务创建人",required=false),
-		@ApiImplicitParam(name="createTime",value="创建时间",required=false),
-		@ApiImplicitParam(name="budgetCost",value="当前任务预算金额（包括所有成本，不包括下一级）",required=false),
-		@ApiImplicitParam(name="budgetWorkload",value="预算工时（不包括下一级）",required=false),
-		@ApiImplicitParam(name="taskType",value="0售前方案1投标2需求3设计4开发5测试6验收7部署8运维--来自基础数据表taskType",required=false),
-		@ApiImplicitParam(name="taskClass",value="1需结算0不需结算",required=false),
-		@ApiImplicitParam(name="toTaskCenter",value="是否发布到任务大厅0否1是",required=false),
-		@ApiImplicitParam(name="taskSkillNames",value="技能列表,逗号分隔",required=false),
-		@ApiImplicitParam(name="taskSkillIds",value="技能编号列表逗号分隔",required=false),
-		@ApiImplicitParam(name="taskOut",value="是否可外购",required=false),
-		@ApiImplicitParam(name="planType",value="计划类型w1-周,w2-2周,w3-3周,m1-1月,m2-2月,q1-季,q2-半年，y1-年",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= XmTaskTemplate.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
-	})
-	@RequestMapping(value="/list",method=RequestMethod.GET)
-	public Map<String,Object> listXmTaskTemplate( @RequestParam Map<String,Object> xmTaskTemplate){
-		Map<String,Object> m = new HashMap<>(); 
-		RequestUtils.transformArray(xmTaskTemplate, "ids");
-		PageUtils.startPage(xmTaskTemplate);
-		List<Map<String,Object>>	xmTaskTemplateList = xmTaskTemplateService.selectListMapByWhere(xmTaskTemplate);	//列出XmTaskTemplate列表
-		PageUtils.responePage(m, xmTaskTemplateList);
-		m.put("data",xmTaskTemplateList);
-		Tips tips=new Tips("查询成功");
-		m.put("tips", tips);
-		return m;
-	}
-	
- 
-	
-	/***/
-	@ApiOperation( value = "新增一条xm_task_template信息",notes="addXmTaskTemplate,主键如果为空，后台自动生成")
-	@ApiResponses({
-		@ApiResponse(code = 200,response=XmTaskTemplate.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
-	}) 
-	@RequestMapping(value="/add",method=RequestMethod.POST)
-	public Map<String,Object> addXmTaskTemplate(@RequestBody XmTaskTemplate xmTaskTemplate) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功新增一条数据");
-		try{
-			if(StringUtils.isEmpty(xmTaskTemplate.getId())) {
-				xmTaskTemplate.setId(xmTaskTemplateService.createKey("id"));
-			}else{
-				 XmTaskTemplate xmTaskTemplateQuery = new  XmTaskTemplate(xmTaskTemplate.getId());
-				if(xmTaskTemplateService.countByWhere(xmTaskTemplateQuery)>0){
-					tips.setFailureMsg("编号重复，请修改编号再提交");
-					m.put("tips", tips);
-					return m;
-				}
-			}
-			xmTaskTemplateService.insert(xmTaskTemplate);
-			m.put("data",xmTaskTemplate);
-		}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_task_template信息",notes="delXmTaskTemplate,仅需要上传主键字段")
-	@ApiResponses({
-		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}")
-	}) 
-	@RequestMapping(value="/del",method=RequestMethod.POST)
-	public Map<String,Object> delXmTaskTemplate(@RequestBody XmTaskTemplate xmTaskTemplate){
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功删除一条数据");
-		try{
-			xmTaskTemplateService.deleteByPk(xmTaskTemplate);
-		}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_task_template信息",notes="editXmTaskTemplate")
-	@ApiResponses({
-		@ApiResponse(code = 200,response=XmTaskTemplate.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
-	}) 
-	@RequestMapping(value="/edit",method=RequestMethod.POST)
-	public Map<String,Object> editXmTaskTemplate(@RequestBody XmTaskTemplate xmTaskTemplate) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功更新一条数据");
-		try{
-			xmTaskTemplateService.updateByPk(xmTaskTemplate);
-			m.put("data",xmTaskTemplate);
-		}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_task_template信息",notes="batchDelXmTaskTemplate,仅需要上传主键字段")
-	@ApiResponses({
-		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
-	}) 
-	@RequestMapping(value="/batchDel",method=RequestMethod.POST)
-	public Map<String,Object> batchDelXmTaskTemplate(@RequestBody List<XmTaskTemplate> xmTaskTemplates) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功删除"+xmTaskTemplates.size()+"条数据"); 
-		try{ 
-			xmTaskTemplateService.batchDelete(xmTaskTemplates);
-		}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;
-	} 
-	@RequestMapping(value="/batchAdd",method=RequestMethod.POST)
-	public Map<String,Object> batchAddXmTaskTemplate(@RequestBody List<XmTaskTemplate> xmTaskTemplates) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功删除"+xmTaskTemplates.size()+"条数据"); 
-		try{ 
-			xmTaskTemplateService.batchInsert(xmTaskTemplates);
-		}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;
-	} 
-	@RequestMapping(value="/batchEdit",method=RequestMethod.POST)
-	public Map<String,Object> batchEditXmTaskTemplate(@RequestBody List<XmTaskTemplate> xmTaskTemplates) {
-		Map<String,Object> m = new HashMap<>();
-		Tips tips=new Tips("成功删除"+xmTaskTemplates.size()+"条数据"); 
-		try{ 
-			xmTaskTemplateService.batchUpdate(xmTaskTemplates);
-		}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;
-	} 
-	
-}

xm-core/src/main/java/com/xm/core/entity/XmMenu.java

@@ -7,9 +7,9 @@ import java.util.Date;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmMenu所有属性名: <br>
- *	menuId,menuName,pmenuId,productId,remark,status,online,demandUrl,codeUrl,designUrl,docUrl,helpUrl,operDocUrl,seqNo,mmUserid,mmUsername,ctime,ntype,sinceVersion,childrenCnt,ltime,tagIds,tagNames,pidPaths,lvl;<br>
+ *	menuId,menuName,pmenuId,productId,remark,status,online,demandUrl,codeUrl,designUrl,docUrl,helpUrl,operDocUrl,seqNo,mmUserid,mmUsername,ctime,ntype,sinceVersion,childrenCnt,ltime,tagIds,tagNames,pidPaths,lvl,isTpl;<br>
  * 表 xm_menu 功能表的所有字段名: <br>
- *	menu_id,menu_name,pmenu_id,product_id,remark,status,online,demand_url,code_url,design_url,doc_url,help_url,oper_doc_url,seq_no,mm_userid,mm_username,ctime,ntype,since_version,children_cnt,ltime,tag_ids,tag_names,pid_paths,lvl;<br>
+ *	menu_id,menu_name,pmenu_id,product_id,remark,status,online,demand_url,code_url,design_url,doc_url,help_url,oper_doc_url,seq_no,mm_userid,mm_username,ctime,ntype,since_version,children_cnt,ltime,tag_ids,tag_names,pid_paths,lvl,is_tpl;<br>
  * 当前主键(包括多主键):<br>
  *	menu_id;<br>
  */
@@ -94,6 +94,9 @@ public class XmMenu  implements java.io.Serializable {
 	@ApiModelProperty(notes="层级0-顶级，1-一级，2-二级，3-三级，4-四级。总共5级",allowEmptyValue=true,example="",allowableValues="")
 	Integer lvl;
 	
+	@ApiModelProperty(notes="是否为模板",allowEmptyValue=true,example="",allowableValues="")
+	String isTpl;
+
 	/**功能编号**/
 	public XmMenu(String menuId) {
 		this.menuId = menuId;
@@ -253,6 +256,12 @@ public class XmMenu  implements java.io.Serializable {
 	public void setLvl(Integer lvl) {
 		this.lvl = lvl;
 	}
+	/**
+	 * 是否为模板
+	 **/
+	public void setIsTpl(String isTpl) {
+		this.isTpl = isTpl;
+	}
 	
 	/**
 	 * 功能编号
@@ -404,5 +413,11 @@ public class XmMenu  implements java.io.Serializable {
 	public Integer getLvl() {
 		return this.lvl;
 	}
+	/**
+	 * 是否为模板
+	 **/
+	public String getIsTpl() {
+		return this.isTpl;
+	}
 
 }

xm-core/src/main/java/com/xm/core/entity/XmMenuTemplate.java

@@ -1,242 +0,0 @@
-package com.xm.core.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 组织 com.qqkj  顶级模块 oa 大模块 xm  小模块 <br> 
- * 实体 XmMenuTemplate所有属性名: <br>
- *	menuId,menuName,pmenuId,productId,remark,status,online,demandUrl,codeUrl,designUrl,docUrl,helpUrl,operDocUrl,seqNo;<br>
- * 表 XM.xm_menu_template 功能表的所有字段名: <br>
- *	menu_id,menu_name,pmenu_id,product_id,remark,status,online,demand_url,code_url,design_url,doc_url,help_url,oper_doc_url,seq_no;<br>
- * 当前主键(包括多主键):<br>
- *	menu_id;<br>
- */
-@ApiModel(description="功能表")
-public class XmMenuTemplate  implements java.io.Serializable {
-	
-	private static final long serialVersionUID = 1L;
-	
-	@ApiModelProperty(notes="功能编号,主键",allowEmptyValue=true,example="",allowableValues="")
-	String menuId;
-  	
-	
-	@ApiModelProperty(notes="功能名称",allowEmptyValue=true,example="",allowableValues="")
-	String menuName;
-	
-	@ApiModelProperty(notes="上级功能",allowEmptyValue=true,example="",allowableValues="")
-	String pmenuId;
-	
-	@ApiModelProperty(notes="归属产品编号",allowEmptyValue=true,example="",allowableValues="")
-	String productId;
-	
-	@ApiModelProperty(notes="备注",allowEmptyValue=true,example="",allowableValues="")
-	String remark;
-	
-	@ApiModelProperty(notes="状态0初始1设计中2开发中3测试中4uat测试2已上线3已下线4已删除",allowEmptyValue=true,example="",allowableValues="")
-	String status;
-	
-	@ApiModelProperty(notes="是否已上线",allowEmptyValue=true,example="",allowableValues="")
-	String online;
-	
-	@ApiModelProperty(notes="需求链接",allowEmptyValue=true,example="",allowableValues="")
-	String demandUrl;
-	
-	@ApiModelProperty(notes="代码链接",allowEmptyValue=true,example="",allowableValues="")
-	String codeUrl;
-	
-	@ApiModelProperty(notes="设计链接",allowEmptyValue=true,example="",allowableValues="")
-	String designUrl;
-	
-	@ApiModelProperty(notes="文档链接",allowEmptyValue=true,example="",allowableValues="")
-	String docUrl;
-	
-	@ApiModelProperty(notes="帮助文档链接",allowEmptyValue=true,example="",allowableValues="")
-	String helpUrl;
-	
-	@ApiModelProperty(notes="操作手册链接",allowEmptyValue=true,example="",allowableValues="")
-	String operDocUrl;
-	
-	@ApiModelProperty(notes="排序序号",allowEmptyValue=true,example="",allowableValues="")
-	String seqNo;
-
-	/**功能编号**/
-	public XmMenuTemplate(String menuId) {
-		this.menuId = menuId;
-	}
-    
-    /**功能表**/
-	public XmMenuTemplate() {
-	}
-	
-	/**
-	 * 功能编号
-	 **/
-	public void setMenuId(String menuId) {
-		this.menuId = menuId;
-	}
-	/**
-	 * 功能名称
-	 **/
-	public void setMenuName(String menuName) {
-		this.menuName = menuName;
-	}
-	/**
-	 * 上级功能
-	 **/
-	public void setPmenuId(String pmenuId) {
-		this.pmenuId = pmenuId;
-	}
-	/**
-	 * 归属产品编号
-	 **/
-	public void setProductId(String productId) {
-		this.productId = productId;
-	}
-	/**
-	 * 备注
-	 **/
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-	/**
-	 * 状态0初始1设计中2开发中3测试中4uat测试2已上线3已下线4已删除
-	 **/
-	public void setStatus(String status) {
-		this.status = status;
-	}
-	/**
-	 * 是否已上线
-	 **/
-	public void setOnline(String online) {
-		this.online = online;
-	}
-	/**
-	 * 需求链接
-	 **/
-	public void setDemandUrl(String demandUrl) {
-		this.demandUrl = demandUrl;
-	}
-	/**
-	 * 代码链接
-	 **/
-	public void setCodeUrl(String codeUrl) {
-		this.codeUrl = codeUrl;
-	}
-	/**
-	 * 设计链接
-	 **/
-	public void setDesignUrl(String designUrl) {
-		this.designUrl = designUrl;
-	}
-	/**
-	 * 文档链接
-	 **/
-	public void setDocUrl(String docUrl) {
-		this.docUrl = docUrl;
-	}
-	/**
-	 * 帮助文档链接
-	 **/
-	public void setHelpUrl(String helpUrl) {
-		this.helpUrl = helpUrl;
-	}
-	/**
-	 * 操作手册链接
-	 **/
-	public void setOperDocUrl(String operDocUrl) {
-		this.operDocUrl = operDocUrl;
-	}
-	/**
-	 * 排序序号
-	 **/
-	public void setSeqNo(String seqNo) {
-		this.seqNo = seqNo;
-	}
-	
-	/**
-	 * 功能编号
-	 **/
-	public String getMenuId() {
-		return this.menuId;
-	}
-	/**
-	 * 功能名称
-	 **/
-	public String getMenuName() {
-		return this.menuName;
-	}
-	/**
-	 * 上级功能
-	 **/
-	public String getPmenuId() {
-		return this.pmenuId;
-	}
-	/**
-	 * 归属产品编号
-	 **/
-	public String getProductId() {
-		return this.productId;
-	}
-	/**
-	 * 备注
-	 **/
-	public String getRemark() {
-		return this.remark;
-	}
-	/**
-	 * 状态0初始1设计中2开发中3测试中4uat测试2已上线3已下线4已删除
-	 **/
-	public String getStatus() {
-		return this.status;
-	}
-	/**
-	 * 是否已上线
-	 **/
-	public String getOnline() {
-		return this.online;
-	}
-	/**
-	 * 需求链接
-	 **/
-	public String getDemandUrl() {
-		return this.demandUrl;
-	}
-	/**
-	 * 代码链接
-	 **/
-	public String getCodeUrl() {
-		return this.codeUrl;
-	}
-	/**
-	 * 设计链接
-	 **/
-	public String getDesignUrl() {
-		return this.designUrl;
-	}
-	/**
-	 * 文档链接
-	 **/
-	public String getDocUrl() {
-		return this.docUrl;
-	}
-	/**
-	 * 帮助文档链接
-	 **/
-	public String getHelpUrl() {
-		return this.helpUrl;
-	}
-	/**
-	 * 操作手册链接
-	 **/
-	public String getOperDocUrl() {
-		return this.operDocUrl;
-	}
-	/**
-	 * 排序序号
-	 **/
-	public String getSeqNo() {
-		return this.seqNo;
-	}
-
-}

xm-core/src/main/java/com/xm/core/entity/XmProduct.java

@@ -7,9 +7,9 @@ import java.util.Date;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmProduct所有属性名: <br>
- *	id,productName,branchId,remark,version,pmUserid,pmUsername,ctime,deptid;<br>
- * 表 XM.xm_product 产品表的所有字段名: <br>
- *	id,product_name,branch_id,remark,version,pm_userid,pm_username,ctime,deptid;<br>
+ *	id,productName,branchId,remark,version,pmUserid,pmUsername,ctime,deptid,pstatus,startTime,endTime,deptName,admUserid,admUsername,assistantUserid,assistantUsername,bizProcInstId,bizFlowState,isTpl,baselineId,baseTime;<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;<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -46,6 +46,45 @@ public class XmProduct  implements java.io.Serializable {
 	@ApiModelProperty(notes="归属部门",allowEmptyValue=true,example="",allowableValues="")
 	String deptid;
 	
+	@ApiModelProperty(notes="产品阶段:0未开始,1研发中,2已完成",allowEmptyValue=true,example="",allowableValues="")
+	String pstatus;
+	
+	@ApiModelProperty(notes="开始日期",allowEmptyValue=true,example="",allowableValues="")
+	Date startTime;
+	
+	@ApiModelProperty(notes="结束日期",allowEmptyValue=true,example="",allowableValues="")
+	Date endTime;
+	
+	@ApiModelProperty(notes="主管部门名称",allowEmptyValue=true,example="",allowableValues="")
+	String deptName;
+	
+	@ApiModelProperty(notes="主管领导编号",allowEmptyValue=true,example="",allowableValues="")
+	String admUserid;
+	
+	@ApiModelProperty(notes="主管领导名称",allowEmptyValue=true,example="",allowableValues="")
+	String admUsername;
+	
+	@ApiModelProperty(notes="副经理编号",allowEmptyValue=true,example="",allowableValues="")
+	String assistantUserid;
+	
+	@ApiModelProperty(notes="副经理名称",allowEmptyValue=true,example="",allowableValues="")
+	String assistantUsername;
+	
+	@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="")
+	String isTpl;
+	
+	@ApiModelProperty(notes="基线编号",allowEmptyValue=true,example="",allowableValues="")
+	String baselineId;
+	
+	@ApiModelProperty(notes="基线时间",allowEmptyValue=true,example="",allowableValues="")
+	Date baseTime;
+
 	/**产品编号**/
 	public XmProduct(String id) {
 		this.id = id;
@@ -109,6 +148,84 @@ public class XmProduct  implements java.io.Serializable {
 	public void setDeptid(String deptid) {
 		this.deptid = deptid;
 	}
+	/**
+	 * 产品阶段:0未开始,1研发中,2已完成
+	 **/
+	public void setPstatus(String pstatus) {
+		this.pstatus = pstatus;
+	}
+	/**
+	 * 开始日期
+	 **/
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+	/**
+	 * 结束日期
+	 **/
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+	/**
+	 * 主管部门名称
+	 **/
+	public void setDeptName(String deptName) {
+		this.deptName = deptName;
+	}
+	/**
+	 * 主管领导编号
+	 **/
+	public void setAdmUserid(String admUserid) {
+		this.admUserid = admUserid;
+	}
+	/**
+	 * 主管领导名称
+	 **/
+	public void setAdmUsername(String admUsername) {
+		this.admUsername = admUsername;
+	}
+	/**
+	 * 副经理编号
+	 **/
+	public void setAssistantUserid(String assistantUserid) {
+		this.assistantUserid = assistantUserid;
+	}
+	/**
+	 * 副经理名称
+	 **/
+	public void setAssistantUsername(String assistantUsername) {
+		this.assistantUsername = assistantUsername;
+	}
+	/**
+	 * 当前流程实例编号
+	 **/
+	public void setBizProcInstId(String bizProcInstId) {
+		this.bizProcInstId = bizProcInstId;
+	}
+	/**
+	 * 当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除
+	 **/
+	public void setBizFlowState(String bizFlowState) {
+		this.bizFlowState = bizFlowState;
+	}
+	/**
+	 * 是否为模板
+	 **/
+	public void setIsTpl(String isTpl) {
+		this.isTpl = isTpl;
+	}
+	/**
+	 * 基线编号
+	 **/
+	public void setBaselineId(String baselineId) {
+		this.baselineId = baselineId;
+	}
+	/**
+	 * 基线时间
+	 **/
+	public void setBaseTime(Date baseTime) {
+		this.baseTime = baseTime;
+	}
 	
 	/**
 	 * 产品编号
@@ -164,5 +281,83 @@ public class XmProduct  implements java.io.Serializable {
 	public String getDeptid() {
 		return this.deptid;
 	}
+	/**
+	 * 产品阶段:0未开始,1研发中,2已完成
+	 **/
+	public String getPstatus() {
+		return this.pstatus;
+	}
+	/**
+	 * 开始日期
+	 **/
+	public Date getStartTime() {
+		return this.startTime;
+	}
+	/**
+	 * 结束日期
+	 **/
+	public Date getEndTime() {
+		return this.endTime;
+	}
+	/**
+	 * 主管部门名称
+	 **/
+	public String getDeptName() {
+		return this.deptName;
+	}
+	/**
+	 * 主管领导编号
+	 **/
+	public String getAdmUserid() {
+		return this.admUserid;
+	}
+	/**
+	 * 主管领导名称
+	 **/
+	public String getAdmUsername() {
+		return this.admUsername;
+	}
+	/**
+	 * 副经理编号
+	 **/
+	public String getAssistantUserid() {
+		return this.assistantUserid;
+	}
+	/**
+	 * 副经理名称
+	 **/
+	public String getAssistantUsername() {
+		return this.assistantUsername;
+	}
+	/**
+	 * 当前流程实例编号
+	 **/
+	public String getBizProcInstId() {
+		return this.bizProcInstId;
+	}
+	/**
+	 * 当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除
+	 **/
+	public String getBizFlowState() {
+		return this.bizFlowState;
+	}
+	/**
+	 * 是否为模板
+	 **/
+	public String getIsTpl() {
+		return this.isTpl;
+	}
+	/**
+	 * 基线编号
+	 **/
+	public String getBaselineId() {
+		return this.baselineId;
+	}
+	/**
+	 * 基线时间
+	 **/
+	public Date getBaseTime() {
+		return this.baseTime;
+	}
 
 }

xm-core/src/main/java/com/xm/core/entity/XmProductTemplate.java

@@ -1,199 +0,0 @@
-package com.xm.core.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
-/**
- * 组织 com.qqkj  顶级模块 oa 大模块 xm  小模块 <br> 
- * 实体 XmProductTemplate所有属性名: <br>
- *	id,productName,branchId,remark,templateId,tcuserid,tcusername,tremark,tctime,tcbranchId,shareScope;<br>
- * 表 XM.xm_product_template 产品表的所有字段名: <br>
- *	id,product_name,branch_id,remark,template_id,tcuserid,tcusername,tremark,tctime,tcbranch_id,share_scope;<br>
- * 当前主键(包括多主键):<br>
- *	id;<br>
- */
-@ApiModel(description="产品表")
-public class XmProductTemplate  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 productName;
-	
-	@ApiModelProperty(notes="机构号",allowEmptyValue=true,example="",allowableValues="")
-	String branchId;
-	
-	@ApiModelProperty(notes="备注",allowEmptyValue=true,example="",allowableValues="")
-	String remark;
-	
-	@ApiModelProperty(notes="项目模板编号",allowEmptyValue=true,example="",allowableValues="")
-	String templateId;
-	
-	@ApiModelProperty(notes="模板创建人编号",allowEmptyValue=true,example="",allowableValues="")
-	String tcuserid;
-	
-	@ApiModelProperty(notes="模板创建人姓名",allowEmptyValue=true,example="",allowableValues="")
-	String tcusername;
-	
-	@ApiModelProperty(notes="模板备注",allowEmptyValue=true,example="",allowableValues="")
-	String tremark;
-	
-	@ApiModelProperty(notes="模板创建时间",allowEmptyValue=true,example="",allowableValues="")
-	Date tctime;
-	
-	@ApiModelProperty(notes="模板创建机构编号",allowEmptyValue=true,example="",allowableValues="")
-	String tcbranchId;
-	
-	@ApiModelProperty(notes="共享范围0-全部,1-本机构",allowEmptyValue=true,example="",allowableValues="")
-	String shareScope;
-
-	/**产品编号**/
-	public XmProductTemplate(String id) {
-		this.id = id;
-	}
-    
-    /**产品表**/
-	public XmProductTemplate() {
-	}
-	
-	/**
-	 * 产品编号
-	 **/
-	public void setId(String id) {
-		this.id = id;
-	}
-	/**
-	 * 产品名称
-	 **/
-	public void setProductName(String productName) {
-		this.productName = productName;
-	}
-	/**
-	 * 机构号
-	 **/
-	public void setBranchId(String branchId) {
-		this.branchId = branchId;
-	}
-	/**
-	 * 备注
-	 **/
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-	/**
-	 * 项目模板编号
-	 **/
-	public void setTemplateId(String templateId) {
-		this.templateId = templateId;
-	}
-	/**
-	 * 模板创建人编号
-	 **/
-	public void setTcuserid(String tcuserid) {
-		this.tcuserid = tcuserid;
-	}
-	/**
-	 * 模板创建人姓名
-	 **/
-	public void setTcusername(String tcusername) {
-		this.tcusername = tcusername;
-	}
-	/**
-	 * 模板备注
-	 **/
-	public void setTremark(String tremark) {
-		this.tremark = tremark;
-	}
-	/**
-	 * 模板创建时间
-	 **/
-	public void setTctime(Date tctime) {
-		this.tctime = tctime;
-	}
-	/**
-	 * 模板创建机构编号
-	 **/
-	public void setTcbranchId(String tcbranchId) {
-		this.tcbranchId = tcbranchId;
-	}
-	/**
-	 * 共享范围0-全部,1-本机构
-	 **/
-	public void setShareScope(String shareScope) {
-		this.shareScope = shareScope;
-	}
-	
-	/**
-	 * 产品编号
-	 **/
-	public String getId() {
-		return this.id;
-	}
-	/**
-	 * 产品名称
-	 **/
-	public String getProductName() {
-		return this.productName;
-	}
-	/**
-	 * 机构号
-	 **/
-	public String getBranchId() {
-		return this.branchId;
-	}
-	/**
-	 * 备注
-	 **/
-	public String getRemark() {
-		return this.remark;
-	}
-	/**
-	 * 项目模板编号
-	 **/
-	public String getTemplateId() {
-		return this.templateId;
-	}
-	/**
-	 * 模板创建人编号
-	 **/
-	public String getTcuserid() {
-		return this.tcuserid;
-	}
-	/**
-	 * 模板创建人姓名
-	 **/
-	public String getTcusername() {
-		return this.tcusername;
-	}
-	/**
-	 * 模板备注
-	 **/
-	public String getTremark() {
-		return this.tremark;
-	}
-	/**
-	 * 模板创建时间
-	 **/
-	public Date getTctime() {
-		return this.tctime;
-	}
-	/**
-	 * 模板创建机构编号
-	 **/
-	public String getTcbranchId() {
-		return this.tcbranchId;
-	}
-	/**
-	 * 共享范围0-全部,1-本机构
-	 **/
-	public String getShareScope() {
-		return this.shareScope;
-	}
-
-}

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;<br>
- * 表 XM.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;<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>
+ * 表 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>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -77,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="")
@@ -98,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="")
@@ -128,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="")
@@ -146,6 +146,9 @@ public class XmProject  implements java.io.Serializable {
 	@ApiModelProperty(notes="是否对外公开0否1是",allowEmptyValue=true,example="",allowableValues="")
 	String showOut;
 	
+	@ApiModelProperty(notes="是否为模板",allowEmptyValue=true,example="",allowableValues="")
+	String isTpl;
+
 	/**项目编号**/
 	public XmProject(String id) {
 		this.id = id;
@@ -270,19 +273,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;
@@ -312,7 +315,7 @@ public class XmProject  implements java.io.Serializable {
 		this.baselineId = baselineId;
 	}
 	/**
-	 * 总预算工作量-应该大于或等于计划总工作量
+	 * 总预算工作量-应该大于或等于阶段计划总工作量
 	 **/
 	public void setPlanWorkload(BigDecimal planWorkload) {
 		this.planWorkload = planWorkload;
@@ -372,13 +375,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;
@@ -407,6 +410,12 @@ public class XmProject  implements java.io.Serializable {
 	public void setShowOut(String showOut) {
 		this.showOut = showOut;
 	}
+	/**
+	 * 是否为模板
+	 **/
+	public void setIsTpl(String isTpl) {
+		this.isTpl = isTpl;
+	}
 	
 	/**
 	 * 项目编号
@@ -523,19 +532,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;
@@ -565,7 +574,7 @@ public class XmProject  implements java.io.Serializable {
 		return this.baselineId;
 	}
 	/**
-	 * 总预算工作量-应该大于或等于计划总工作量
+	 * 总预算工作量-应该大于或等于阶段计划总工作量
 	 **/
 	public BigDecimal getPlanWorkload() {
 		return this.planWorkload;
@@ -625,13 +634,13 @@ public class XmProject  implements java.io.Serializable {
 		return this.taxRate;
 	}
 	/**
-	 * 内部人力总工作量-应该大于或等于计划内部人力总成本
+	 * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
 	 **/
 	public BigDecimal getPlanInnerUserWorkload() {
 		return this.planInnerUserWorkload;
 	}
 	/**
-	 * 外购人力总工作量-应该大于或等于计划外购人力总成本
+	 * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
 	 **/
 	public BigDecimal getPlanOutUserWorkload() {
 		return this.planOutUserWorkload;
@@ -660,5 +669,11 @@ public class XmProject  implements java.io.Serializable {
 	public String getShowOut() {
 		return this.showOut;
 	}
+	/**
+	 * 是否为模板
+	 **/
+	public String getIsTpl() {
+		return this.isTpl;
+	}
 
 }

xm-core/src/main/java/com/xm/core/entity/XmProjectPhase.java

@@ -8,9 +8,9 @@ import java.math.BigDecimal;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmProjectPhase所有属性名: <br>
- *	id,phaseName,remark,parentPhaseId,branchId,projectId,beginDate,endDate,phaseBudgetHours,phaseBudgetStaffNu,ctime,phaseBudgetNouserAt,phaseBudgetInnerUserAt,phaseBudgetOutUserAt,projectBaselineId,bizProcInstId,bizFlowState,phaseBudgetWorkload,phaseActWorkload,phaseActInnerUserWorkload,phaseActOutUserWorkload,taskType,planType,seqNo,phaseBudgetInnerUserWorkload,phaseBudgetOutUserWorkload,actNouserAt,actInnerUserAt,phaseBudgetInnerUserPrice,phaseBudgetOutUserPrice,phaseBudgetOutUserCnt,phaseBudgetInnerUserCnt,actRate,phaseStatus,actOutUserAt,taskCnt,finishTaskCnt,iterationCnt,calcTime,taskBudgetWorkload,taskBudgetAt,mngUserid,mngUsername,milestone,pleaf,tagIds,tagNames,ntype,childrenCnt,ltime,isKeyPath,pidPaths,lvl;<br>
+ *	id,phaseName,remark,parentPhaseId,branchId,projectId,beginDate,endDate,phaseBudgetHours,phaseBudgetStaffNu,ctime,phaseBudgetNouserAt,phaseBudgetInnerUserAt,phaseBudgetOutUserAt,projectBaselineId,bizProcInstId,bizFlowState,phaseBudgetWorkload,phaseActWorkload,phaseActInnerUserWorkload,phaseActOutUserWorkload,taskType,planType,seqNo,phaseBudgetInnerUserWorkload,phaseBudgetOutUserWorkload,actNouserAt,actInnerUserAt,phaseBudgetInnerUserPrice,phaseBudgetOutUserPrice,phaseBudgetOutUserCnt,phaseBudgetInnerUserCnt,actRate,phaseStatus,actOutUserAt,taskCnt,finishTaskCnt,iterationCnt,calcTime,taskBudgetWorkload,taskBudgetAt,mngUserid,mngUsername,milestone,pleaf,tagIds,tagNames,ntype,childrenCnt,ltime,isKeyPath,pidPaths,lvl,isTpl;<br>
  * 表 xm_project_phase 项目阶段模板的所有字段名: <br>
- *	id,phase_name,remark,parent_phase_id,branch_id,project_id,begin_date,end_date,phase_budget_hours,phase_budget_staff_nu,ctime,phase_budget_nouser_at,phase_budget_inner_user_at,phase_budget_out_user_at,project_baseline_id,biz_proc_inst_id,biz_flow_state,phase_budget_workload,phase_act_workload,phase_act_inner_user_workload,phase_act_out_user_workload,task_type,plan_type,seq_no,phase_budget_inner_user_workload,phase_budget_out_user_workload,act_nouser_at,act_inner_user_at,phase_budget_inner_user_price,phase_budget_out_user_price,phase_budget_out_user_cnt,phase_budget_inner_user_cnt,act_rate,phase_status,act_out_user_at,task_cnt,finish_task_cnt,iteration_cnt,calc_time,task_budget_workload,task_budget_at,mng_userid,mng_username,milestone,pleaf,tag_ids,tag_names,ntype,children_cnt,ltime,is_key_path,pid_paths,lvl;<br>
+ *	id,phase_name,remark,parent_phase_id,branch_id,project_id,begin_date,end_date,phase_budget_hours,phase_budget_staff_nu,ctime,phase_budget_nouser_at,phase_budget_inner_user_at,phase_budget_out_user_at,project_baseline_id,biz_proc_inst_id,biz_flow_state,phase_budget_workload,phase_act_workload,phase_act_inner_user_workload,phase_act_out_user_workload,task_type,plan_type,seq_no,phase_budget_inner_user_workload,phase_budget_out_user_workload,act_nouser_at,act_inner_user_at,phase_budget_inner_user_price,phase_budget_out_user_price,phase_budget_out_user_cnt,phase_budget_inner_user_cnt,act_rate,phase_status,act_out_user_at,task_cnt,finish_task_cnt,iteration_cnt,calc_time,task_budget_workload,task_budget_at,mng_userid,mng_username,milestone,pleaf,tag_ids,tag_names,ntype,children_cnt,ltime,is_key_path,pid_paths,lvl,is_tpl;<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -179,6 +179,9 @@ public class XmProjectPhase  implements java.io.Serializable {
 	@ApiModelProperty(notes="层级0-顶级，1-一级，2-二级，3-三级，4-四级。总共5级",allowEmptyValue=true,example="",allowableValues="")
 	Integer lvl;
 	
+	@ApiModelProperty(notes="是否为模板",allowEmptyValue=true,example="",allowableValues="")
+	String isTpl;
+
 	/**阶段主键**/
 	public XmProjectPhase(String id) {
 		this.id = id;
@@ -506,6 +509,12 @@ public class XmProjectPhase  implements java.io.Serializable {
 	public void setLvl(Integer lvl) {
 		this.lvl = lvl;
 	}
+	/**
+	 * 是否为模板
+	 **/
+	public void setIsTpl(String isTpl) {
+		this.isTpl = isTpl;
+	}
 	
 	/**
 	 * 阶段主键
@@ -825,5 +834,11 @@ public class XmProjectPhase  implements java.io.Serializable {
 	public Integer getLvl() {
 		return this.lvl;
 	}
+	/**
+	 * 是否为模板
+	 **/
+	public String getIsTpl() {
+		return this.isTpl;
+	}
 
 }

xm-core/src/main/java/com/xm/core/entity/XmProjectPhaseTemplate.java

@@ -1,395 +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> 
- * 实体 XmProjectPhaseTemplate所有属性名: <br>
- *	id,phaseName,remark,parentPhaseId,branchId,projectId,beginDate,endDate,phaseBudgetHours,phaseBudgetStaffNu,ctime,phaseBudgetNouserAt,phaseBudgetInnerUserAt,phaseBudgetOutUserAt,phaseBudgetWorkload,taskType,planType,seqNo,phaseBudgetInnerUserWorkload,phaseBudgetOutUserWorkload,phaseBudgetInnerUserPrice,phaseBudgetOutUserPrice,phaseBudgetOutUserCnt,phaseBudgetInnerUserCnt;<br>
- * 表 XM.xm_project_phase_template 项目阶段模板的所有字段名: <br>
- *	id,phase_name,remark,parent_phase_id,branch_id,project_id,begin_date,end_date,phase_budget_hours,phase_budget_staff_nu,ctime,phase_budget_nouser_at,phase_budget_inner_user_at,phase_budget_out_user_at,phase_budget_workload,task_type,plan_type,seq_no,phase_budget_inner_user_workload,phase_budget_out_user_workload,phase_budget_inner_user_price,phase_budget_out_user_price,phase_budget_out_user_cnt,phase_budget_inner_user_cnt;<br>
- * 当前主键(包括多主键):<br>
- *	id;<br>
- */
-@ApiModel(description="项目阶段模板")
-public class XmProjectPhaseTemplate  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 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="工时(不包括下一级)-应该大于或等于task中总工时",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal phaseBudgetHours;
-	
-	@ApiModelProperty(notes="投入人员数(不包括下一级)-应该大于或等于task中总人数",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal phaseBudgetStaffNu;
-	
-	@ApiModelProperty(notes="创建时间",allowEmptyValue=true,example="",allowableValues="")
-	Date ctime;
-	
-	@ApiModelProperty(notes="非人力成本总预算(不包括下一级)-应该大于或等于task中非人力总成本",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal phaseBudgetNouserAt;
-	
-	@ApiModelProperty(notes="内部人力成本总预算(不包括下一级)-应该大于或等于task中内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal phaseBudgetInnerUserAt;
-	
-	@ApiModelProperty(notes="外购人力成本总预算(不包括下一级)-应该大于或等于task中外购总成本",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal phaseBudgetOutUserAt;
-	
-	@ApiModelProperty(notes="总工作量单位人时-应该大于或者等于task中的预算总工作量",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal phaseBudgetWorkload;
-	
-	@ApiModelProperty(notes="0售前方案1投标2需求3设计4开发5测试6验收7部署8运维--来自基础数据表taskType",allowEmptyValue=true,example="",allowableValues="")
-	String taskType;
-	
-	@ApiModelProperty(notes="计划类型w1-周,w2-2周,w3-3周,m1-1月,m2-2月,q1-季,q2-半年，y1-年",allowEmptyValue=true,example="",allowableValues="")
-	String planType;
-	
-	@ApiModelProperty(notes="顺序号",allowEmptyValue=true,example="",allowableValues="")
-	String seqNo;
-	
-	@ApiModelProperty(notes="内部人力工作量总预算(不包括下一级)-应该大于或等于task中内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal phaseBudgetInnerUserWorkload;
-	
-	@ApiModelProperty(notes="外购人力工作量总预算(不包括下一级)-应该大于或等于task中外购总成本",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal phaseBudgetOutUserWorkload;
-	
-	@ApiModelProperty(notes="内部人力成本单价元/人时",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal phaseBudgetInnerUserPrice;
-	
-	@ApiModelProperty(notes="外购人力成本单价元/人时",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal phaseBudgetOutUserPrice;
-	
-	@ApiModelProperty(notes="外购人数",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal phaseBudgetOutUserCnt;
-	
-	@ApiModelProperty(notes="内部人数",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal phaseBudgetInnerUserCnt;
-
-	/**阶段主键**/
-	public XmProjectPhaseTemplate(String id) {
-		this.id = id;
-	}
-    
-    /**项目阶段模板**/
-	public XmProjectPhaseTemplate() {
-	}
-	
-	/**
-	 * 阶段主键
-	 **/
-	public void setId(String id) {
-		this.id = id;
-	}
-	/**
-	 * 阶段名称
-	 **/
-	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;
-	}
-	/**
-	 * 工时(不包括下一级)-应该大于或等于task中总工时
-	 **/
-	public void setPhaseBudgetHours(BigDecimal phaseBudgetHours) {
-		this.phaseBudgetHours = phaseBudgetHours;
-	}
-	/**
-	 * 投入人员数(不包括下一级)-应该大于或等于task中总人数
-	 **/
-	public void setPhaseBudgetStaffNu(BigDecimal phaseBudgetStaffNu) {
-		this.phaseBudgetStaffNu = phaseBudgetStaffNu;
-	}
-	/**
-	 * 创建时间
-	 **/
-	public void setCtime(Date ctime) {
-		this.ctime = ctime;
-	}
-	/**
-	 * 非人力成本总预算(不包括下一级)-应该大于或等于task中非人力总成本
-	 **/
-	public void setPhaseBudgetNouserAt(BigDecimal phaseBudgetNouserAt) {
-		this.phaseBudgetNouserAt = phaseBudgetNouserAt;
-	}
-	/**
-	 * 内部人力成本总预算(不包括下一级)-应该大于或等于task中内部人力总成本
-	 **/
-	public void setPhaseBudgetInnerUserAt(BigDecimal phaseBudgetInnerUserAt) {
-		this.phaseBudgetInnerUserAt = phaseBudgetInnerUserAt;
-	}
-	/**
-	 * 外购人力成本总预算(不包括下一级)-应该大于或等于task中外购总成本
-	 **/
-	public void setPhaseBudgetOutUserAt(BigDecimal phaseBudgetOutUserAt) {
-		this.phaseBudgetOutUserAt = phaseBudgetOutUserAt;
-	}
-	/**
-	 * 总工作量单位人时-应该大于或者等于task中的预算总工作量
-	 **/
-	public void setPhaseBudgetWorkload(BigDecimal phaseBudgetWorkload) {
-		this.phaseBudgetWorkload = phaseBudgetWorkload;
-	}
-	/**
-	 * 0售前方案1投标2需求3设计4开发5测试6验收7部署8运维--来自基础数据表taskType
-	 **/
-	public void setTaskType(String taskType) {
-		this.taskType = taskType;
-	}
-	/**
-	 * 计划类型w1-周,w2-2周,w3-3周,m1-1月,m2-2月,q1-季,q2-半年，y1-年
-	 **/
-	public void setPlanType(String planType) {
-		this.planType = planType;
-	}
-	/**
-	 * 顺序号
-	 **/
-	public void setSeqNo(String seqNo) {
-		this.seqNo = seqNo;
-	}
-	/**
-	 * 内部人力工作量总预算(不包括下一级)-应该大于或等于task中内部人力总成本
-	 **/
-	public void setPhaseBudgetInnerUserWorkload(BigDecimal phaseBudgetInnerUserWorkload) {
-		this.phaseBudgetInnerUserWorkload = phaseBudgetInnerUserWorkload;
-	}
-	/**
-	 * 外购人力工作量总预算(不包括下一级)-应该大于或等于task中外购总成本
-	 **/
-	public void setPhaseBudgetOutUserWorkload(BigDecimal phaseBudgetOutUserWorkload) {
-		this.phaseBudgetOutUserWorkload = phaseBudgetOutUserWorkload;
-	}
-	/**
-	 * 内部人力成本单价元/人时
-	 **/
-	public void setPhaseBudgetInnerUserPrice(BigDecimal phaseBudgetInnerUserPrice) {
-		this.phaseBudgetInnerUserPrice = phaseBudgetInnerUserPrice;
-	}
-	/**
-	 * 外购人力成本单价元/人时
-	 **/
-	public void setPhaseBudgetOutUserPrice(BigDecimal phaseBudgetOutUserPrice) {
-		this.phaseBudgetOutUserPrice = phaseBudgetOutUserPrice;
-	}
-	/**
-	 * 外购人数
-	 **/
-	public void setPhaseBudgetOutUserCnt(BigDecimal phaseBudgetOutUserCnt) {
-		this.phaseBudgetOutUserCnt = phaseBudgetOutUserCnt;
-	}
-	/**
-	 * 内部人数
-	 **/
-	public void setPhaseBudgetInnerUserCnt(BigDecimal phaseBudgetInnerUserCnt) {
-		this.phaseBudgetInnerUserCnt = phaseBudgetInnerUserCnt;
-	}
-	
-	/**
-	 * 阶段主键
-	 **/
-	public String getId() {
-		return this.id;
-	}
-	/**
-	 * 阶段名称
-	 **/
-	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;
-	}
-	/**
-	 * 工时(不包括下一级)-应该大于或等于task中总工时
-	 **/
-	public BigDecimal getPhaseBudgetHours() {
-		return this.phaseBudgetHours;
-	}
-	/**
-	 * 投入人员数(不包括下一级)-应该大于或等于task中总人数
-	 **/
-	public BigDecimal getPhaseBudgetStaffNu() {
-		return this.phaseBudgetStaffNu;
-	}
-	/**
-	 * 创建时间
-	 **/
-	public Date getCtime() {
-		return this.ctime;
-	}
-	/**
-	 * 非人力成本总预算(不包括下一级)-应该大于或等于task中非人力总成本
-	 **/
-	public BigDecimal getPhaseBudgetNouserAt() {
-		return this.phaseBudgetNouserAt;
-	}
-	/**
-	 * 内部人力成本总预算(不包括下一级)-应该大于或等于task中内部人力总成本
-	 **/
-	public BigDecimal getPhaseBudgetInnerUserAt() {
-		return this.phaseBudgetInnerUserAt;
-	}
-	/**
-	 * 外购人力成本总预算(不包括下一级)-应该大于或等于task中外购总成本
-	 **/
-	public BigDecimal getPhaseBudgetOutUserAt() {
-		return this.phaseBudgetOutUserAt;
-	}
-	/**
-	 * 总工作量单位人时-应该大于或者等于task中的预算总工作量
-	 **/
-	public BigDecimal getPhaseBudgetWorkload() {
-		return this.phaseBudgetWorkload;
-	}
-	/**
-	 * 0售前方案1投标2需求3设计4开发5测试6验收7部署8运维--来自基础数据表taskType
-	 **/
-	public String getTaskType() {
-		return this.taskType;
-	}
-	/**
-	 * 计划类型w1-周,w2-2周,w3-3周,m1-1月,m2-2月,q1-季,q2-半年，y1-年
-	 **/
-	public String getPlanType() {
-		return this.planType;
-	}
-	/**
-	 * 顺序号
-	 **/
-	public String getSeqNo() {
-		return this.seqNo;
-	}
-	/**
-	 * 内部人力工作量总预算(不包括下一级)-应该大于或等于task中内部人力总成本
-	 **/
-	public BigDecimal getPhaseBudgetInnerUserWorkload() {
-		return this.phaseBudgetInnerUserWorkload;
-	}
-	/**
-	 * 外购人力工作量总预算(不包括下一级)-应该大于或等于task中外购总成本
-	 **/
-	public BigDecimal getPhaseBudgetOutUserWorkload() {
-		return this.phaseBudgetOutUserWorkload;
-	}
-	/**
-	 * 内部人力成本单价元/人时
-	 **/
-	public BigDecimal getPhaseBudgetInnerUserPrice() {
-		return this.phaseBudgetInnerUserPrice;
-	}
-	/**
-	 * 外购人力成本单价元/人时
-	 **/
-	public BigDecimal getPhaseBudgetOutUserPrice() {
-		return this.phaseBudgetOutUserPrice;
-	}
-	/**
-	 * 外购人数
-	 **/
-	public BigDecimal getPhaseBudgetOutUserCnt() {
-		return this.phaseBudgetOutUserCnt;
-	}
-	/**
-	 * 内部人数
-	 **/
-	public BigDecimal getPhaseBudgetInnerUserCnt() {
-		return this.phaseBudgetInnerUserCnt;
-	}
-
-}

xm-core/src/main/java/com/xm/core/entity/XmProjectTemplate.java

@@ -1,740 +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> 
- * 实体 XmProjectTemplate所有属性名: <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,productId,productName,templateId,tcuserid,tcusername,tremark,tctime,tcbranchId,shareScope;<br>
- * 表 XM.xm_project_template xm_project_template的所有字段名: <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,product_id,product_name,template_id,tcuserid,tcusername,tremark,tctime,tcbranch_id,share_scope;<br>
- * 当前主键(包括多主键):<br>
- *	id;<br>
- */
-@ApiModel(description="xm_project_template")
-public class XmProjectTemplate  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="项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停",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 productId;
-	
-	@ApiModelProperty(notes="产品名称",allowEmptyValue=true,example="",allowableValues="")
-	String productName;
-	
-	@ApiModelProperty(notes="项目模板编号",allowEmptyValue=true,example="",allowableValues="")
-	String templateId;
-	
-	@ApiModelProperty(notes="模板创建人编号",allowEmptyValue=true,example="",allowableValues="")
-	String tcuserid;
-	
-	@ApiModelProperty(notes="模板创建人姓名",allowEmptyValue=true,example="",allowableValues="")
-	String tcusername;
-	
-	@ApiModelProperty(notes="模板备注",allowEmptyValue=true,example="",allowableValues="")
-	String tremark;
-	
-	@ApiModelProperty(notes="模板创建时间",allowEmptyValue=true,example="",allowableValues="")
-	Date tctime;
-	
-	@ApiModelProperty(notes="模板创建机构编号",allowEmptyValue=true,example="",allowableValues="")
-	String tcbranchId;
-	
-	@ApiModelProperty(notes="共享范围0-全部,1-本机构",allowEmptyValue=true,example="",allowableValues="")
-	String shareScope;
-
-	/**项目编号**/
-	public XmProjectTemplate(String id) {
-		this.id = id;
-	}
-    
-    /**xm_project_template**/
-	public XmProjectTemplate() {
-	}
-	
-	/**
-	 * 项目编号
-	 **/
-	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;
-	}
-	/**
-	 * 项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停
-	 **/
-	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 setProductId(String productId) {
-		this.productId = productId;
-	}
-	/**
-	 * 产品名称
-	 **/
-	public void setProductName(String productName) {
-		this.productName = productName;
-	}
-	/**
-	 * 项目模板编号
-	 **/
-	public void setTemplateId(String templateId) {
-		this.templateId = templateId;
-	}
-	/**
-	 * 模板创建人编号
-	 **/
-	public void setTcuserid(String tcuserid) {
-		this.tcuserid = tcuserid;
-	}
-	/**
-	 * 模板创建人姓名
-	 **/
-	public void setTcusername(String tcusername) {
-		this.tcusername = tcusername;
-	}
-	/**
-	 * 模板备注
-	 **/
-	public void setTremark(String tremark) {
-		this.tremark = tremark;
-	}
-	/**
-	 * 模板创建时间
-	 **/
-	public void setTctime(Date tctime) {
-		this.tctime = tctime;
-	}
-	/**
-	 * 模板创建机构编号
-	 **/
-	public void setTcbranchId(String tcbranchId) {
-		this.tcbranchId = tcbranchId;
-	}
-	/**
-	 * 共享范围0-全部,1-本机构
-	 **/
-	public void setShareScope(String shareScope) {
-		this.shareScope = shareScope;
-	}
-	
-	/**
-	 * 项目编号
-	 **/
-	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;
-	}
-	/**
-	 * 项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停
-	 **/
-	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 getProductId() {
-		return this.productId;
-	}
-	/**
-	 * 产品名称
-	 **/
-	public String getProductName() {
-		return this.productName;
-	}
-	/**
-	 * 项目模板编号
-	 **/
-	public String getTemplateId() {
-		return this.templateId;
-	}
-	/**
-	 * 模板创建人编号
-	 **/
-	public String getTcuserid() {
-		return this.tcuserid;
-	}
-	/**
-	 * 模板创建人姓名
-	 **/
-	public String getTcusername() {
-		return this.tcusername;
-	}
-	/**
-	 * 模板备注
-	 **/
-	public String getTremark() {
-		return this.tremark;
-	}
-	/**
-	 * 模板创建时间
-	 **/
-	public Date getTctime() {
-		return this.tctime;
-	}
-	/**
-	 * 模板创建机构编号
-	 **/
-	public String getTcbranchId() {
-		return this.tcbranchId;
-	}
-	/**
-	 * 共享范围0-全部,1-本机构
-	 **/
-	public String getShareScope() {
-		return this.shareScope;
-	}
-
-}

xm-core/src/main/java/com/xm/core/entity/XmTask.java

@@ -8,9 +8,9 @@ import java.math.BigDecimal;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmTask所有属性名: <br>
- *	id,name,parentTaskid,parentTaskname,projectId,projectName,level,sortLevel,executorUserid,executorUsername,preTaskid,preTaskname,startTime,endTime,milestone,description,remarks,createUserid,createUsername,createTime,rate,budgetCost,budgetWorkload,actCost,actWorkload,taskState,taskType,taskClass,toTaskCenter,actStartTime,actEndTime,bizProcInstId,bizFlowState,projectPhaseId,projectPhaseName,taskSkillNames,exeUsernames,taskSkillIds,exeUserids,taskOut,planType,settleSchemel,menuId,menuName,productId,productName,cbranchId,cdeptid,tagIds,tagNames,ntype,childrenCnt,ltime,pidPaths,lvl;<br>
+ *	id,name,parentTaskid,parentTaskname,projectId,projectName,level,sortLevel,executorUserid,executorUsername,preTaskid,preTaskname,startTime,endTime,milestone,description,remarks,createUserid,createUsername,createTime,rate,budgetCost,budgetWorkload,actCost,actWorkload,taskState,taskType,taskClass,toTaskCenter,actStartTime,actEndTime,bizProcInstId,bizFlowState,projectPhaseId,projectPhaseName,taskSkillNames,exeUsernames,taskSkillIds,exeUserids,taskOut,planType,settleSchemel,menuId,menuName,productId,productName,cbranchId,cdeptid,tagIds,tagNames,ntype,childrenCnt,ltime,pidPaths,lvl,isTpl;<br>
  * 表 xm_task xm_task的所有字段名: <br>
- *	id,name,parent_taskid,parent_taskname,project_id,project_name,level,sort_level,executor_userid,executor_username,pre_taskid,pre_taskname,start_time,end_time,milestone,description,remarks,create_userid,create_username,create_time,rate,budget_cost,budget_workload,act_cost,act_workload,task_state,task_type,task_class,to_task_center,act_start_time,act_end_time,biz_proc_inst_id,biz_flow_state,project_phase_id,project_phase_name,task_skill_names,exe_usernames,task_skill_ids,exe_userids,task_out,plan_type,settle_schemel,menu_id,menu_name,product_id,product_name,cbranch_id,cdeptid,tag_ids,tag_names,ntype,children_cnt,ltime,pid_paths,lvl;<br>
+ *	id,name,parent_taskid,parent_taskname,project_id,project_name,level,sort_level,executor_userid,executor_username,pre_taskid,pre_taskname,start_time,end_time,milestone,description,remarks,create_userid,create_username,create_time,rate,budget_cost,budget_workload,act_cost,act_workload,task_state,task_type,task_class,to_task_center,act_start_time,act_end_time,biz_proc_inst_id,biz_flow_state,project_phase_id,project_phase_name,task_skill_names,exe_usernames,task_skill_ids,exe_userids,task_out,plan_type,settle_schemel,menu_id,menu_name,product_id,product_name,cbranch_id,cdeptid,tag_ids,tag_names,ntype,children_cnt,ltime,pid_paths,lvl,is_tpl;<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -185,6 +185,9 @@ public class XmTask  implements java.io.Serializable {
 	@ApiModelProperty(notes="层级0-顶级，1-一级，2-二级，3-三级，4-四级。总共5级",allowEmptyValue=true,example="",allowableValues="")
 	Integer lvl;
 	
+	@ApiModelProperty(notes="是否为模板",allowEmptyValue=true,example="",allowableValues="")
+	String isTpl;
+
 	/**任务编号**/
 	public XmTask(String id) {
 		this.id = id;
@@ -524,6 +527,12 @@ public class XmTask  implements java.io.Serializable {
 	public void setLvl(Integer lvl) {
 		this.lvl = lvl;
 	}
+	/**
+	 * 是否为模板
+	 **/
+	public void setIsTpl(String isTpl) {
+		this.isTpl = isTpl;
+	}
 	
 	/**
 	 * 任务编号
@@ -855,5 +864,11 @@ public class XmTask  implements java.io.Serializable {
 	public Integer getLvl() {
 		return this.lvl;
 	}
+	/**
+	 * 是否为模板
+	 **/
+	public String getIsTpl() {
+		return this.isTpl;
+	}
 
 }

xm-core/src/main/java/com/xm/core/entity/XmTaskTemplate.java

@@ -1,545 +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> 
- * 实体 XmTaskTemplate所有属性名: <br>
- *	id,name,parentTaskid,parentTaskname,projectId,projectName,level,sortLevel,preTaskid,preTaskname,startTime,endTime,milestone,description,remarks,createUserid,createUsername,createTime,rate,budgetCost,budgetWorkload,taskState,taskType,taskClass,toTaskCenter,projectPhaseId,projectPhaseName,taskSkillNames,taskSkillIds,taskOut,planType,settleSchemel,menuId,menuName;<br>
- * 表 XM.xm_task_template xm_task_template的所有字段名: <br>
- *	id,name,parent_taskid,parent_taskname,project_id,project_name,level,sort_level,pre_taskid,pre_taskname,start_time,end_time,milestone,description,remarks,create_userid,create_username,create_time,rate,budget_cost,budget_workload,task_state,task_type,task_class,to_task_center,project_phase_id,project_phase_name,task_skill_names,task_skill_ids,task_out,plan_type,settle_schemel,menu_id,menu_name;<br>
- * 当前主键(包括多主键):<br>
- *	id;<br>
- */
-@ApiModel(description="xm_task_template")
-public class XmTaskTemplate  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 name;
-	
-	@ApiModelProperty(notes="父任务编号",allowEmptyValue=true,example="",allowableValues="")
-	String parentTaskid;
-	
-	@ApiModelProperty(notes="父任务名称",allowEmptyValue=true,example="",allowableValues="")
-	String parentTaskname;
-	
-	@ApiModelProperty(notes="项目编号",allowEmptyValue=true,example="",allowableValues="")
-	String projectId;
-	
-	@ApiModelProperty(notes="项目名称",allowEmptyValue=true,example="",allowableValues="")
-	String projectName;
-	
-	@ApiModelProperty(notes="任务级别",allowEmptyValue=true,example="",allowableValues="")
-	String level;
-	
-	@ApiModelProperty(notes="排序级别",allowEmptyValue=true,example="",allowableValues="")
-	String sortLevel;
-	
-	@ApiModelProperty(notes="前置任务编号",allowEmptyValue=true,example="",allowableValues="")
-	String preTaskid;
-	
-	@ApiModelProperty(notes="前置任务名称",allowEmptyValue=true,example="",allowableValues="")
-	String preTaskname;
-	
-	@ApiModelProperty(notes="任务开始时间",allowEmptyValue=true,example="",allowableValues="")
-	Date startTime;
-	
-	@ApiModelProperty(notes="任务结束时间",allowEmptyValue=true,example="",allowableValues="")
-	Date endTime;
-	
-	@ApiModelProperty(notes="里程碑",allowEmptyValue=true,example="",allowableValues="")
-	String milestone;
-	
-	@ApiModelProperty(notes="任务描述",allowEmptyValue=true,example="",allowableValues="")
-	String description;
-	
-	@ApiModelProperty(notes="备注",allowEmptyValue=true,example="",allowableValues="")
-	String remarks;
-	
-	@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="任务进度0-100",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal rate;
-	
-	@ApiModelProperty(notes="当前任务预算金额（包括所有成本，不包括下一级）",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal budgetCost;
-	
-	@ApiModelProperty(notes="预算工时（不包括下一级）",allowEmptyValue=true,example="",allowableValues="")
-	BigDecimal budgetWorkload;
-	
-	@ApiModelProperty(notes="任务状态0待领取1已领取执行中2已完工3已结算",allowEmptyValue=true,example="",allowableValues="")
-	String taskState;
-	
-	@ApiModelProperty(notes="0售前方案1投标2需求3设计4开发5测试6验收7部署8运维--来自基础数据表taskType",allowEmptyValue=true,example="",allowableValues="")
-	String taskType;
-	
-	@ApiModelProperty(notes="1需结算0不需结算",allowEmptyValue=true,example="",allowableValues="")
-	String taskClass;
-	
-	@ApiModelProperty(notes="是否发布到任务大厅0否1是",allowEmptyValue=true,example="",allowableValues="")
-	String toTaskCenter;
-	
-	@ApiModelProperty(notes="项目阶段编号",allowEmptyValue=true,example="",allowableValues="")
-	String projectPhaseId;
-	
-	@ApiModelProperty(notes="项目阶段名称",allowEmptyValue=true,example="",allowableValues="")
-	String projectPhaseName;
-	
-	@ApiModelProperty(notes="技能列表,逗号分隔",allowEmptyValue=true,example="",allowableValues="")
-	String taskSkillNames;
-	
-	@ApiModelProperty(notes="技能编号列表逗号分隔",allowEmptyValue=true,example="",allowableValues="")
-	String taskSkillIds;
-	
-	@ApiModelProperty(notes="是否外购",allowEmptyValue=true,example="",allowableValues="")
-	String taskOut;
-	
-	@ApiModelProperty(notes="计划类型w1-周,w2-2周,w3-3周,m1-1月,m2-2月,q1-季,q2-半年，y1-年",allowEmptyValue=true,example="",allowableValues="")
-	String planType;
-	
-	@ApiModelProperty(notes="任务结算方案-来自数字字典xmTaskSettleSchemel",allowEmptyValue=true,example="",allowableValues="")
-	String settleSchemel;
-	
-	@ApiModelProperty(notes="归属功能编号",allowEmptyValue=true,example="",allowableValues="")
-	String menuId;
-	
-	@ApiModelProperty(notes="归属功能名称",allowEmptyValue=true,example="",allowableValues="")
-	String menuName;
-
-	/**任务编号**/
-	public XmTaskTemplate(String id) {
-		this.id = id;
-	}
-    
-    /**xm_task_template**/
-	public XmTaskTemplate() {
-	}
-	
-	/**
-	 * 任务编号
-	 **/
-	public void setId(String id) {
-		this.id = id;
-	}
-	/**
-	 * 任务名称
-	 **/
-	public void setName(String name) {
-		this.name = name;
-	}
-	/**
-	 * 父任务编号
-	 **/
-	public void setParentTaskid(String parentTaskid) {
-		this.parentTaskid = parentTaskid;
-	}
-	/**
-	 * 父任务名称
-	 **/
-	public void setParentTaskname(String parentTaskname) {
-		this.parentTaskname = parentTaskname;
-	}
-	/**
-	 * 项目编号
-	 **/
-	public void setProjectId(String projectId) {
-		this.projectId = projectId;
-	}
-	/**
-	 * 项目名称
-	 **/
-	public void setProjectName(String projectName) {
-		this.projectName = projectName;
-	}
-	/**
-	 * 任务级别
-	 **/
-	public void setLevel(String level) {
-		this.level = level;
-	}
-	/**
-	 * 排序级别
-	 **/
-	public void setSortLevel(String sortLevel) {
-		this.sortLevel = sortLevel;
-	}
-	/**
-	 * 前置任务编号
-	 **/
-	public void setPreTaskid(String preTaskid) {
-		this.preTaskid = preTaskid;
-	}
-	/**
-	 * 前置任务名称
-	 **/
-	public void setPreTaskname(String preTaskname) {
-		this.preTaskname = preTaskname;
-	}
-	/**
-	 * 任务开始时间
-	 **/
-	public void setStartTime(Date startTime) {
-		this.startTime = startTime;
-	}
-	/**
-	 * 任务结束时间
-	 **/
-	public void setEndTime(Date endTime) {
-		this.endTime = endTime;
-	}
-	/**
-	 * 里程碑
-	 **/
-	public void setMilestone(String milestone) {
-		this.milestone = milestone;
-	}
-	/**
-	 * 任务描述
-	 **/
-	public void setDescription(String description) {
-		this.description = description;
-	}
-	/**
-	 * 备注
-	 **/
-	public void setRemarks(String remarks) {
-		this.remarks = remarks;
-	}
-	/**
-	 * 任务创建人编号
-	 **/
-	public void setCreateUserid(String createUserid) {
-		this.createUserid = createUserid;
-	}
-	/**
-	 * 任务创建人
-	 **/
-	public void setCreateUsername(String createUsername) {
-		this.createUsername = createUsername;
-	}
-	/**
-	 * 创建时间
-	 **/
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-	/**
-	 * 任务进度0-100
-	 **/
-	public void setRate(BigDecimal rate) {
-		this.rate = rate;
-	}
-	/**
-	 * 当前任务预算金额（包括所有成本，不包括下一级）
-	 **/
-	public void setBudgetCost(BigDecimal budgetCost) {
-		this.budgetCost = budgetCost;
-	}
-	/**
-	 * 预算工时（不包括下一级）
-	 **/
-	public void setBudgetWorkload(BigDecimal budgetWorkload) {
-		this.budgetWorkload = budgetWorkload;
-	}
-	/**
-	 * 任务状态0待领取1已领取执行中2已完工3已结算
-	 **/
-	public void setTaskState(String taskState) {
-		this.taskState = taskState;
-	}
-	/**
-	 * 0售前方案1投标2需求3设计4开发5测试6验收7部署8运维--来自基础数据表taskType
-	 **/
-	public void setTaskType(String taskType) {
-		this.taskType = taskType;
-	}
-	/**
-	 * 1需结算0不需结算
-	 **/
-	public void setTaskClass(String taskClass) {
-		this.taskClass = taskClass;
-	}
-	/**
-	 * 是否发布到任务大厅0否1是
-	 **/
-	public void setToTaskCenter(String toTaskCenter) {
-		this.toTaskCenter = toTaskCenter;
-	}
-	/**
-	 * 项目阶段编号
-	 **/
-	public void setProjectPhaseId(String projectPhaseId) {
-		this.projectPhaseId = projectPhaseId;
-	}
-	/**
-	 * 项目阶段名称
-	 **/
-	public void setProjectPhaseName(String projectPhaseName) {
-		this.projectPhaseName = projectPhaseName;
-	}
-	/**
-	 * 技能列表,逗号分隔
-	 **/
-	public void setTaskSkillNames(String taskSkillNames) {
-		this.taskSkillNames = taskSkillNames;
-	}
-	/**
-	 * 技能编号列表逗号分隔
-	 **/
-	public void setTaskSkillIds(String taskSkillIds) {
-		this.taskSkillIds = taskSkillIds;
-	}
-	/**
-	 * 是否外购
-	 **/
-	public void setTaskOut(String taskOut) {
-		this.taskOut = taskOut;
-	}
-	/**
-	 * 计划类型w1-周,w2-2周,w3-3周,m1-1月,m2-2月,q1-季,q2-半年，y1-年
-	 **/
-	public void setPlanType(String planType) {
-		this.planType = planType;
-	}
-	/**
-	 * 任务结算方案-来自数字字典xmTaskSettleSchemel
-	 **/
-	public void setSettleSchemel(String settleSchemel) {
-		this.settleSchemel = settleSchemel;
-	}
-	/**
-	 * 归属功能编号
-	 **/
-	public void setMenuId(String menuId) {
-		this.menuId = menuId;
-	}
-	/**
-	 * 归属功能名称
-	 **/
-	public void setMenuName(String menuName) {
-		this.menuName = menuName;
-	}
-	
-	/**
-	 * 任务编号
-	 **/
-	public String getId() {
-		return this.id;
-	}
-	/**
-	 * 任务名称
-	 **/
-	public String getName() {
-		return this.name;
-	}
-	/**
-	 * 父任务编号
-	 **/
-	public String getParentTaskid() {
-		return this.parentTaskid;
-	}
-	/**
-	 * 父任务名称
-	 **/
-	public String getParentTaskname() {
-		return this.parentTaskname;
-	}
-	/**
-	 * 项目编号
-	 **/
-	public String getProjectId() {
-		return this.projectId;
-	}
-	/**
-	 * 项目名称
-	 **/
-	public String getProjectName() {
-		return this.projectName;
-	}
-	/**
-	 * 任务级别
-	 **/
-	public String getLevel() {
-		return this.level;
-	}
-	/**
-	 * 排序级别
-	 **/
-	public String getSortLevel() {
-		return this.sortLevel;
-	}
-	/**
-	 * 前置任务编号
-	 **/
-	public String getPreTaskid() {
-		return this.preTaskid;
-	}
-	/**
-	 * 前置任务名称
-	 **/
-	public String getPreTaskname() {
-		return this.preTaskname;
-	}
-	/**
-	 * 任务开始时间
-	 **/
-	public Date getStartTime() {
-		return this.startTime;
-	}
-	/**
-	 * 任务结束时间
-	 **/
-	public Date getEndTime() {
-		return this.endTime;
-	}
-	/**
-	 * 里程碑
-	 **/
-	public String getMilestone() {
-		return this.milestone;
-	}
-	/**
-	 * 任务描述
-	 **/
-	public String getDescription() {
-		return this.description;
-	}
-	/**
-	 * 备注
-	 **/
-	public String getRemarks() {
-		return this.remarks;
-	}
-	/**
-	 * 任务创建人编号
-	 **/
-	public String getCreateUserid() {
-		return this.createUserid;
-	}
-	/**
-	 * 任务创建人
-	 **/
-	public String getCreateUsername() {
-		return this.createUsername;
-	}
-	/**
-	 * 创建时间
-	 **/
-	public Date getCreateTime() {
-		return this.createTime;
-	}
-	/**
-	 * 任务进度0-100
-	 **/
-	public BigDecimal getRate() {
-		return this.rate;
-	}
-	/**
-	 * 当前任务预算金额（包括所有成本，不包括下一级）
-	 **/
-	public BigDecimal getBudgetCost() {
-		return this.budgetCost;
-	}
-	/**
-	 * 预算工时（不包括下一级）
-	 **/
-	public BigDecimal getBudgetWorkload() {
-		return this.budgetWorkload;
-	}
-	/**
-	 * 任务状态0待领取1已领取执行中2已完工3已结算
-	 **/
-	public String getTaskState() {
-		return this.taskState;
-	}
-	/**
-	 * 0售前方案1投标2需求3设计4开发5测试6验收7部署8运维--来自基础数据表taskType
-	 **/
-	public String getTaskType() {
-		return this.taskType;
-	}
-	/**
-	 * 1需结算0不需结算
-	 **/
-	public String getTaskClass() {
-		return this.taskClass;
-	}
-	/**
-	 * 是否发布到任务大厅0否1是
-	 **/
-	public String getToTaskCenter() {
-		return this.toTaskCenter;
-	}
-	/**
-	 * 项目阶段编号
-	 **/
-	public String getProjectPhaseId() {
-		return this.projectPhaseId;
-	}
-	/**
-	 * 项目阶段名称
-	 **/
-	public String getProjectPhaseName() {
-		return this.projectPhaseName;
-	}
-	/**
-	 * 技能列表,逗号分隔
-	 **/
-	public String getTaskSkillNames() {
-		return this.taskSkillNames;
-	}
-	/**
-	 * 技能编号列表逗号分隔
-	 **/
-	public String getTaskSkillIds() {
-		return this.taskSkillIds;
-	}
-	/**
-	 * 是否外购
-	 **/
-	public String getTaskOut() {
-		return this.taskOut;
-	}
-	/**
-	 * 计划类型w1-周,w2-2周,w3-3周,m1-1月,m2-2月,q1-季,q2-半年，y1-年
-	 **/
-	public String getPlanType() {
-		return this.planType;
-	}
-	/**
-	 * 任务结算方案-来自数字字典xmTaskSettleSchemel
-	 **/
-	public String getSettleSchemel() {
-		return this.settleSchemel;
-	}
-	/**
-	 * 归属功能编号
-	 **/
-	public String getMenuId() {
-		return this.menuId;
-	}
-	/**
-	 * 归属功能名称
-	 **/
-	public String getMenuName() {
-		return this.menuName;
-	}
-
-}

xm-core/src/main/java/com/xm/core/service/XmMenuTemplateService.java

@@ -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>
- * 实体 XmMenuTemplate 表 XM.xm_menu_template 当前主键(包括多主键): menu_id; 
- ***/
-@Service("xm.core.xmMenuTemplateService")
-public class XmMenuTemplateService extends BaseService {
-	
-	/** 请在此类添加自定义函数 */
-
-}
-

xm-core/src/main/java/com/xm/core/service/XmProductTemplateService.java

@@ -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>
- * 实体 XmProductTemplate 表 XM.xm_product_template 当前主键(包括多主键): id; 
- ***/
-@Service("xm.core.xmProductTemplateService")
-public class XmProductTemplateService extends BaseService {
-	
-	/** 请在此类添加自定义函数 */
-
-}
-

xm-core/src/main/java/com/xm/core/service/XmProjectPhaseTemplateService.java

@@ -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>
- * 实体 XmProjectPhaseTemplate 表 XM.xm_project_phase_template 当前主键(包括多主键): id; 
- ***/
-@Service("xm.core.xmProjectPhaseTemplateService")
-public class XmProjectPhaseTemplateService extends BaseService {
-	
-	/** 请在此类添加自定义函数 */
-
-}
-

xm-core/src/main/java/com/xm/core/service/XmProjectTemplateService.java

@@ -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>
- * 实体 XmProjectTemplate 表 XM.xm_project_template 当前主键(包括多主键): id; 
- ***/
-@Service("xm.core.xmProjectTemplateService")
-public class XmProjectTemplateService extends BaseService {
-	
-	/** 请在此类添加自定义函数 */
-
-}
-

xm-core/src/main/java/com/xm/core/service/XmTaskTemplateService.java

@@ -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>
- * 实体 XmTaskTemplate 表 XM.xm_task_template 当前主键(包括多主键): id; 
- ***/
-@Service("xm.core.xmTaskTemplateService")
-public class XmTaskTemplateService extends BaseService {
-	
-	/** 请在此类添加自定义函数 */
-
-}
-

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml

@@ -11,82 +11,10 @@
                  ( #{item})
              </foreach>
          </if>
-		<if test=" pidPathsList != null">  and
-			<foreach collection="pidPathsList" item="item" index="index" open="(" separator=" or " close=")" >
-				 #{item} like concat(res.pid_paths,'%')
-			</foreach>
-		</if>
-		<if test=" tagIdList != null"> and
-			<foreach collection="tagIdList" item="item" index="index" open="(" separator=" or " close=")" >
-				find_in_set(#{item},res.tag_ids)
-			</foreach>
-		</if>
-		<if test=' iterationFilterType!=null and iterationFilterType!=""'>
-			and <if test='iterationFilterType=="not-join"'> not  </if>
-			exists ( select 1 from xm_iteration_menu im where im.menu_id=res.menu_id)
-		</if>
-		<if test=' taskFilterType!=null and taskFilterType!="" '>
-			and <if test='taskFilterType=="not-join"'> not  </if>
-			exists ( select 1 from xm_task t where  t.menu_id=res.menu_id)
-		</if>
-		<if test="key != null and key !='' ">  and res.menu_name like #{key}     </if>
-		<if test="isTop!=null and isTop!=''">  and (res.pmenu_id is null or res.pmenu_id = '')</if>
+        <if test="key != null and key !='' ">       </if>
     </sql>
 
-	<select id="selectExistIterationMenus" parameterType="HashMap" resultType="com.xm.core.entity.XmMenu">
-		select  * from xm_menu res
-		where exists (select 1 from xm_iteration_menu im where im.menu_id  in
-		<foreach collection="menuIds" item="item" index="index" open="(" separator="," close=")" >
-			#{item}
-		</foreach>
-		and im.menu_id = res.menu_id )
-	</select>
-	<select id="queryTaskUsersByMenuId" parameterType="HashMap" resultType="HashMap">
-		select distinct te.userid,te.username,t.executor_userid, t.executor_username from xm_task_execuser te inner join xm_task t on t.id=te.task_id
-		where t.menu_id=#{menuId} and te.status !='8' and te.status !='7'
-	</select>
-	<select id="selectListMapByWhereWithState" parameterType="HashMap" resultType="HashMap">
-		select res.*,s.* from xm_menu res left join xm_menu_state s on res.menu_id=s.menu_id
-		<where>
-			<include refid="whereForMap"/>
-			<include refid="where"/>
-		</where>
-		order by res.seq_no asc
-	</select>
-	<select id="selectListMapByWhereWithPlan" parameterType="HashMap" resultType="HashMap">
-		select res.*,plan.* from xm_menu res left join xm_menu_plan plan on res.menu_id=plan.menu_id and plan.project_id=#{projectId}
-		<where>
-			<include refid="whereForMap"/>
-			<include refid="where"/>
-		</where>
-
-		order by res.seq_no asc
-	</select>
-
-	<update id="updateMenuChildrenCntByMenuId" parameterType="String">
-		UPDATE xm_menu t
-		LEFT JOIN ( SELECT count( 1 ) AS children_cnt, tt.pmenu_id AS menu_id FROM xm_menu tt WHERE tt.pmenu_id = #{menuId} ) t2 ON t2.menu_id = t.menu_id
-		SET t.children_cnt = ifnull( t2.children_cnt, 0 )
-		WHERE
-		t.menu_id = #{menuId}
-	</update>
-
 
-
-	<update id="updateChildrenCntByIds" parameterType="List">
-		UPDATE xm_menu t
-		LEFT JOIN ( SELECT count( 1 ) AS children_cnt, tt.pmenu_id AS menu_id FROM xm_menu tt  WHERE
-		(tt.pmenu_id) in
-		<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
-			( #{item})
-		</foreach>
-		group by tt.pmenu_id ) t2 ON t2.menu_id = t.menu_id
-		SET t.children_cnt = ifnull( t2.children_cnt, 0 )
-		WHERE  (t.menu_id) in
-		<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
-			( #{item})
-		</foreach>
-	</update>
 	<!--结束 自定义sql函数区域-->
 	
 
@@ -133,7 +61,7 @@
 		insert into xm_menu(
 			<include refid="columns"/>
 		) values (
-		#{menuId},#{menuName},#{pmenuId},#{productId},#{remark},#{status},#{online},#{demandUrl},#{codeUrl},#{designUrl},#{docUrl},#{helpUrl},#{operDocUrl},#{seqNo},#{mmUserid},#{mmUsername},#{ctime},#{ntype},#{sinceVersion},#{childrenCnt},#{ltime},#{tagIds},#{tagNames},#{pidPaths},#{lvl}
+		#{menuId},#{menuName},#{pmenuId},#{productId},#{remark},#{status},#{online},#{demandUrl},#{codeUrl},#{designUrl},#{docUrl},#{helpUrl},#{operDocUrl},#{seqNo},#{mmUserid},#{mmUsername},#{ctime},#{ntype},#{sinceVersion},#{childrenCnt},#{ltime},#{tagIds},#{tagNames},#{pidPaths},#{lvl},#{isTpl}
 		)
 	</insert>
 	
@@ -196,7 +124,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		menu_id,menu_name,pmenu_id,product_id,remark,status,online,demand_url,code_url,design_url,doc_url,help_url,oper_doc_url,seq_no,mm_userid,mm_username,ctime,ntype,since_version,children_cnt,ltime,tag_ids,tag_names,pid_paths,lvl
+		menu_id,menu_name,pmenu_id,product_id,remark,status,online,demand_url,code_url,design_url,doc_url,help_url,oper_doc_url,seq_no,mm_userid,mm_username,ctime,ntype,since_version,children_cnt,ltime,tag_ids,tag_names,pid_paths,lvl,is_tpl
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -226,6 +154,7 @@
 		<if test="tagNames != null and tagNames != ''">      and res.tag_names = #{tagNames}     </if>
 		<if test="pidPaths != null and pidPaths != ''">      and res.pid_paths = #{pidPaths}     </if>
 		<if test="lvl != null and lvl != ''">      and res.lvl = #{lvl}     </if>
+		<if test="isTpl != null and isTpl != ''">      and res.is_tpl = #{isTpl}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -252,7 +181,8 @@
 		tag_ids = #{tagIds},
 		tag_names = #{tagNames},
 		pid_paths = #{pidPaths},
-		lvl = #{lvl}
+		lvl = #{lvl},
+		is_tpl = #{isTpl}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="menuName != null and menuName != ''"> menu_name = #{menuName},     </if>
@@ -279,6 +209,7 @@
 		<if test="tagNames != null and tagNames != ''"> tag_names = #{tagNames},     </if>
 		<if test="pidPaths != null and pidPaths != ''"> pid_paths = #{pidPaths},     </if>
 		<if test="lvl != null and lvl != ''"> lvl = #{lvl},     </if>
+		<if test="isTpl != null and isTpl != ''"> is_tpl = #{isTpl},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -305,6 +236,7 @@
 			tag_ids = #{item.tagIds},
 			tag_names = #{item.tagNames},
 			pid_paths = #{item.pidPaths},
-			lvl = #{item.lvl}
+			lvl = #{item.lvl},
+			is_tpl = #{item.isTpl}
 	</sql>
 </mapper>

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuTemplateMapper.xml

@@ -1,192 +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.XmMenuTemplate">
-	
-	
-	<!--开始 自定sql函数区域 -->
-		<!--请在此区域添加自定义函数-->
-		
-		
-		
-	<!--结束 自定义sql函数区域-->
-	
-
-	
-	<!-- 通过条件查询获取数据列表 返回list<map> -->
-	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
-		select * from xm_menu_template res
-		<where> 
-			<if test="ids != null">  and     
-				menu_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.XmMenuTemplate" resultType="com.xm.core.entity.XmMenuTemplate">
-		select * from xm_menu_template res
-		<where>
-			<include refid="where"/>
-		</where>
-	</select>
-	
-		<!-- 通过主键查询获取数据对象 返回object -->
-	<select id="selectOneObject" parameterType="com.xm.core.entity.XmMenuTemplate" resultType="com.xm.core.entity.XmMenuTemplate">
-		select * from xm_menu_template res
-		where 
-			res.menu_id = #{menuId}
-	</select>
-	
-	<!-- 通过主键查询获取数据对象 返回map-->
-	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
-		select * from xm_menu_template res
-		where 
-			 res.menu_id = #{menuId}
-	</select>
-	<!-- 获取数据条目 返回long -->
-	<select id="countByWhere" parameterType="com.xm.core.entity.XmMenuTemplate" resultType="long">
-		select count(1) from xm_menu_template res
-		<where>
-			<include refid="where"/>
-		</where>
-	</select>
-	<!-- 新增一条记录  主键menu_id,-->
-	<insert id="insert" parameterType="com.xm.core.entity.XmMenuTemplate" useGeneratedKeys="false" keyProperty="menu_id">
-		insert into xm_menu_template(
-			<include refid="columns"/>
-		) values (
-		#{menuId},#{menuName},#{pmenuId},#{productId},#{remark},#{status},#{online},#{demandUrl},#{codeUrl},#{designUrl},#{docUrl},#{helpUrl},#{operDocUrl},#{seqNo}
-		)
-	</insert>
-	
-	<!-- 按条件删除若干条记录-->
-	<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmMenuTemplate">
-		delete from xm_menu_template res
-		<where>  
-			<include refid="where"/>
-		</where>
-	</delete>
-	
-	<!-- 按主键删除一条记录-->
-	<delete id="deleteByPk" parameterType="com.xm.core.entity.XmMenuTemplate">
-		delete from xm_menu_template
-		where menu_id = #{menuId} 
-	</delete>
-	
-	<!-- 根据条件修改若干条记录 -->
-	<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmMenuTemplate">
-		update  xm_menu_template
-		<set>
-			<include refid="someFieldSet"/>
-		</set>
-		where menu_id = #{menuId} 
-	</update>
-	
-		<!-- 根据主键修改一条记录 -->
-	<update id="updateByPk" parameterType="com.xm.core.entity.XmMenuTemplate">
-		update  xm_menu_template
-		<set>
-			<include refid="set"/>
-		</set>
-		where menu_id = #{menuId} 
-	</update>
-
-	<!-- 批量新增  批量插入 借用insert 循环插入实现
-	<insert id="batchInsert" parameterType="List">
- 	</insert>
- 	-->
- 	
-	<!-- 批量更新 -->
-	<update id="batchUpdate" parameterType="List">   
-		<foreach collection="list" item="item" index="index" separator=";" >
-   		update  xm_menu_template
-		set 
-			<include refid="batchSet"/>
-			where menu_id = #{item.menuId}  
-		</foreach> 
-	</update>
-	<!-- 批量删除 -->
-	<delete id="batchDelete" parameterType="List">  
-		delete from xm_menu_template
-			where menu_id in
-			    <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >  
-			        #{item.menuId }  
-			    </foreach>  
-	</delete>
-	
-	
-	<!--sql片段 列-->
-	<sql id="columns">
-		menu_id,menu_name,pmenu_id,product_id,remark,status,online,demand_url,code_url,design_url,doc_url,help_url,oper_doc_url,seq_no
-	</sql>
-	
-	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
-	<sql id="where">
-		<if test="menuId != null and menuId != ''">      and res.menu_id = #{menuId}     </if>
-		<if test="menuName != null and menuName != ''">      and res.menu_name = #{menuName}     </if>
-		<if test="pmenuId != null and pmenuId != ''">      and res.pmenu_id = #{pmenuId}     </if>
-		<if test="productId != null and productId != ''">      and res.product_id = #{productId}     </if>
-		<if test="remark != null and remark != ''">      and res.remark = #{remark}     </if>
-		<if test="status != null and status != ''">      and res.status = #{status}     </if>
-		<if test="online != null and online != ''">      and res.online = #{online}     </if>
-		<if test="demandUrl != null and demandUrl != ''">      and res.demand_url = #{demandUrl}     </if>
-		<if test="codeUrl != null and codeUrl != ''">      and res.code_url = #{codeUrl}     </if>
-		<if test="designUrl != null and designUrl != ''">      and res.design_url = #{designUrl}     </if>
-		<if test="docUrl != null and docUrl != ''">      and res.doc_url = #{docUrl}     </if>
-		<if test="helpUrl != null and helpUrl != ''">      and res.help_url = #{helpUrl}     </if>
-		<if test="operDocUrl != null and operDocUrl != ''">      and res.oper_doc_url = #{operDocUrl}     </if>
-		<if test="seqNo != null and seqNo != ''">      and res.seq_no = #{seqNo}     </if>
-	</sql>
-	<!--sql片段 更新字段 -->
-	<sql id="set">
-		menu_name = #{menuName},
-		pmenu_id = #{pmenuId},
-		product_id = #{productId},
-		remark = #{remark},
-		status = #{status},
-		online = #{online},
-		demand_url = #{demandUrl},
-		code_url = #{codeUrl},
-		design_url = #{designUrl},
-		doc_url = #{docUrl},
-		help_url = #{helpUrl},
-		oper_doc_url = #{operDocUrl},
-		seq_no = #{seqNo}
-	</sql>
-	<sql id="someFieldSet">
-		<if test="menuName != null and menuName != ''"> menu_name = #{menuName},     </if>
-		<if test="pmenuId != null and pmenuId != ''"> pmenu_id = #{pmenuId},     </if>
-		<if test="productId != null and productId != ''"> product_id = #{productId},     </if>
-		<if test="remark != null and remark != ''"> remark = #{remark},     </if>
-		<if test="status != null and status != ''"> status = #{status},     </if>
-		<if test="online != null and online != ''"> online = #{online},     </if>
-		<if test="demandUrl != null and demandUrl != ''"> demand_url = #{demandUrl},     </if>
-		<if test="codeUrl != null and codeUrl != ''"> code_url = #{codeUrl},     </if>
-		<if test="designUrl != null and designUrl != ''"> design_url = #{designUrl},     </if>
-		<if test="docUrl != null and docUrl != ''"> doc_url = #{docUrl},     </if>
-		<if test="helpUrl != null and helpUrl != ''"> help_url = #{helpUrl},     </if>
-		<if test="operDocUrl != null and operDocUrl != ''"> oper_doc_url = #{operDocUrl},     </if>
-		<if test="seqNo != null and seqNo != ''"> seq_no = #{seqNo},     </if>
-	</sql>
-	<!--sql片段 批量更新 -->
-	<sql id="batchSet">
-			menu_name = #{item.menuName},
-			pmenu_id = #{item.pmenuId},
-			product_id = #{item.productId},
-			remark = #{item.remark},
-			status = #{item.status},
-			online = #{item.online},
-			demand_url = #{item.demandUrl},
-			code_url = #{item.codeUrl},
-			design_url = #{item.designUrl},
-			doc_url = #{item.docUrl},
-			help_url = #{item.helpUrl},
-			oper_doc_url = #{item.operDocUrl},
-			seq_no = #{item.seqNo}
-	</sql>
-</mapper>

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml

@@ -99,15 +99,15 @@
 		insert into xm_product(
 			<include refid="columns"/>
 		) values (
-		#{id},#{productName},#{branchId},#{remark},#{version},#{pmUserid},#{pmUsername},#{ctime},#{deptid}
+		#{id},#{productName},#{branchId},#{remark},#{version},#{pmUserid},#{pmUsername},#{ctime},#{deptid},#{pstatus},#{startTime},#{endTime},#{deptName},#{admUserid},#{admUsername},#{assistantUserid},#{assistantUsername},#{bizProcInstId},#{bizFlowState},#{isTpl},#{baselineId},#{baseTime}
 		)
 	</insert>
 	
 	<!-- 按条件删除若干条记录-->
 	<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmProduct">
-		delete from xm_product
+		delete from xm_product res
 		<where>  
-			1=2
+			<include refid="where"/>
 		</where>
 	</delete>
 	
@@ -153,18 +153,16 @@
 	<delete id="batchDelete" parameterType="List">  
 		delete from xm_product 
 			where
-			(id)
-			    in
+			(id) in
                 <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
-                    ( #{item.id}
-                    )
+                    (  #{item.id} )
                 </foreach>
 	</delete>
 	
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		id,product_name,branch_id,remark,version,pm_userid,pm_username,ctime,deptid
+		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
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -178,6 +176,19 @@
 		<if test="pmUsername != null and pmUsername != ''">      and res.pm_username = #{pmUsername}     </if>
 		<if test="ctime != null">      and date_format(res.ctime,'%Y-%m-%d') = date_format(#{ctime},'%Y-%m-%d')     </if>
 		<if test="deptid != null and deptid != ''">      and res.deptid = #{deptid}     </if>
+		<if test="pstatus != null and pstatus != ''">      and res.pstatus = #{pstatus}     </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="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="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>
+		<if test="baselineId != null and baselineId != ''">      and res.baseline_id = #{baselineId}     </if>
+		<if test="baseTime != null">      and date_format(res.base_time,'%Y-%m-%d') = date_format(#{baseTime},'%Y-%m-%d')     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -188,7 +199,20 @@
 		pm_userid = #{pmUserid},
 		pm_username = #{pmUsername},
 		ctime = #{ctime},
-		deptid = #{deptid}
+		deptid = #{deptid},
+		pstatus = #{pstatus},
+		start_time = #{startTime},
+		end_time = #{endTime},
+		dept_name = #{deptName},
+		adm_userid = #{admUserid},
+		adm_username = #{admUsername},
+		assistant_userid = #{assistantUserid},
+		assistant_username = #{assistantUsername},
+		biz_proc_inst_id = #{bizProcInstId},
+		biz_flow_state = #{bizFlowState},
+		is_tpl = #{isTpl},
+		baseline_id = #{baselineId},
+		base_time = #{baseTime}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="productName != null and productName != ''"> product_name = #{productName},     </if>
@@ -199,6 +223,19 @@
 		<if test="pmUsername != null and pmUsername != ''"> pm_username = #{pmUsername},     </if>
 		<if test="ctime != null"> ctime = #{ctime},     </if>
 		<if test="deptid != null and deptid != ''"> deptid = #{deptid},     </if>
+		<if test="pstatus != null and pstatus != ''"> pstatus = #{pstatus},     </if>
+		<if test="startTime != null"> start_time = #{startTime},     </if>
+		<if test="endTime != null"> end_time = #{endTime},     </if>
+		<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="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>
+		<if test="baselineId != null and baselineId != ''"> baseline_id = #{baselineId},     </if>
+		<if test="baseTime != null"> base_time = #{baseTime},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -209,6 +246,19 @@
 			pm_userid = #{item.pmUserid},
 			pm_username = #{item.pmUsername},
 			ctime = #{item.ctime},
-			deptid = #{item.deptid}
+			deptid = #{item.deptid},
+			pstatus = #{item.pstatus},
+			start_time = #{item.startTime},
+			end_time = #{item.endTime},
+			dept_name = #{item.deptName},
+			adm_userid = #{item.admUserid},
+			adm_username = #{item.admUsername},
+			assistant_userid = #{item.assistantUserid},
+			assistant_username = #{item.assistantUsername},
+			biz_proc_inst_id = #{item.bizProcInstId},
+			biz_flow_state = #{item.bizFlowState},
+			is_tpl = #{item.isTpl},
+			baseline_id = #{item.baselineId},
+			base_time = #{item.baseTime}
 	</sql>
 </mapper>

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductTemplateMapper.xml

@@ -1,180 +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.XmProductTemplate">
-	
-	
-	<!--开始 自定sql函数区域 -->
-		<!--请在此区域添加自定义函数-->
-		
-		
-		
-	<!--结束 自定义sql函数区域-->
-	
-
-	
-	<!-- 通过条件查询获取数据列表 返回list<map> -->
-	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
-		select * from xm_product_template 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.XmProductTemplate" resultType="com.xm.core.entity.XmProductTemplate">
-		select * from xm_product_template res
-		<where>
-			<include refid="where"/>
-		</where>
-	</select>
-	
-		<!-- 通过主键查询获取数据对象 返回object -->
-	<select id="selectOneObject" parameterType="com.xm.core.entity.XmProductTemplate" resultType="com.xm.core.entity.XmProductTemplate">
-		select * from xm_product_template res
-		where 
-			res.id = #{id}
-	</select>
-	
-	<!-- 通过主键查询获取数据对象 返回map-->
-	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
-		select * from xm_product_template res
-		where 
-			 res.id = #{id}
-	</select>
-	<!-- 获取数据条目 返回long -->
-	<select id="countByWhere" parameterType="com.xm.core.entity.XmProductTemplate" resultType="long">
-		select count(1) from xm_product_template res
-		<where>
-			<include refid="where"/>
-		</where>
-	</select>
-	<!-- 新增一条记录  主键id,-->
-	<insert id="insert" parameterType="com.xm.core.entity.XmProductTemplate" useGeneratedKeys="false" keyProperty="id">
-		insert into xm_product_template(
-			<include refid="columns"/>
-		) values (
-		#{id},#{productName},#{branchId},#{remark},#{templateId},#{tcuserid},#{tcusername},#{tremark},#{tctime},#{tcbranchId},#{shareScope}
-		)
-	</insert>
-	
-	<!-- 按条件删除若干条记录-->
-	<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmProductTemplate">
-		delete from xm_product_template res
-		<where>  
-			<include refid="where"/>
-		</where>
-	</delete>
-	
-	<!-- 按主键删除一条记录-->
-	<delete id="deleteByPk" parameterType="com.xm.core.entity.XmProductTemplate">
-		delete from xm_product_template
-		where id = #{id} 
-	</delete>
-	
-	<!-- 根据条件修改若干条记录 -->
-	<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProductTemplate">
-		update  xm_product_template
-		<set>
-			<include refid="someFieldSet"/>
-		</set>
-		where id = #{id} 
-	</update>
-	
-		<!-- 根据主键修改一条记录 -->
-	<update id="updateByPk" parameterType="com.xm.core.entity.XmProductTemplate">
-		update  xm_product_template
-		<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_product_template
-		set 
-			<include refid="batchSet"/>
-			where id = #{item.id}  
-		</foreach> 
-	</update>
-	<!-- 批量删除 -->
-	<delete id="batchDelete" parameterType="List">  
-		delete from xm_product_template
-			where id in
-			    <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >  
-			        #{item.id }  
-			    </foreach>  
-	</delete>
-	
-	
-	<!--sql片段 列-->
-	<sql id="columns">
-		id,product_name,branch_id,remark,template_id,tcuserid,tcusername,tremark,tctime,tcbranch_id,share_scope
-	</sql>
-	
-	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
-	<sql id="where">
-		<if test="id != null and id != ''">      and res.id = #{id}     </if>
-		<if test="productName != null and productName != ''">      and res.product_name = #{productName}     </if>
-		<if test="branchId != null and branchId != ''">      and res.branch_id = #{branchId}     </if>
-		<if test="remark != null and remark != ''">      and res.remark = #{remark}     </if>
-		<if test="templateId != null and templateId != ''">      and res.template_id = #{templateId}     </if>
-		<if test="tcuserid != null and tcuserid != ''">      and res.tcuserid = #{tcuserid}     </if>
-		<if test="tcusername != null and tcusername != ''">      and res.tcusername = #{tcusername}     </if>
-		<if test="tremark != null and tremark != ''">      and res.tremark = #{tremark}     </if>
-		<if test="tctime != null">      and TO_CHAR(res.tctime,'YYYY-MM-DD') = TO_CHAR(#{tctime},'YYYY-MM-DD')     </if>
-		<if test="tcbranchId != null and tcbranchId != ''">      and res.tcbranch_id = #{tcbranchId}     </if>
-		<if test="shareScope != null and shareScope != ''">      and res.share_scope = #{shareScope}     </if>
-	</sql>
-	<!--sql片段 更新字段 -->
-	<sql id="set">
-		product_name = #{productName},
-		branch_id = #{branchId},
-		remark = #{remark},
-		template_id = #{templateId},
-		tcuserid = #{tcuserid},
-		tcusername = #{tcusername},
-		tremark = #{tremark},
-		tctime = #{tctime},
-		tcbranch_id = #{tcbranchId},
-		share_scope = #{shareScope}
-	</sql>
-	<sql id="someFieldSet">
-		<if test="productName != null and productName != ''"> product_name = #{productName},     </if>
-		<if test="branchId != null and branchId != ''"> branch_id = #{branchId},     </if>
-		<if test="remark != null and remark != ''"> remark = #{remark},     </if>
-		<if test="templateId != null and templateId != ''"> template_id = #{templateId},     </if>
-		<if test="tcuserid != null and tcuserid != ''"> tcuserid = #{tcuserid},     </if>
-		<if test="tcusername != null and tcusername != ''"> tcusername = #{tcusername},     </if>
-		<if test="tremark != null and tremark != ''"> tremark = #{tremark},     </if>
-		<if test="tctime != null"> tctime = #{tctime},     </if>
-		<if test="tcbranchId != null and tcbranchId != ''"> tcbranch_id = #{tcbranchId},     </if>
-		<if test="shareScope != null and shareScope != ''"> share_scope = #{shareScope},     </if>
-	</sql>
-	<!--sql片段 批量更新 -->
-	<sql id="batchSet">
-			product_name = #{item.productName},
-			branch_id = #{item.branchId},
-			remark = #{item.remark},
-			template_id = #{item.templateId},
-			tcuserid = #{item.tcuserid},
-			tcusername = #{item.tcusername},
-			tremark = #{item.tremark},
-			tctime = #{item.tctime},
-			tcbranch_id = #{item.tcbranchId},
-			share_scope = #{item.shareScope}
-	</sql>
-</mapper>

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml

@@ -163,15 +163,15 @@
 		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}
+		#{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}
 		)
 	</insert>
 	
 	<!-- 按条件删除若干条记录-->
 	<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmProject">
-		delete from xm_project
+		delete from xm_project res
 		<where>  
-			1=2
+			<include refid="where"/>
 		</where>
 	</delete>
 	
@@ -217,18 +217,16 @@
 	<delete id="batchDelete" parameterType="List">  
 		delete from xm_project 
 			where
-			(id)
-			    in
+			(id) in
                 <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
-                    ( #{item.id}
-                    )
+                    (  #{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,show_out
+		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
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -275,6 +273,7 @@
 		<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="showOut != null and showOut != ''">      and res.show_out = #{showOut}     </if>
+		<if test="isTpl != null and isTpl != ''">      and res.is_tpl = #{isTpl}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -318,7 +317,8 @@
 		from_tpl_id = #{fromTplId},
 		budget_ctrl = #{budgetCtrl},
 		deptid = #{deptid},
-		show_out = #{showOut}
+		show_out = #{showOut},
+		is_tpl = #{isTpl}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="code != null and code != ''"> code = #{code},     </if>
@@ -362,6 +362,7 @@
 		<if test="budgetCtrl != null and budgetCtrl != ''"> budget_ctrl = #{budgetCtrl},     </if>
 		<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>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -405,6 +406,7 @@
 			from_tpl_id = #{item.fromTplId},
 			budget_ctrl = #{item.budgetCtrl},
 			deptid = #{item.deptid},
-			show_out = #{item.showOut}
+			show_out = #{item.showOut},
+			is_tpl = #{item.isTpl}
 	</sql>
 </mapper>

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml

@@ -174,7 +174,7 @@
 		insert into xm_project_phase(
 			<include refid="columns"/>
 		) values (
-		#{id},#{phaseName},#{remark},#{parentPhaseId},#{branchId},#{projectId},#{beginDate},#{endDate},#{phaseBudgetHours},#{phaseBudgetStaffNu},#{ctime},#{phaseBudgetNouserAt},#{phaseBudgetInnerUserAt},#{phaseBudgetOutUserAt},#{projectBaselineId},#{bizProcInstId},#{bizFlowState},#{phaseBudgetWorkload},#{phaseActWorkload},#{phaseActInnerUserWorkload},#{phaseActOutUserWorkload},#{taskType},#{planType},#{seqNo},#{phaseBudgetInnerUserWorkload},#{phaseBudgetOutUserWorkload},#{actNouserAt},#{actInnerUserAt},#{phaseBudgetInnerUserPrice},#{phaseBudgetOutUserPrice},#{phaseBudgetOutUserCnt},#{phaseBudgetInnerUserCnt},#{actRate},#{phaseStatus},#{actOutUserAt},#{taskCnt},#{finishTaskCnt},#{iterationCnt},#{calcTime},#{taskBudgetWorkload},#{taskBudgetAt},#{mngUserid},#{mngUsername},#{milestone},#{pleaf},#{tagIds},#{tagNames},#{ntype},#{childrenCnt},#{ltime},#{isKeyPath},#{pidPaths},#{lvl}
+		#{id},#{phaseName},#{remark},#{parentPhaseId},#{branchId},#{projectId},#{beginDate},#{endDate},#{phaseBudgetHours},#{phaseBudgetStaffNu},#{ctime},#{phaseBudgetNouserAt},#{phaseBudgetInnerUserAt},#{phaseBudgetOutUserAt},#{projectBaselineId},#{bizProcInstId},#{bizFlowState},#{phaseBudgetWorkload},#{phaseActWorkload},#{phaseActInnerUserWorkload},#{phaseActOutUserWorkload},#{taskType},#{planType},#{seqNo},#{phaseBudgetInnerUserWorkload},#{phaseBudgetOutUserWorkload},#{actNouserAt},#{actInnerUserAt},#{phaseBudgetInnerUserPrice},#{phaseBudgetOutUserPrice},#{phaseBudgetOutUserCnt},#{phaseBudgetInnerUserCnt},#{actRate},#{phaseStatus},#{actOutUserAt},#{taskCnt},#{finishTaskCnt},#{iterationCnt},#{calcTime},#{taskBudgetWorkload},#{taskBudgetAt},#{mngUserid},#{mngUsername},#{milestone},#{pleaf},#{tagIds},#{tagNames},#{ntype},#{childrenCnt},#{ltime},#{isKeyPath},#{pidPaths},#{lvl},#{isTpl}
 		)
 	</insert>
 	
@@ -237,7 +237,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		id,phase_name,remark,parent_phase_id,branch_id,project_id,begin_date,end_date,phase_budget_hours,phase_budget_staff_nu,ctime,phase_budget_nouser_at,phase_budget_inner_user_at,phase_budget_out_user_at,project_baseline_id,biz_proc_inst_id,biz_flow_state,phase_budget_workload,phase_act_workload,phase_act_inner_user_workload,phase_act_out_user_workload,task_type,plan_type,seq_no,phase_budget_inner_user_workload,phase_budget_out_user_workload,act_nouser_at,act_inner_user_at,phase_budget_inner_user_price,phase_budget_out_user_price,phase_budget_out_user_cnt,phase_budget_inner_user_cnt,act_rate,phase_status,act_out_user_at,task_cnt,finish_task_cnt,iteration_cnt,calc_time,task_budget_workload,task_budget_at,mng_userid,mng_username,milestone,pleaf,tag_ids,tag_names,ntype,children_cnt,ltime,is_key_path,pid_paths,lvl
+		id,phase_name,remark,parent_phase_id,branch_id,project_id,begin_date,end_date,phase_budget_hours,phase_budget_staff_nu,ctime,phase_budget_nouser_at,phase_budget_inner_user_at,phase_budget_out_user_at,project_baseline_id,biz_proc_inst_id,biz_flow_state,phase_budget_workload,phase_act_workload,phase_act_inner_user_workload,phase_act_out_user_workload,task_type,plan_type,seq_no,phase_budget_inner_user_workload,phase_budget_out_user_workload,act_nouser_at,act_inner_user_at,phase_budget_inner_user_price,phase_budget_out_user_price,phase_budget_out_user_cnt,phase_budget_inner_user_cnt,act_rate,phase_status,act_out_user_at,task_cnt,finish_task_cnt,iteration_cnt,calc_time,task_budget_workload,task_budget_at,mng_userid,mng_username,milestone,pleaf,tag_ids,tag_names,ntype,children_cnt,ltime,is_key_path,pid_paths,lvl,is_tpl
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -295,6 +295,7 @@
 		<if test="isKeyPath != null and isKeyPath != ''">      and res.is_key_path = #{isKeyPath}     </if>
 		<if test="pidPaths != null and pidPaths != ''">      and res.pid_paths = #{pidPaths}     </if>
 		<if test="lvl != null and lvl != ''">      and res.lvl = #{lvl}     </if>
+		<if test="isTpl != null and isTpl != ''">      and res.is_tpl = #{isTpl}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -349,7 +350,8 @@
 		ltime = #{ltime},
 		is_key_path = #{isKeyPath},
 		pid_paths = #{pidPaths},
-		lvl = #{lvl}
+		lvl = #{lvl},
+		is_tpl = #{isTpl}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="phaseName != null and phaseName != ''"> phase_name = #{phaseName},     </if>
@@ -404,6 +406,7 @@
 		<if test="isKeyPath != null and isKeyPath != ''"> is_key_path = #{isKeyPath},     </if>
 		<if test="pidPaths != null and pidPaths != ''"> pid_paths = #{pidPaths},     </if>
 		<if test="lvl != null and lvl != ''"> lvl = #{lvl},     </if>
+		<if test="isTpl != null and isTpl != ''"> is_tpl = #{isTpl},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -458,6 +461,7 @@
 			ltime = #{item.ltime},
 			is_key_path = #{item.isKeyPath},
 			pid_paths = #{item.pidPaths},
-			lvl = #{item.lvl}
+			lvl = #{item.lvl},
+			is_tpl = #{item.isTpl}
 	</sql>
 </mapper>

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseTemplateMapper.xml

@@ -1,232 +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.XmProjectPhaseTemplate">
-	
-	
-	<!--开始 自定sql函数区域 -->
-		<!--请在此区域添加自定义函数-->
-		
-		
-		
-	<!--结束 自定义sql函数区域-->
-	
-
-	
-	<!-- 通过条件查询获取数据列表 返回list<map> -->
-	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
-		select * from xm_project_phase_template 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.XmProjectPhaseTemplate" resultType="com.xm.core.entity.XmProjectPhaseTemplate">
-		select * from xm_project_phase_template res
-		<where>
-			<include refid="where"/>
-		</where>
-	</select>
-	
-		<!-- 通过主键查询获取数据对象 返回object -->
-	<select id="selectOneObject" parameterType="com.xm.core.entity.XmProjectPhaseTemplate" resultType="com.xm.core.entity.XmProjectPhaseTemplate">
-		select * from xm_project_phase_template res
-		where 
-			res.id = #{id}
-	</select>
-	
-	<!-- 通过主键查询获取数据对象 返回map-->
-	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
-		select * from xm_project_phase_template res
-		where 
-			 res.id = #{id}
-	</select>
-	<!-- 获取数据条目 返回long -->
-	<select id="countByWhere" parameterType="com.xm.core.entity.XmProjectPhaseTemplate" resultType="long">
-		select count(1) from xm_project_phase_template res
-		<where>
-			<include refid="where"/>
-		</where>
-	</select>
-	<!-- 新增一条记录  主键id,-->
-	<insert id="insert" parameterType="com.xm.core.entity.XmProjectPhaseTemplate" useGeneratedKeys="false" keyProperty="id">
-		insert into xm_project_phase_template(
-			<include refid="columns"/>
-		) values (
-		#{id},#{phaseName},#{remark},#{parentPhaseId},#{branchId},#{projectId},#{beginDate},#{endDate},#{phaseBudgetHours},#{phaseBudgetStaffNu},#{ctime},#{phaseBudgetNouserAt},#{phaseBudgetInnerUserAt},#{phaseBudgetOutUserAt},#{phaseBudgetWorkload},#{taskType},#{planType},#{seqNo},#{phaseBudgetInnerUserWorkload},#{phaseBudgetOutUserWorkload},#{phaseBudgetInnerUserPrice},#{phaseBudgetOutUserPrice},#{phaseBudgetOutUserCnt},#{phaseBudgetInnerUserCnt}
-		)
-	</insert>
-	
-	<!-- 按条件删除若干条记录-->
-	<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmProjectPhaseTemplate">
-		delete from xm_project_phase_template res
-		<where>  
-			<include refid="where"/>
-		</where>
-	</delete>
-	
-	<!-- 按主键删除一条记录-->
-	<delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectPhaseTemplate">
-		delete from xm_project_phase_template
-		where id = #{id} 
-	</delete>
-	
-	<!-- 根据条件修改若干条记录 -->
-	<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectPhaseTemplate">
-		update  xm_project_phase_template
-		<set>
-			<include refid="someFieldSet"/>
-		</set>
-		where id = #{id} 
-	</update>
-	
-		<!-- 根据主键修改一条记录 -->
-	<update id="updateByPk" parameterType="com.xm.core.entity.XmProjectPhaseTemplate">
-		update  xm_project_phase_template
-		<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_template
-		set 
-			<include refid="batchSet"/>
-			where id = #{item.id}  
-		</foreach> 
-	</update>
-	<!-- 批量删除 -->
-	<delete id="batchDelete" parameterType="List">  
-		delete from xm_project_phase_template
-			where id in
-			    <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >  
-			        #{item.id }  
-			    </foreach>  
-	</delete>
-	
-	
-	<!--sql片段 列-->
-	<sql id="columns">
-		id,phase_name,remark,parent_phase_id,branch_id,project_id,begin_date,end_date,phase_budget_hours,phase_budget_staff_nu,ctime,phase_budget_nouser_at,phase_budget_inner_user_at,phase_budget_out_user_at,phase_budget_workload,task_type,plan_type,seq_no,phase_budget_inner_user_workload,phase_budget_out_user_workload,phase_budget_inner_user_price,phase_budget_out_user_price,phase_budget_out_user_cnt,phase_budget_inner_user_cnt
-	</sql>
-	
-	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
-	<sql id="where">
-		<if test="id != null and id != ''">      and res.id = #{id}     </if>
-		<if test="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="phaseBudgetHours != null and phaseBudgetHours != ''">      and res.phase_budget_hours = #{phaseBudgetHours}     </if>
-		<if test="phaseBudgetStaffNu != null and phaseBudgetStaffNu != ''">      and res.phase_budget_staff_nu = #{phaseBudgetStaffNu}     </if>
-		<if test="ctime != null">      and TO_CHAR(res.ctime,'YYYY-MM-DD') = TO_CHAR(#{ctime},'YYYY-MM-DD')     </if>
-		<if test="phaseBudgetNouserAt != null and phaseBudgetNouserAt != ''">      and res.phase_budget_nouser_at = #{phaseBudgetNouserAt}     </if>
-		<if test="phaseBudgetInnerUserAt != null and phaseBudgetInnerUserAt != ''">      and res.phase_budget_inner_user_at = #{phaseBudgetInnerUserAt}     </if>
-		<if test="phaseBudgetOutUserAt != null and phaseBudgetOutUserAt != ''">      and res.phase_budget_out_user_at = #{phaseBudgetOutUserAt}     </if>
-		<if test="phaseBudgetWorkload != null and phaseBudgetWorkload != ''">      and res.phase_budget_workload = #{phaseBudgetWorkload}     </if>
-		<if test="taskType != null and taskType != ''">      and res.task_type = #{taskType}     </if>
-		<if test="planType != null and planType != ''">      and res.plan_type = #{planType}     </if>
-		<if test="seqNo != null and seqNo != ''">      and res.seq_no = #{seqNo}     </if>
-		<if test="phaseBudgetInnerUserWorkload != null and phaseBudgetInnerUserWorkload != ''">      and res.phase_budget_inner_user_workload = #{phaseBudgetInnerUserWorkload}     </if>
-		<if test="phaseBudgetOutUserWorkload != null and phaseBudgetOutUserWorkload != ''">      and res.phase_budget_out_user_workload = #{phaseBudgetOutUserWorkload}     </if>
-		<if test="phaseBudgetInnerUserPrice != null and phaseBudgetInnerUserPrice != ''">      and res.phase_budget_inner_user_price = #{phaseBudgetInnerUserPrice}     </if>
-		<if test="phaseBudgetOutUserPrice != null and phaseBudgetOutUserPrice != ''">      and res.phase_budget_out_user_price = #{phaseBudgetOutUserPrice}     </if>
-		<if test="phaseBudgetOutUserCnt != null and phaseBudgetOutUserCnt != ''">      and res.phase_budget_out_user_cnt = #{phaseBudgetOutUserCnt}     </if>
-		<if test="phaseBudgetInnerUserCnt != null and phaseBudgetInnerUserCnt != ''">      and res.phase_budget_inner_user_cnt = #{phaseBudgetInnerUserCnt}     </if>
-	</sql>
-	<!--sql片段 更新字段 -->
-	<sql id="set">
-		phase_name = #{phaseName},
-		remark = #{remark},
-		parent_phase_id = #{parentPhaseId},
-		branch_id = #{branchId},
-		project_id = #{projectId},
-		begin_date = #{beginDate},
-		end_date = #{endDate},
-		phase_budget_hours = #{phaseBudgetHours},
-		phase_budget_staff_nu = #{phaseBudgetStaffNu},
-		ctime = #{ctime},
-		phase_budget_nouser_at = #{phaseBudgetNouserAt},
-		phase_budget_inner_user_at = #{phaseBudgetInnerUserAt},
-		phase_budget_out_user_at = #{phaseBudgetOutUserAt},
-		phase_budget_workload = #{phaseBudgetWorkload},
-		task_type = #{taskType},
-		plan_type = #{planType},
-		seq_no = #{seqNo},
-		phase_budget_inner_user_workload = #{phaseBudgetInnerUserWorkload},
-		phase_budget_out_user_workload = #{phaseBudgetOutUserWorkload},
-		phase_budget_inner_user_price = #{phaseBudgetInnerUserPrice},
-		phase_budget_out_user_price = #{phaseBudgetOutUserPrice},
-		phase_budget_out_user_cnt = #{phaseBudgetOutUserCnt},
-		phase_budget_inner_user_cnt = #{phaseBudgetInnerUserCnt}
-	</sql>
-	<sql id="someFieldSet">
-		<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="phaseBudgetHours != null and phaseBudgetHours != ''"> phase_budget_hours = #{phaseBudgetHours},     </if>
-		<if test="phaseBudgetStaffNu != null and phaseBudgetStaffNu != ''"> phase_budget_staff_nu = #{phaseBudgetStaffNu},     </if>
-		<if test="ctime != null"> ctime = #{ctime},     </if>
-		<if test="phaseBudgetNouserAt != null and phaseBudgetNouserAt != ''"> phase_budget_nouser_at = #{phaseBudgetNouserAt},     </if>
-		<if test="phaseBudgetInnerUserAt != null and phaseBudgetInnerUserAt != ''"> phase_budget_inner_user_at = #{phaseBudgetInnerUserAt},     </if>
-		<if test="phaseBudgetOutUserAt != null and phaseBudgetOutUserAt != ''"> phase_budget_out_user_at = #{phaseBudgetOutUserAt},     </if>
-		<if test="phaseBudgetWorkload != null and phaseBudgetWorkload != ''"> phase_budget_workload = #{phaseBudgetWorkload},     </if>
-		<if test="taskType != null and taskType != ''"> task_type = #{taskType},     </if>
-		<if test="planType != null and planType != ''"> plan_type = #{planType},     </if>
-		<if test="seqNo != null and seqNo != ''"> seq_no = #{seqNo},     </if>
-		<if test="phaseBudgetInnerUserWorkload != null and phaseBudgetInnerUserWorkload != ''"> phase_budget_inner_user_workload = #{phaseBudgetInnerUserWorkload},     </if>
-		<if test="phaseBudgetOutUserWorkload != null and phaseBudgetOutUserWorkload != ''"> phase_budget_out_user_workload = #{phaseBudgetOutUserWorkload},     </if>
-		<if test="phaseBudgetInnerUserPrice != null and phaseBudgetInnerUserPrice != ''"> phase_budget_inner_user_price = #{phaseBudgetInnerUserPrice},     </if>
-		<if test="phaseBudgetOutUserPrice != null and phaseBudgetOutUserPrice != ''"> phase_budget_out_user_price = #{phaseBudgetOutUserPrice},     </if>
-		<if test="phaseBudgetOutUserCnt != null and phaseBudgetOutUserCnt != ''"> phase_budget_out_user_cnt = #{phaseBudgetOutUserCnt},     </if>
-		<if test="phaseBudgetInnerUserCnt != null and phaseBudgetInnerUserCnt != ''"> phase_budget_inner_user_cnt = #{phaseBudgetInnerUserCnt},     </if>
-	</sql>
-	<!--sql片段 批量更新 -->
-	<sql id="batchSet">
-			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},
-			phase_budget_hours = #{item.phaseBudgetHours},
-			phase_budget_staff_nu = #{item.phaseBudgetStaffNu},
-			ctime = #{item.ctime},
-			phase_budget_nouser_at = #{item.phaseBudgetNouserAt},
-			phase_budget_inner_user_at = #{item.phaseBudgetInnerUserAt},
-			phase_budget_out_user_at = #{item.phaseBudgetOutUserAt},
-			phase_budget_workload = #{item.phaseBudgetWorkload},
-			task_type = #{item.taskType},
-			plan_type = #{item.planType},
-			seq_no = #{item.seqNo},
-			phase_budget_inner_user_workload = #{item.phaseBudgetInnerUserWorkload},
-			phase_budget_out_user_workload = #{item.phaseBudgetOutUserWorkload},
-			phase_budget_inner_user_price = #{item.phaseBudgetInnerUserPrice},
-			phase_budget_out_user_price = #{item.phaseBudgetOutUserPrice},
-			phase_budget_out_user_cnt = #{item.phaseBudgetOutUserCnt},
-			phase_budget_inner_user_cnt = #{item.phaseBudgetInnerUserCnt}
-	</sql>
-</mapper>

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectTemplateMapper.xml

@@ -1,324 +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.XmProjectTemplate">
-	
-	
-	<!--开始 自定sql函数区域 -->
-		<!--请在此区域添加自定义函数-->
-		
-		
-		
-	<!--结束 自定义sql函数区域-->
-	
-
-	
-	<!-- 通过条件查询获取数据列表 返回list<map> -->
-	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
-		select * from xm_project_template 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.XmProjectTemplate" resultType="com.xm.core.entity.XmProjectTemplate">
-		select * from xm_project_template res
-		<where>
-			<include refid="where"/>
-		</where>
-	</select>
-	
-		<!-- 通过主键查询获取数据对象 返回object -->
-	<select id="selectOneObject" parameterType="com.xm.core.entity.XmProjectTemplate" resultType="com.xm.core.entity.XmProjectTemplate">
-		select * from xm_project_template res
-		where 
-			res.id = #{id}
-	</select>
-	
-	<!-- 通过主键查询获取数据对象 返回map-->
-	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
-		select * from xm_project_template res
-		where 
-			 res.id = #{id}
-	</select>
-	<!-- 获取数据条目 返回long -->
-	<select id="countByWhere" parameterType="com.xm.core.entity.XmProjectTemplate" resultType="long">
-		select count(1) from xm_project_template res
-		<where>
-			<include refid="where"/>
-		</where>
-	</select>
-	<!-- 新增一条记录  主键id,-->
-	<insert id="insert" parameterType="com.xm.core.entity.XmProjectTemplate" useGeneratedKeys="false" keyProperty="id">
-		insert into xm_project_template(
-			<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},#{productId},#{productName},#{templateId},#{tcuserid},#{tcusername},#{tremark},#{tctime},#{tcbranchId},#{shareScope}
-		)
-	</insert>
-	
-	<!-- 按条件删除若干条记录-->
-	<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmProjectTemplate">
-		delete from xm_project_template res
-		<where>  
-			<include refid="where"/>
-		</where>
-	</delete>
-	
-	<!-- 按主键删除一条记录-->
-	<delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectTemplate">
-		delete from xm_project_template
-		where id = #{id} 
-	</delete>
-	
-	<!-- 根据条件修改若干条记录 -->
-	<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectTemplate">
-		update  xm_project_template
-		<set>
-			<include refid="someFieldSet"/>
-		</set>
-		where id = #{id} 
-	</update>
-	
-		<!-- 根据主键修改一条记录 -->
-	<update id="updateByPk" parameterType="com.xm.core.entity.XmProjectTemplate">
-		update  xm_project_template
-		<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_template
-		set 
-			<include refid="batchSet"/>
-			where id = #{item.id}  
-		</foreach> 
-	</update>
-	<!-- 批量删除 -->
-	<delete id="batchDelete" parameterType="List">  
-		delete from xm_project_template
-			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,product_id,product_name,template_id,tcuserid,tcusername,tremark,tctime,tcbranch_id,share_scope
-	</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 TO_CHAR(res.start_time,'YYYY-MM-DD') = TO_CHAR(#{startTime},'YYYY-MM-DD')     </if>
-		<if test="endTime != null">      and TO_CHAR(res.end_time,'YYYY-MM-DD') = TO_CHAR(#{endTime},'YYYY-MM-DD')     </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 TO_CHAR(res.create_time,'YYYY-MM-DD') = TO_CHAR(#{createTime},'YYYY-MM-DD')     </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 TO_CHAR(res.base_time,'YYYY-MM-DD') = TO_CHAR(#{baseTime},'YYYY-MM-DD')     </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="productId != null and productId != ''">      and res.product_id = #{productId}     </if>
-		<if test="productName != null and productName != ''">      and res.product_name = #{productName}     </if>
-		<if test="templateId != null and templateId != ''">      and res.template_id = #{templateId}     </if>
-		<if test="tcuserid != null and tcuserid != ''">      and res.tcuserid = #{tcuserid}     </if>
-		<if test="tcusername != null and tcusername != ''">      and res.tcusername = #{tcusername}     </if>
-		<if test="tremark != null and tremark != ''">      and res.tremark = #{tremark}     </if>
-		<if test="tctime != null">      and TO_CHAR(res.tctime,'YYYY-MM-DD') = TO_CHAR(#{tctime},'YYYY-MM-DD')     </if>
-		<if test="tcbranchId != null and tcbranchId != ''">      and res.tcbranch_id = #{tcbranchId}     </if>
-		<if test="shareScope != null and shareScope != ''">      and res.share_scope = #{shareScope}     </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},
-		product_id = #{productId},
-		product_name = #{productName},
-		template_id = #{templateId},
-		tcuserid = #{tcuserid},
-		tcusername = #{tcusername},
-		tremark = #{tremark},
-		tctime = #{tctime},
-		tcbranch_id = #{tcbranchId},
-		share_scope = #{shareScope}
-	</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="productId != null and productId != ''"> product_id = #{productId},     </if>
-		<if test="productName != null and productName != ''"> product_name = #{productName},     </if>
-		<if test="templateId != null and templateId != ''"> template_id = #{templateId},     </if>
-		<if test="tcuserid != null and tcuserid != ''"> tcuserid = #{tcuserid},     </if>
-		<if test="tcusername != null and tcusername != ''"> tcusername = #{tcusername},     </if>
-		<if test="tremark != null and tremark != ''"> tremark = #{tremark},     </if>
-		<if test="tctime != null"> tctime = #{tctime},     </if>
-		<if test="tcbranchId != null and tcbranchId != ''"> tcbranch_id = #{tcbranchId},     </if>
-		<if test="shareScope != null and shareScope != ''"> share_scope = #{shareScope},     </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},
-			product_id = #{item.productId},
-			product_name = #{item.productName},
-			template_id = #{item.templateId},
-			tcuserid = #{item.tcuserid},
-			tcusername = #{item.tcusername},
-			tremark = #{item.tremark},
-			tctime = #{item.tctime},
-			tcbranch_id = #{item.tcbranchId},
-			share_scope = #{item.shareScope}
-	</sql>
-</mapper>

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml

@@ -266,7 +266,7 @@
 		insert into xm_task(
 			<include refid="columns"/>
 		) values (
-		#{id},#{name},#{parentTaskid},#{parentTaskname},#{projectId},#{projectName},#{level},#{sortLevel},#{executorUserid},#{executorUsername},#{preTaskid},#{preTaskname},#{startTime},#{endTime},#{milestone},#{description},#{remarks},#{createUserid},#{createUsername},#{createTime},#{rate},#{budgetCost},#{budgetWorkload},#{actCost},#{actWorkload},#{taskState},#{taskType},#{taskClass},#{toTaskCenter},#{actStartTime},#{actEndTime},#{bizProcInstId},#{bizFlowState},#{projectPhaseId},#{projectPhaseName},#{taskSkillNames},#{exeUsernames},#{taskSkillIds},#{exeUserids},#{taskOut},#{planType},#{settleSchemel},#{menuId},#{menuName},#{productId},#{productName},#{cbranchId},#{cdeptid},#{tagIds},#{tagNames},#{ntype},#{childrenCnt},#{ltime},#{pidPaths},#{lvl}
+		#{id},#{name},#{parentTaskid},#{parentTaskname},#{projectId},#{projectName},#{level},#{sortLevel},#{executorUserid},#{executorUsername},#{preTaskid},#{preTaskname},#{startTime},#{endTime},#{milestone},#{description},#{remarks},#{createUserid},#{createUsername},#{createTime},#{rate},#{budgetCost},#{budgetWorkload},#{actCost},#{actWorkload},#{taskState},#{taskType},#{taskClass},#{toTaskCenter},#{actStartTime},#{actEndTime},#{bizProcInstId},#{bizFlowState},#{projectPhaseId},#{projectPhaseName},#{taskSkillNames},#{exeUsernames},#{taskSkillIds},#{exeUserids},#{taskOut},#{planType},#{settleSchemel},#{menuId},#{menuName},#{productId},#{productName},#{cbranchId},#{cdeptid},#{tagIds},#{tagNames},#{ntype},#{childrenCnt},#{ltime},#{pidPaths},#{lvl},#{isTpl}
 		)
 	</insert>
 	
@@ -329,7 +329,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		id,name,parent_taskid,parent_taskname,project_id,project_name,level,sort_level,executor_userid,executor_username,pre_taskid,pre_taskname,start_time,end_time,milestone,description,remarks,create_userid,create_username,create_time,rate,budget_cost,budget_workload,act_cost,act_workload,task_state,task_type,task_class,to_task_center,act_start_time,act_end_time,biz_proc_inst_id,biz_flow_state,project_phase_id,project_phase_name,task_skill_names,exe_usernames,task_skill_ids,exe_userids,task_out,plan_type,settle_schemel,menu_id,menu_name,product_id,product_name,cbranch_id,cdeptid,tag_ids,tag_names,ntype,children_cnt,ltime,pid_paths,lvl
+		id,name,parent_taskid,parent_taskname,project_id,project_name,level,sort_level,executor_userid,executor_username,pre_taskid,pre_taskname,start_time,end_time,milestone,description,remarks,create_userid,create_username,create_time,rate,budget_cost,budget_workload,act_cost,act_workload,task_state,task_type,task_class,to_task_center,act_start_time,act_end_time,biz_proc_inst_id,biz_flow_state,project_phase_id,project_phase_name,task_skill_names,exe_usernames,task_skill_ids,exe_userids,task_out,plan_type,settle_schemel,menu_id,menu_name,product_id,product_name,cbranch_id,cdeptid,tag_ids,tag_names,ntype,children_cnt,ltime,pid_paths,lvl,is_tpl
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -389,6 +389,7 @@
 		<if test="ltime != null">      and date_format(res.ltime,'%Y-%m-%d') = date_format(#{ltime},'%Y-%m-%d')     </if>
 		<if test="pidPaths != null and pidPaths != ''">      and res.pid_paths = #{pidPaths}     </if>
 		<if test="lvl != null and lvl != ''">      and res.lvl = #{lvl}     </if>
+		<if test="isTpl != null and isTpl != ''">      and res.is_tpl = #{isTpl}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -445,7 +446,8 @@
 		children_cnt = #{childrenCnt},
 		ltime = #{ltime},
 		pid_paths = #{pidPaths},
-		lvl = #{lvl}
+		lvl = #{lvl},
+		is_tpl = #{isTpl}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="name != null and name != ''"> name = #{name},     </if>
@@ -502,6 +504,7 @@
 		<if test="ltime != null"> ltime = #{ltime},     </if>
 		<if test="pidPaths != null and pidPaths != ''"> pid_paths = #{pidPaths},     </if>
 		<if test="lvl != null and lvl != ''"> lvl = #{lvl},     </if>
+		<if test="isTpl != null and isTpl != ''"> is_tpl = #{isTpl},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -558,6 +561,7 @@
 			children_cnt = #{item.childrenCnt},
 			ltime = #{item.ltime},
 			pid_paths = #{item.pidPaths},
-			lvl = #{item.lvl}
+			lvl = #{item.lvl},
+			is_tpl = #{item.isTpl}
 	</sql>
 </mapper>

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskTemplateMapper.xml

@@ -1,272 +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.XmTaskTemplate">
-	
-	
-	<!--开始 自定sql函数区域 -->
-		<!--请在此区域添加自定义函数-->
-		
-		
-		
-	<!--结束 自定义sql函数区域-->
-	
-
-	
-	<!-- 通过条件查询获取数据列表 返回list<map> -->
-	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
-		select * from xm_task_template 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.XmTaskTemplate" resultType="com.xm.core.entity.XmTaskTemplate">
-		select * from xm_task_template res
-		<where>
-			<include refid="where"/>
-		</where>
-	</select>
-	
-		<!-- 通过主键查询获取数据对象 返回object -->
-	<select id="selectOneObject" parameterType="com.xm.core.entity.XmTaskTemplate" resultType="com.xm.core.entity.XmTaskTemplate">
-		select * from xm_task_template res
-		where 
-			res.id = #{id}
-	</select>
-	
-	<!-- 通过主键查询获取数据对象 返回map-->
-	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
-		select * from xm_task_template res
-		where 
-			 res.id = #{id}
-	</select>
-	<!-- 获取数据条目 返回long -->
-	<select id="countByWhere" parameterType="com.xm.core.entity.XmTaskTemplate" resultType="long">
-		select count(1) from xm_task_template res
-		<where>
-			<include refid="where"/>
-		</where>
-	</select>
-	<!-- 新增一条记录  主键id,-->
-	<insert id="insert" parameterType="com.xm.core.entity.XmTaskTemplate" useGeneratedKeys="false" keyProperty="id">
-		insert into xm_task_template(
-			<include refid="columns"/>
-		) values (
-		#{id},#{name},#{parentTaskid},#{parentTaskname},#{projectId},#{projectName},#{level},#{sortLevel},#{preTaskid},#{preTaskname},#{startTime},#{endTime},#{milestone},#{description},#{remarks},#{createUserid},#{createUsername},#{createTime},#{rate},#{budgetCost},#{budgetWorkload},#{taskState},#{taskType},#{taskClass},#{toTaskCenter},#{projectPhaseId},#{projectPhaseName},#{taskSkillNames},#{taskSkillIds},#{taskOut},#{planType},#{settleSchemel},#{menuId},#{menuName}
-		)
-	</insert>
-	
-	<!-- 按条件删除若干条记录-->
-	<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmTaskTemplate">
-		delete from xm_task_template res
-		<where>  
-			<include refid="where"/>
-		</where>
-	</delete>
-	
-	<!-- 按主键删除一条记录-->
-	<delete id="deleteByPk" parameterType="com.xm.core.entity.XmTaskTemplate">
-		delete from xm_task_template
-		where id = #{id} 
-	</delete>
-	
-	<!-- 根据条件修改若干条记录 -->
-	<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmTaskTemplate">
-		update  xm_task_template
-		<set>
-			<include refid="someFieldSet"/>
-		</set>
-		where id = #{id} 
-	</update>
-	
-		<!-- 根据主键修改一条记录 -->
-	<update id="updateByPk" parameterType="com.xm.core.entity.XmTaskTemplate">
-		update  xm_task_template
-		<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_task_template
-		set 
-			<include refid="batchSet"/>
-			where id = #{item.id}  
-		</foreach> 
-	</update>
-	<!-- 批量删除 -->
-	<delete id="batchDelete" parameterType="List">  
-		delete from xm_task_template
-			where id in
-			    <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >  
-			        #{item.id }  
-			    </foreach>  
-	</delete>
-	
-	
-	<!--sql片段 列-->
-	<sql id="columns">
-		id,name,parent_taskid,parent_taskname,project_id,project_name,level,sort_level,pre_taskid,pre_taskname,start_time,end_time,milestone,description,remarks,create_userid,create_username,create_time,rate,budget_cost,budget_workload,task_state,task_type,task_class,to_task_center,project_phase_id,project_phase_name,task_skill_names,task_skill_ids,task_out,plan_type,settle_schemel,menu_id,menu_name
-	</sql>
-	
-	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
-	<sql id="where">
-		<if test="id != null and id != ''">      and res.id = #{id}     </if>
-		<if test="name != null and name != ''">      and res.name = #{name}     </if>
-		<if test="parentTaskid != null and parentTaskid != ''">      and res.parent_taskid = #{parentTaskid}     </if>
-		<if test="parentTaskname != null and parentTaskname != ''">      and res.parent_taskname = #{parentTaskname}     </if>
-		<if test="projectId != null and projectId != ''">      and res.project_id = #{projectId}     </if>
-		<if test="projectName != null and projectName != ''">      and res.project_name = #{projectName}     </if>
-		<if test="level != null and level != ''">      and res.level = #{level}     </if>
-		<if test="sortLevel != null and sortLevel != ''">      and res.sort_level = #{sortLevel}     </if>
-		<if test="preTaskid != null and preTaskid != ''">      and res.pre_taskid = #{preTaskid}     </if>
-		<if test="preTaskname != null and preTaskname != ''">      and res.pre_taskname = #{preTaskname}     </if>
-		<if test="startTime != null">      and TO_CHAR(res.start_time,'YYYY-MM-DD') = TO_CHAR(#{startTime},'YYYY-MM-DD')     </if>
-		<if test="endTime != null">      and TO_CHAR(res.end_time,'YYYY-MM-DD') = TO_CHAR(#{endTime},'YYYY-MM-DD')     </if>
-		<if test="milestone != null and milestone != ''">      and res.milestone = #{milestone}     </if>
-		<if test="description != null and description != ''">      and res.description = #{description}     </if>
-		<if test="remarks != null and remarks != ''">      and res.remarks = #{remarks}     </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 TO_CHAR(res.create_time,'YYYY-MM-DD') = TO_CHAR(#{createTime},'YYYY-MM-DD')     </if>
-		<if test="rate != null and rate != ''">      and res.rate = #{rate}     </if>
-		<if test="budgetCost != null and budgetCost != ''">      and res.budget_cost = #{budgetCost}     </if>
-		<if test="budgetWorkload != null and budgetWorkload != ''">      and res.budget_workload = #{budgetWorkload}     </if>
-		<if test="taskState != null and taskState != ''">      and res.task_state = #{taskState}     </if>
-		<if test="taskType != null and taskType != ''">      and res.task_type = #{taskType}     </if>
-		<if test="taskClass != null and taskClass != ''">      and res.task_class = #{taskClass}     </if>
-		<if test="toTaskCenter != null and toTaskCenter != ''">      and res.to_task_center = #{toTaskCenter}     </if>
-		<if test="projectPhaseId != null and projectPhaseId != ''">      and res.project_phase_id = #{projectPhaseId}     </if>
-		<if test="projectPhaseName != null and projectPhaseName != ''">      and res.project_phase_name = #{projectPhaseName}     </if>
-		<if test="taskSkillNames != null and taskSkillNames != ''">      and res.task_skill_names = #{taskSkillNames}     </if>
-		<if test="taskSkillIds != null and taskSkillIds != ''">      and res.task_skill_ids = #{taskSkillIds}     </if>
-		<if test="taskOut != null and taskOut != ''">      and res.task_out = #{taskOut}     </if>
-		<if test="planType != null and planType != ''">      and res.plan_type = #{planType}     </if>
-		<if test="settleSchemel != null and settleSchemel != ''">      and res.settle_schemel = #{settleSchemel}     </if>
-		<if test="menuId != null and menuId != ''">      and res.menu_id = #{menuId}     </if>
-		<if test="menuName != null and menuName != ''">      and res.menu_name = #{menuName}     </if>
-	</sql>
-	<!--sql片段 更新字段 -->
-	<sql id="set">
-		name = #{name},
-		parent_taskid = #{parentTaskid},
-		parent_taskname = #{parentTaskname},
-		project_id = #{projectId},
-		project_name = #{projectName},
-		level = #{level},
-		sort_level = #{sortLevel},
-		pre_taskid = #{preTaskid},
-		pre_taskname = #{preTaskname},
-		start_time = #{startTime},
-		end_time = #{endTime},
-		milestone = #{milestone},
-		description = #{description},
-		remarks = #{remarks},
-		create_userid = #{createUserid},
-		create_username = #{createUsername},
-		create_time = #{createTime},
-		rate = #{rate},
-		budget_cost = #{budgetCost},
-		budget_workload = #{budgetWorkload},
-		task_state = #{taskState},
-		task_type = #{taskType},
-		task_class = #{taskClass},
-		to_task_center = #{toTaskCenter},
-		project_phase_id = #{projectPhaseId},
-		project_phase_name = #{projectPhaseName},
-		task_skill_names = #{taskSkillNames},
-		task_skill_ids = #{taskSkillIds},
-		task_out = #{taskOut},
-		plan_type = #{planType},
-		settle_schemel = #{settleSchemel},
-		menu_id = #{menuId},
-		menu_name = #{menuName}
-	</sql>
-	<sql id="someFieldSet">
-		<if test="name != null and name != ''"> name = #{name},     </if>
-		<if test="parentTaskid != null and parentTaskid != ''"> parent_taskid = #{parentTaskid},     </if>
-		<if test="parentTaskname != null and parentTaskname != ''"> parent_taskname = #{parentTaskname},     </if>
-		<if test="projectId != null and projectId != ''"> project_id = #{projectId},     </if>
-		<if test="projectName != null and projectName != ''"> project_name = #{projectName},     </if>
-		<if test="level != null and level != ''"> level = #{level},     </if>
-		<if test="sortLevel != null and sortLevel != ''"> sort_level = #{sortLevel},     </if>
-		<if test="preTaskid != null and preTaskid != ''"> pre_taskid = #{preTaskid},     </if>
-		<if test="preTaskname != null and preTaskname != ''"> pre_taskname = #{preTaskname},     </if>
-		<if test="startTime != null"> start_time = #{startTime},     </if>
-		<if test="endTime != null"> end_time = #{endTime},     </if>
-		<if test="milestone != null and milestone != ''"> milestone = #{milestone},     </if>
-		<if test="description != null and description != ''"> description = #{description},     </if>
-		<if test="remarks != null and remarks != ''"> remarks = #{remarks},     </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="rate != null and rate != ''"> rate = #{rate},     </if>
-		<if test="budgetCost != null and budgetCost != ''"> budget_cost = #{budgetCost},     </if>
-		<if test="budgetWorkload != null and budgetWorkload != ''"> budget_workload = #{budgetWorkload},     </if>
-		<if test="taskState != null and taskState != ''"> task_state = #{taskState},     </if>
-		<if test="taskType != null and taskType != ''"> task_type = #{taskType},     </if>
-		<if test="taskClass != null and taskClass != ''"> task_class = #{taskClass},     </if>
-		<if test="toTaskCenter != null and toTaskCenter != ''"> to_task_center = #{toTaskCenter},     </if>
-		<if test="projectPhaseId != null and projectPhaseId != ''"> project_phase_id = #{projectPhaseId},     </if>
-		<if test="projectPhaseName != null and projectPhaseName != ''"> project_phase_name = #{projectPhaseName},     </if>
-		<if test="taskSkillNames != null and taskSkillNames != ''"> task_skill_names = #{taskSkillNames},     </if>
-		<if test="taskSkillIds != null and taskSkillIds != ''"> task_skill_ids = #{taskSkillIds},     </if>
-		<if test="taskOut != null and taskOut != ''"> task_out = #{taskOut},     </if>
-		<if test="planType != null and planType != ''"> plan_type = #{planType},     </if>
-		<if test="settleSchemel != null and settleSchemel != ''"> settle_schemel = #{settleSchemel},     </if>
-		<if test="menuId != null and menuId != ''"> menu_id = #{menuId},     </if>
-		<if test="menuName != null and menuName != ''"> menu_name = #{menuName},     </if>
-	</sql>
-	<!--sql片段 批量更新 -->
-	<sql id="batchSet">
-			name = #{item.name},
-			parent_taskid = #{item.parentTaskid},
-			parent_taskname = #{item.parentTaskname},
-			project_id = #{item.projectId},
-			project_name = #{item.projectName},
-			level = #{item.level},
-			sort_level = #{item.sortLevel},
-			pre_taskid = #{item.preTaskid},
-			pre_taskname = #{item.preTaskname},
-			start_time = #{item.startTime},
-			end_time = #{item.endTime},
-			milestone = #{item.milestone},
-			description = #{item.description},
-			remarks = #{item.remarks},
-			create_userid = #{item.createUserid},
-			create_username = #{item.createUsername},
-			create_time = #{item.createTime},
-			rate = #{item.rate},
-			budget_cost = #{item.budgetCost},
-			budget_workload = #{item.budgetWorkload},
-			task_state = #{item.taskState},
-			task_type = #{item.taskType},
-			task_class = #{item.taskClass},
-			to_task_center = #{item.toTaskCenter},
-			project_phase_id = #{item.projectPhaseId},
-			project_phase_name = #{item.projectPhaseName},
-			task_skill_names = #{item.taskSkillNames},
-			task_skill_ids = #{item.taskSkillIds},
-			task_out = #{item.taskOut},
-			plan_type = #{item.planType},
-			settle_schemel = #{item.settleSchemel},
-			menu_id = #{item.menuId},
-			menu_name = #{item.menuName}
-	</sql>
-</mapper>