diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmPhaseController.java
similarity index 95%
rename from xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java
rename to xm-core/src/main/java/com/xm/core/ctrl/XmPhaseController.java
index 234d65fb..64e01fda 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmPhaseController.java
@@ -39,12 +39,12 @@ import static com.mdp.core.utils.BaseUtils.map;
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
* 实体 XmProjectPhase 表 XM.xm_project_phase 当前主键(包括多主键): id;
***/
-@RestController("xm.core.xmProductPhaseController")
-@RequestMapping(value="/**/xm/core/xmProductPhase")
+@RestController("xm.core.xmPhaseController")
+@RequestMapping(value="/**/xm/core/xmPhase")
@Api(tags={"项目计划模板操作接口"})
-public class XmProductPhaseController {
+public class XmPhaseController {
- static Log logger=LogFactory.getLog(XmProductPhaseController.class);
+ static Log logger=LogFactory.getLog(XmPhaseController.class);
@Autowired
private XmPhaseService xmPhaseService;
@@ -144,7 +144,7 @@ public class XmProductPhaseController {
}
- @HasQx(value = "xm_core_xmProjectPhase_setPhaseMngUser",name = "设置计划负责人",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
+ @HasQx(value = "xm_core_xmPhase_setPhaseMngUser",name = "设置计划负责人",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/setPhaseMngUser",method=RequestMethod.POST)
public Map setPhaseMngUser(@RequestBody XmPhase xmProjectPhase) {
Map m = new HashMap<>();
@@ -203,7 +203,7 @@ public class XmProductPhaseController {
@ApiResponses({
@ApiResponse(code = 200,response= XmPhase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
})
- @HasQx(value = "xm_core_xmProjectPhase_add",name = "创建项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
+ @HasQx(value = "xm_core_xmPhase_add",name = "创建项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/add",method=RequestMethod.POST)
public Map addXmProjectPhase(@RequestBody XmPhase xmProjectPhase) {
Map m = new HashMap<>();
@@ -284,7 +284,7 @@ public class XmProductPhaseController {
@ApiResponses({
@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}")
})
- @HasQx(value = "xm_core_xmProjectPhase_del",name = "删除项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
+ @HasQx(value = "xm_core_xmPhase_del",name = "删除项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/del",method=RequestMethod.POST)
public Map delXmProjectPhase(@RequestBody XmPhase xmProjectPhase){
Map m = new HashMap<>();
@@ -345,7 +345,7 @@ public class XmProductPhaseController {
@ApiResponses({
@ApiResponse(code = 200,response= XmPhase.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
})
- @HasQx(value = "xm_core_xmProjectPhase_edit",name = "修改项目计划基础信息",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
+ @HasQx(value = "xm_core_xmPhase_edit",name = "修改项目计划基础信息",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/edit",method=RequestMethod.POST)
public Map editXmProjectPhase(@RequestBody XmPhase xmProjectPhase) {
Map m = new HashMap<>();
@@ -421,7 +421,7 @@ public class XmProductPhaseController {
@ApiResponses({
@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
})
- @HasQx(value = "xm_core_xmProjectPhase_batchDel",name = "批量删除项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
+ @HasQx(value = "xm_core_xmPhase_batchDel",name = "批量删除项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/batchDel",method=RequestMethod.POST)
public Map batchDelXmProjectPhase(@RequestBody List xmProjectPhases) {
Map m = new HashMap<>();
@@ -517,7 +517,7 @@ public class XmProductPhaseController {
@ApiResponses({
@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
})
- @HasQx(value = "xm_core_xmProjectPhase_batchImportFromTemplate",name = "从模板批量创建项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
+ @HasQx(value = "xm_core_xmPhase_batchImportFromTemplate",name = "从模板批量创建项目计划",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/batchImportFromTemplate",method=RequestMethod.POST)
public Map batchImportFromTemplate(@RequestBody List xmProjectPhases) {
Map m = new HashMap<>();
@@ -627,7 +627,7 @@ public class XmProductPhaseController {
@ApiResponses({
@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
})
- @HasQx(value = "xm_core_xmProjectPhase_batchSaveBudget",name = "批量修改项目计划的预算",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
+ @HasQx(value = "xm_core_xmPhase_batchSaveBudget",name = "批量修改项目计划的预算",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/batchSaveBudget",method=RequestMethod.POST)
public Map batchSaveBudget(@RequestBody List xmProjectPhases) {
Map m = new HashMap<>();
@@ -736,7 +736,7 @@ public class XmProductPhaseController {
@ApiResponses({
@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
})
- @HasQx(value = "xm_core_xmProjectPhase_loadTasksToXmProjectPhase",name = "计算各个计划对应的bug、task、测试案例等数据",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
+ @HasQx(value = "xm_core_xmPhase_loadTasksToXmProjectPhase",name = "计算各个计划对应的bug、task、测试案例等数据",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/loaMenusToXmProductPhase",method=RequestMethod.POST)
public Map loadTasksToXmProjectPhase(@RequestBody Map params) {
Map m = new HashMap<>();
@@ -777,7 +777,7 @@ public class XmProductPhaseController {
@ApiResponses({
@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
})
- @HasQx(value = "xm_core_xmProjectPhase_calcKeyPaths",name = "关键路径计算",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
+ @HasQx(value = "xm_core_xmPhase_calcKeyPaths",name = "关键路径计算",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/calcKeyPaths",method=RequestMethod.POST)
public Map calcKeyPaths(@RequestBody Map params) {
Map m = new HashMap<>();
@@ -816,7 +816,7 @@ public class XmProductPhaseController {
@ApiResponses({
@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
})
- @HasQx(value = "xm_core_xmProjectPhase_selectTotalProductAndPhaseBudgetCost",name = "查询产品与计划汇总数据",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
+ @HasQx(value = "xm_core_xmPhase_selectTotalProductAndPhaseBudgetCost",name = "查询产品与计划汇总数据",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/selectTotalProductAndPhaseBudgetCost",method=RequestMethod.POST)
public Map getProjectBudgetWithsPhaseBudget(@RequestBody Map params) {
Map m = new HashMap<>();
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java
deleted file mode 100644
index ceb14afc..00000000
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java
+++ /dev/null
@@ -1,853 +0,0 @@
-package com.xm.core.ctrl;
-
-import com.alibaba.fastjson.JSON;
-import com.mdp.core.entity.Tips;
-import com.mdp.core.err.BizException;
-import com.mdp.core.utils.NumberUtil;
-import com.mdp.core.utils.RequestUtils;
-import com.mdp.core.utils.ResponseHelper;
-import com.mdp.mybatis.PageUtils;
-import com.mdp.qx.HasQx;
-import com.mdp.safe.client.entity.User;
-import com.mdp.safe.client.utils.LoginUtils;
-import com.xm.core.PubTool;
-import com.xm.core.entity.XmPhase;
-import com.xm.core.entity.XmProject;
-import com.xm.core.service.*;
-import com.xm.core.vo.XmGroupVo;
-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.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.mdp.core.utils.BaseUtils.map;
-
-/**
- * url编制采用rest风格,如对XM.xm_project_phase 项目计划模板的操作有增删改查,对应的url分别为:
- * 新增: xm/xmProjectPhase/add
- * 查询: xm/xmProjectPhase/list
- * 模糊查询: xm/xmProjectPhase/listKey
- * 修改: xm/xmProjectPhase/edit
- * 删除: xm/xmProjectPhase/del
- * 批量删除: xm/xmProjectPhase/batchDel
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
- * 实体 XmProjectPhase 表 XM.xm_project_phase 当前主键(包括多主键): id;
- ***/
-@RestController("xm.core.xmProjectPhaseController")
-@RequestMapping(value="/**/xm/core/xmProjectPhase")
-@Api(tags={"项目计划模板操作接口"})
-public class XmProjectPhaseController {
-
- static Log logger=LogFactory.getLog(XmProjectPhaseController.class);
-
- @Autowired
- private XmPhaseService xmPhaseService;
-
- @Autowired
- private XmGroupService groupService;
-
- @Autowired
- private XmProjectService xmProjectService;
-
-
- @Autowired
- XmRecordService xmRecordService;
-
- @ApiOperation( value = "查询项目计划模板信息列表",notes="listXmProjectPhase,条件之间是 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="projectBaselineId",value="项目级基线",required=false),
- @ApiImplicitParam(name="bizProcInstId",value="当前流程实例编号",required=false),
- @ApiImplicitParam(name="bizFlowState",value="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",required=false),
- @ApiImplicitParam(name="phaseBudgetWorkload",value="总工作量单位人时-应该大于或者等于task中的预算总工作量",required=false),
- @ApiImplicitParam(name="phaseActWorkload",value="已完成工作量单位人时-从task中的实际工作量算出",required=false),
- @ApiImplicitParam(name="phaseActInnerUserWorkload",value="实际内部人力工作量-来自任务表合计",required=false),
- @ApiImplicitParam(name="phaseActOutUserWorkload",value="实际外购人力工作量-来自任务表合计",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="actNouserAt",value="实际非人力成本-来自任务表合计",required=false),
- @ApiImplicitParam(name="actInnerUserAt",value="实际内部人力成本-来自任务表合计",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="actRate",value="实际进度0-100",required=false),
- @ApiImplicitParam(name="phaseStatus",value="计划状态0初始1执行中2完工3关闭4删除中5已删除6暂停",required=false),
- @ApiImplicitParam(name="actOutUserAt",value="实际外部人力成本",required=false),
- @ApiImplicitParam(name="taskCnt",value="任务数",required=false),
- @ApiImplicitParam(name="finishTaskCnt",value="完成的任务数",required=false),
- @ApiImplicitParam(name="iterationCnt",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= XmPhase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
- })
- @RequestMapping(value="/list",method=RequestMethod.GET)
- public Map listXmProjectPhase( @RequestParam Map xmProjectPhase){
- Map m = new HashMap<>();
- RequestUtils.transformArray(xmProjectPhase, "ids");
- PageUtils.startPage(xmProjectPhase);
- List