diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuTemplateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuTemplateController.java
deleted file mode 100644
index 870a669f..00000000
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuTemplateController.java
+++ /dev/null
@@ -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分别为:
- * 新增: xm/xmMenuTemplate/add
- * 查询: xm/xmMenuTemplate/list
- * 模糊查询: xm/xmMenuTemplate/listKey
- * 修改: xm/xmMenuTemplate/edit
- * 删除: xm/xmMenuTemplate/del
- * 批量删除: xm/xmMenuTemplate/batchDel
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
- * 实体 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 listXmMenuTemplate( @RequestParam Map xmMenuTemplate){
- Map m = new HashMap<>();
- RequestUtils.transformArray(xmMenuTemplate, "menuIds");
- PageUtils.startPage(xmMenuTemplate);
- List> 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 addXmMenuTemplate(@RequestBody XmMenuTemplate xmMenuTemplate) {
- Map 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 delXmMenuTemplate(@RequestBody XmMenuTemplate xmMenuTemplate){
- Map 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 editXmMenuTemplate(@RequestBody XmMenuTemplate xmMenuTemplate) {
- Map 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 batchDelXmMenuTemplate(@RequestBody List xmMenuTemplates) {
- Map 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 batchAddXmMenuTemplate(@RequestBody List xmMenuTemplates) {
- Map 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 batchEditXmMenuTemplate(@RequestBody List xmMenuTemplates) {
- Map 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;
- }
-}
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductTemplateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductTemplateController.java
deleted file mode 100644
index f32361ad..00000000
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductTemplateController.java
+++ /dev/null
@@ -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分别为:
- * 新增: xm/xmProductTemplate/add
- * 查询: xm/xmProductTemplate/list
- * 模糊查询: xm/xmProductTemplate/listKey
- * 修改: xm/xmProductTemplate/edit
- * 删除: xm/xmProductTemplate/del
- * 批量删除: xm/xmProductTemplate/batchDel
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
- * 实体 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 listXmProductTemplate( @RequestParam Map xmProductTemplate){
- Map m = new HashMap<>();
- RequestUtils.transformArray(xmProductTemplate, "ids");
- PageUtils.startPage(xmProductTemplate);
- List> 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 addXmProductTemplate(@RequestBody XmProductTemplate xmProductTemplate) {
- Map 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 delXmProductTemplate(@RequestBody XmProductTemplate xmProductTemplate){
- Map 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 editXmProductTemplate(@RequestBody XmProductTemplate xmProductTemplate) {
- Map 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 batchDelXmProductTemplate(@RequestBody List xmProductTemplates) {
- Map 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;
- }
-
-}
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseTemplateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseTemplateController.java
deleted file mode 100644
index d7a5f068..00000000
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseTemplateController.java
+++ /dev/null
@@ -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分别为:
- * 新增: xm/xmProjectPhaseTemplate/add
- * 查询: xm/xmProjectPhaseTemplate/list
- * 模糊查询: xm/xmProjectPhaseTemplate/listKey
- * 修改: xm/xmProjectPhaseTemplate/edit
- * 删除: xm/xmProjectPhaseTemplate/del
- * 批量删除: xm/xmProjectPhaseTemplate/batchDel
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
- * 实体 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 listXmProjectPhaseTemplate( @RequestParam Map xmProjectPhaseTemplate){
- Map m = new HashMap<>();
- RequestUtils.transformArray(xmProjectPhaseTemplate, "ids");
- PageUtils.startPage(xmProjectPhaseTemplate);
- List> 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 addXmProjectPhaseTemplate(@RequestBody XmProjectPhaseTemplate xmProjectPhaseTemplate) {
- Map 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 delXmProjectPhaseTemplate(@RequestBody XmProjectPhaseTemplate xmProjectPhaseTemplate){
- Map 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 editXmProjectPhaseTemplate(@RequestBody XmProjectPhaseTemplate xmProjectPhaseTemplate) {
- Map 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 batchDelXmProjectPhaseTemplate(@RequestBody List xmProjectPhaseTemplates) {
- Map 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 batchAddXmProjectPhaseTemplate(@RequestBody List xmProjectPhaseTemplates) {
- Map 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 batchEditXmProjectPhaseTemplate(@RequestBody List xmProjectPhaseTemplates) {
- Map 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;
- }
-}
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskTemplateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskTemplateController.java
deleted file mode 100644
index 98eb1a18..00000000
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskTemplateController.java
+++ /dev/null
@@ -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分别为:
- * 新增: xm/xmTaskTemplate/add
- * 查询: xm/xmTaskTemplate/list
- * 模糊查询: xm/xmTaskTemplate/listKey
- * 修改: xm/xmTaskTemplate/edit
- * 删除: xm/xmTaskTemplate/del
- * 批量删除: xm/xmTaskTemplate/batchDel
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
- * 实体 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 listXmTaskTemplate( @RequestParam Map xmTaskTemplate){
- Map m = new HashMap<>();
- RequestUtils.transformArray(xmTaskTemplate, "ids");
- PageUtils.startPage(xmTaskTemplate);
- List> 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 addXmTaskTemplate(@RequestBody XmTaskTemplate xmTaskTemplate) {
- Map 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 delXmTaskTemplate(@RequestBody XmTaskTemplate xmTaskTemplate){
- Map 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 editXmTaskTemplate(@RequestBody XmTaskTemplate xmTaskTemplate) {
- Map 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 batchDelXmTaskTemplate(@RequestBody List xmTaskTemplates) {
- Map 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 batchAddXmTaskTemplate(@RequestBody List xmTaskTemplates) {
- Map 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 batchEditXmTaskTemplate(@RequestBody List xmTaskTemplates) {
- Map 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;
- }
-
-}
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmMenu.java b/xm-core/src/main/java/com/xm/core/entity/XmMenu.java
index 7cfdd310..d38bd715 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmMenu.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmMenu.java
@@ -7,9 +7,9 @@ import java.util.Date;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmMenu所有属性名:
- * 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;
* 表 xm_menu 功能表的所有字段名:
- * 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;
* 当前主键(包括多主键):
* menu_id;
*/
@@ -93,6 +93,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) {
@@ -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;
+ }
}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmMenuTemplate.java b/xm-core/src/main/java/com/xm/core/entity/XmMenuTemplate.java
deleted file mode 100644
index 566e1187..00000000
--- a/xm-core/src/main/java/com/xm/core/entity/XmMenuTemplate.java
+++ /dev/null
@@ -1,242 +0,0 @@
-package com.xm.core.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
- * 实体 XmMenuTemplate所有属性名:
- * menuId,menuName,pmenuId,productId,remark,status,online,demandUrl,codeUrl,designUrl,docUrl,helpUrl,operDocUrl,seqNo;
- * 表 XM.xm_menu_template 功能表的所有字段名:
- * 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;
- * 当前主键(包括多主键):
- * menu_id;
- */
-@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;
- }
-
-}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProduct.java b/xm-core/src/main/java/com/xm/core/entity/XmProduct.java
index d91895a5..9ad7e50b 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProduct.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProduct.java
@@ -7,9 +7,9 @@ import java.util.Date;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmProduct所有属性名:
- * id,productName,branchId,remark,version,pmUserid,pmUsername,ctime,deptid;
- * 表 XM.xm_product 产品表的所有字段名:
- * id,product_name,branch_id,remark,version,pm_userid,pm_username,ctime,deptid;
+ * id,productName,branchId,remark,version,pmUserid,pmUsername,ctime,deptid,pstatus,startTime,endTime,deptName,admUserid,admUsername,assistantUserid,assistantUsername,bizProcInstId,bizFlowState,isTpl,baselineId,baseTime;
+ * 表 xm_product 产品表的所有字段名:
+ * 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;
* 当前主键(包括多主键):
* id;
*/
@@ -45,6 +45,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) {
@@ -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;
+ }
}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProductTemplate.java b/xm-core/src/main/java/com/xm/core/entity/XmProductTemplate.java
deleted file mode 100644
index 84c8d535..00000000
--- a/xm-core/src/main/java/com/xm/core/entity/XmProductTemplate.java
+++ /dev/null
@@ -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 小模块
- * 实体 XmProductTemplate所有属性名:
- * id,productName,branchId,remark,templateId,tcuserid,tcusername,tremark,tctime,tcbranchId,shareScope;
- * 表 XM.xm_product_template 产品表的所有字段名:
- * id,product_name,branch_id,remark,template_id,tcuserid,tcusername,tremark,tctime,tcbranch_id,share_scope;
- * 当前主键(包括多主键):
- * id;
- */
-@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;
- }
-
-}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProject.java b/xm-core/src/main/java/com/xm/core/entity/XmProject.java
index f6ae4ee2..0abfe28e 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProject.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProject.java
@@ -8,9 +8,9 @@ import java.math.BigDecimal;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmProject所有属性名:
- * 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;
- * 表 XM.xm_project xm_project的所有字段名:
- * 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,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;
+ * 表 xm_project xm_project的所有字段名:
+ * id,code,name,xm_type,start_time,end_time,urgent,priority,description,create_userid,create_username,create_time,assess,assess_remarks,status,branch_id,plan_total_cost,biz_proc_inst_id,biz_flow_state,plan_nouser_at,plan_inner_user_at,plan_out_user_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_inner_user_price,plan_out_user_price,plan_out_user_cnt,plan_inner_user_cnt,plan_working_hours,tax_rate,plan_inner_user_workload,plan_out_user_workload,from_tpl_id,budget_ctrl,deptid,show_out,is_tpl;
* 当前主键(包括多主键):
* id;
*/
@@ -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="")
@@ -145,6 +145,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) {
@@ -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;
+ }
}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectPhase.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectPhase.java
index b9d0f457..1b2f997d 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProjectPhase.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectPhase.java
@@ -8,9 +8,9 @@ import java.math.BigDecimal;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmProjectPhase所有属性名:
- * 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;
* 表 xm_project_phase 项目阶段模板的所有字段名:
- * 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;
* 当前主键(包括多主键):
* id;
*/
@@ -178,6 +178,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) {
@@ -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;
+ }
}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectPhaseTemplate.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectPhaseTemplate.java
deleted file mode 100644
index 07bba2f7..00000000
--- a/xm-core/src/main/java/com/xm/core/entity/XmProjectPhaseTemplate.java
+++ /dev/null
@@ -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 小模块
- * 实体 XmProjectPhaseTemplate所有属性名:
- * id,phaseName,remark,parentPhaseId,branchId,projectId,beginDate,endDate,phaseBudgetHours,phaseBudgetStaffNu,ctime,phaseBudgetNouserAt,phaseBudgetInnerUserAt,phaseBudgetOutUserAt,phaseBudgetWorkload,taskType,planType,seqNo,phaseBudgetInnerUserWorkload,phaseBudgetOutUserWorkload,phaseBudgetInnerUserPrice,phaseBudgetOutUserPrice,phaseBudgetOutUserCnt,phaseBudgetInnerUserCnt;
- * 表 XM.xm_project_phase_template 项目阶段模板的所有字段名:
- * 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;
- * 当前主键(包括多主键):
- * id;
- */
-@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;
- }
-
-}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectTemplate.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectTemplate.java
deleted file mode 100644
index bde7083f..00000000
--- a/xm-core/src/main/java/com/xm/core/entity/XmProjectTemplate.java
+++ /dev/null
@@ -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 小模块
- * 实体 XmProjectTemplate所有属性名:
- * 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;
- * 表 XM.xm_project_template xm_project_template的所有字段名:
- * 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;
- * 当前主键(包括多主键):
- * id;
- */
-@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;
- }
-
-}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTask.java b/xm-core/src/main/java/com/xm/core/entity/XmTask.java
index 58eeb58d..4df295ce 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmTask.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmTask.java
@@ -8,9 +8,9 @@ import java.math.BigDecimal;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmTask所有属性名:
- * 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;
* 表 xm_task xm_task的所有字段名:
- * 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;
* 当前主键(包括多主键):
* id;
*/
@@ -184,6 +184,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) {
@@ -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;
+ }
}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTaskTemplate.java b/xm-core/src/main/java/com/xm/core/entity/XmTaskTemplate.java
deleted file mode 100644
index 8f1f79ae..00000000
--- a/xm-core/src/main/java/com/xm/core/entity/XmTaskTemplate.java
+++ /dev/null
@@ -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 小模块
- * 实体 XmTaskTemplate所有属性名:
- * 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;
- * 表 XM.xm_task_template xm_task_template的所有字段名:
- * 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;
- * 当前主键(包括多主键):
- * id;
- */
-@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;
- }
-
-}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuTemplateService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuTemplateService.java
deleted file mode 100644
index 806891ab..00000000
--- a/xm-core/src/main/java/com/xm/core/service/XmMenuTemplateService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.xm.core.service;
-
-import com.mdp.core.service.BaseService;
-import org.springframework.stereotype.Service;
-
-/**
- * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
- * 实体 XmMenuTemplate 表 XM.xm_menu_template 当前主键(包括多主键): menu_id;
- ***/
-@Service("xm.core.xmMenuTemplateService")
-public class XmMenuTemplateService extends BaseService {
-
- /** 请在此类添加自定义函数 */
-
-}
-
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProductTemplateService.java b/xm-core/src/main/java/com/xm/core/service/XmProductTemplateService.java
deleted file mode 100644
index c0a5d7d1..00000000
--- a/xm-core/src/main/java/com/xm/core/service/XmProductTemplateService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.xm.core.service;
-
-import com.mdp.core.service.BaseService;
-import org.springframework.stereotype.Service;
-
-/**
- * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
- * 实体 XmProductTemplate 表 XM.xm_product_template 当前主键(包括多主键): id;
- ***/
-@Service("xm.core.xmProductTemplateService")
-public class XmProductTemplateService extends BaseService {
-
- /** 请在此类添加自定义函数 */
-
-}
-
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseTemplateService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseTemplateService.java
deleted file mode 100644
index ea7460aa..00000000
--- a/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseTemplateService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.xm.core.service;
-
-import com.mdp.core.service.BaseService;
-import org.springframework.stereotype.Service;
-
-/**
- * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
- * 实体 XmProjectPhaseTemplate 表 XM.xm_project_phase_template 当前主键(包括多主键): id;
- ***/
-@Service("xm.core.xmProjectPhaseTemplateService")
-public class XmProjectPhaseTemplateService extends BaseService {
-
- /** 请在此类添加自定义函数 */
-
-}
-
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectTemplateService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectTemplateService.java
deleted file mode 100644
index 5c34b1a4..00000000
--- a/xm-core/src/main/java/com/xm/core/service/XmProjectTemplateService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.xm.core.service;
-
-import com.mdp.core.service.BaseService;
-import org.springframework.stereotype.Service;
-
-/**
- * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
- * 实体 XmProjectTemplate 表 XM.xm_project_template 当前主键(包括多主键): id;
- ***/
-@Service("xm.core.xmProjectTemplateService")
-public class XmProjectTemplateService extends BaseService {
-
- /** 请在此类添加自定义函数 */
-
-}
-
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskTemplateService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskTemplateService.java
deleted file mode 100644
index 4dca2c93..00000000
--- a/xm-core/src/main/java/com/xm/core/service/XmTaskTemplateService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.xm.core.service;
-
-import com.mdp.core.service.BaseService;
-import org.springframework.stereotype.Service;
-
-/**
- * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
- * 实体 XmTaskTemplate 表 XM.xm_task_template 当前主键(包括多主键): id;
- ***/
-@Service("xm.core.xmTaskTemplateService")
-public class XmTaskTemplateService extends BaseService {
-
- /** 请在此类添加自定义函数 */
-
-}
-
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
index b816c70a..2e4871bc 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
@@ -5,88 +5,16 @@
-
- and (res.menu_id) in
-
- ( #{item})
-
-
- and
-
- #{item} like concat(res.pid_paths,'%')
-
-
- and
-
- find_in_set(#{item},res.tag_ids)
-
-
-
- and not
- exists ( select 1 from xm_iteration_menu im where im.menu_id=res.menu_id)
-
-
- and not
- exists ( select 1 from xm_task t where t.menu_id=res.menu_id)
-
- and res.menu_name like #{key}
- and (res.pmenu_id is null or res.pmenu_id = '')
-
-
-
-
-
-
-
-
+
+ and (res.menu_id) in
+
+ ( #{item})
+
+
+
+
-
-
- 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
-
- ( #{item})
-
- 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
-
- ( #{item})
-
-
@@ -133,7 +61,7 @@
insert into xm_menu(
) 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}
)
@@ -196,7 +124,7 @@
- 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
@@ -226,6 +154,7 @@
and res.tag_names = #{tagNames}
and res.pid_paths = #{pidPaths}
and res.lvl = #{lvl}
+ and res.is_tpl = #{isTpl}
@@ -252,7 +181,8 @@
tag_ids = #{tagIds},
tag_names = #{tagNames},
pid_paths = #{pidPaths},
- lvl = #{lvl}
+ lvl = #{lvl},
+ is_tpl = #{isTpl}
menu_name = #{menuName},
@@ -279,6 +209,7 @@
tag_names = #{tagNames},
pid_paths = #{pidPaths},
lvl = #{lvl},
+ is_tpl = #{isTpl},
@@ -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}
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuTemplateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuTemplateMapper.xml
deleted file mode 100644
index 439b38a5..00000000
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuTemplateMapper.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- insert into xm_menu_template(
-
- ) values (
- #{menuId},#{menuName},#{pmenuId},#{productId},#{remark},#{status},#{online},#{demandUrl},#{codeUrl},#{designUrl},#{docUrl},#{helpUrl},#{operDocUrl},#{seqNo}
- )
-
-
-
-
- delete from xm_menu_template res
-
-
-
-
-
-
-
- delete from xm_menu_template
- where menu_id = #{menuId}
-
-
-
-
- update xm_menu_template
-
-
-
- where menu_id = #{menuId}
-
-
-
-
- update xm_menu_template
-
-
-
- where menu_id = #{menuId}
-
-
-
-
-
-
-
- update xm_menu_template
- set
-
- where menu_id = #{item.menuId}
-
-
-
-
- delete from xm_menu_template
- where menu_id in
-
- #{item.menuId }
-
-
-
-
-
-
- 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
-
-
-
-
- and res.menu_id = #{menuId}
- and res.menu_name = #{menuName}
- and res.pmenu_id = #{pmenuId}
- and res.product_id = #{productId}
- and res.remark = #{remark}
- and res.status = #{status}
- and res.online = #{online}
- and res.demand_url = #{demandUrl}
- and res.code_url = #{codeUrl}
- and res.design_url = #{designUrl}
- and res.doc_url = #{docUrl}
- and res.help_url = #{helpUrl}
- and res.oper_doc_url = #{operDocUrl}
- and res.seq_no = #{seqNo}
-
-
-
- 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}
-
-
- 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},
-
-
-
- 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}
-
-
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
index deb06b23..20ade564 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
@@ -5,7 +5,7 @@
-
+
-
+
@@ -42,12 +42,12 @@