diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmPhaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmPhaseController.java index 4173959b..47c19eff 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmPhaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmPhaseController.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; import static com.mdp.core.utils.BaseUtils.map; /** - * url编制采用rest风格,如对XM.xm_project_phase 项目计划模板的操作有增删改查,对应的url分别为:
+ * url编制采用rest风格,如对XM.xm_phase 项目计划模板的操作有增删改查,对应的url分别为:
* 新增: xm/xmProjectPhase/add
* 查询: xm/xmProjectPhase/list
* 模糊查询: xm/xmProjectPhase/listKey
@@ -37,7 +37,7 @@ import static com.mdp.core.utils.BaseUtils.map; * 删除: xm/xmProjectPhase/del
* 批量删除: xm/xmProjectPhase/batchDel
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
- * 实体 XmProjectPhase 表 XM.xm_project_phase 当前主键(包括多主键): id; + * 实体 XmProjectPhase 表 XM.xm_phase 当前主键(包括多主键): id; ***/ @RestController("xm.core.xmPhaseController") @RequestMapping(value="/**/xm/core/xmPhase") @@ -199,7 +199,7 @@ public class XmPhaseController { return m; } - @ApiOperation( value = "新增一条xm_project_phase信息",notes="addXmProjectPhase,主键如果为空，后台自动生成") + @ApiOperation( value = "新增一条xm_phase信息",notes="addXmProjectPhase,主键如果为空，后台自动生成") @ApiResponses({ @ApiResponse(code = 200,response= XmPhase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") }) @@ -280,7 +280,7 @@ public class XmPhaseController { return m; } /***/ - @ApiOperation( value = "删除一条xm_project_phase信息",notes="delXmProjectPhase,仅需要上传主键字段") + @ApiOperation( value = "删除一条xm_phase信息",notes="delXmProjectPhase,仅需要上传主键字段") @ApiResponses({ @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}") }) @@ -341,7 +341,7 @@ public class XmPhaseController { /***/ - @ApiOperation( value = "根据主键修改一条xm_project_phase信息",notes="editXmProjectPhase") + @ApiOperation( value = "根据主键修改一条xm_phase信息",notes="editXmProjectPhase") @ApiResponses({ @ApiResponse(code = 200,response= XmPhase.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") }) @@ -417,7 +417,7 @@ public class XmPhaseController { /***/ - @ApiOperation( value = "根据主键列表批量删除xm_project_phase信息",notes="batchDelXmProjectPhase,仅需要上传主键字段") + @ApiOperation( value = "根据主键列表批量删除xm_phase信息",notes="batchDelXmProjectPhase,仅需要上传主键字段") @ApiResponses({ @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") }) @@ -513,7 +513,7 @@ public class XmPhaseController { return m; } /***/ - @ApiOperation( value = "根据主键列表批量删除xm_project_phase信息",notes="batchDelXmProjectPhase,仅需要上传主键字段") + @ApiOperation( value = "根据主键列表批量删除xm_phase信息",notes="batchDelXmProjectPhase,仅需要上传主键字段") @ApiResponses({ @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") }) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostNouserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostNouserController.java index d065fde5..0657371f 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostNouserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostNouserController.java @@ -60,7 +60,7 @@ public class XmProjectMBudgetCostNouserController { @ApiImplicitParam(name="bizzEndDate",value="费用归属周期结束日期",required=false), @ApiImplicitParam(name="bizProcInstId",value="当前流程实例编号",required=false), @ApiImplicitParam(name="bizFlowState",value="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",required=false), - @ApiImplicitParam(name="projectPhaseId",value="计划",required=false), + @ApiImplicitParam(name="phaseId",value="计划",required=false), @ApiImplicitParam(name="costType",value="成本类型0非人力1内部人力2外购人力",required=false), @ApiImplicitParam(name="bizzMonth",value="费用归属月份yyyy-mm",required=false), @ApiImplicitParam(name="pageSize",value="每页记录数",required=false), diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostUserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostUserController.java index 82fe4623..e6261a6f 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostUserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostUserController.java @@ -52,7 +52,7 @@ public class XmProjectMBudgetCostUserController { @ApiImplicitParam(name="bizzMonth",value="费用归属月份yyyy-mm",required=false), @ApiImplicitParam(name="bizProcInstId",value="当前流程实例编号",required=false), @ApiImplicitParam(name="bizFlowState",value="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",required=false), - @ApiImplicitParam(name="projectPhaseId",value="项目计划",required=false), + @ApiImplicitParam(name="phaseId",value="项目计划",required=false), @ApiImplicitParam(name="costType",value="成本类型0人力1内部人力2外购人力",required=false), @ApiImplicitParam(name="pageSize",value="每页记录数",required=false), @ApiImplicitParam(name="currentPage",value="当前页码,从1开始",required=false), diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostNouserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostNouserController.java index a52e651f..a6f453f4 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostNouserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostNouserController.java @@ -66,7 +66,7 @@ public class XmProjectMCostNouserController { @ApiImplicitParam(name="bizzEndDate",value="费用归属周期结束日期",required=false), @ApiImplicitParam(name="bizProcInstId",value="当前流程实例编号",required=false), @ApiImplicitParam(name="bizFlowState",value="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",required=false), - @ApiImplicitParam(name="projectPhaseId",value="项目计划计划编号",required=false), + @ApiImplicitParam(name="phaseId",value="项目计划计划编号",required=false), @ApiImplicitParam(name="actCostAmount",value="实际成本金额",required=false), @ApiImplicitParam(name="costType",value="成本类型0非人力1内部人力2外购人力",required=false), @ApiImplicitParam(name="bizMonth",value="业务归属月份yyyy-mm",required=false), diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostUserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostUserController.java index 16b7609d..76a7c311 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostUserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostUserController.java @@ -68,7 +68,7 @@ public class XmProjectMCostUserController { @ApiImplicitParam(name="bizzEndDate",value="费用归属周期结束日期",required=false), @ApiImplicitParam(name="bizProcInstId",value="当前流程实例编号",required=false), @ApiImplicitParam(name="bizFlowState",value="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",required=false), - @ApiImplicitParam(name="projectPhaseId",value="项目计划计划编号",required=false), + @ApiImplicitParam(name="phaseId",value="项目计划计划编号",required=false), @ApiImplicitParam(name="actCostAmount",value="金额",required=false), @ApiImplicitParam(name="costType",value="成本类型0非人力1内部人力2外购人力",required=false), @ApiImplicitParam(name="bizMonth",value="业务归属月份yyyy-mm",required=false), diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index b9072642..d806dae5 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -893,11 +893,11 @@ public class XmTaskController { return ResponseHelper.failed("params-0","参数不能为空"); } - String projectPhaseId=tasksPhase.getPhaseId(); - if( !StringUtils.hasText(projectPhaseId) ){ - return ResponseHelper.failed("projectPhaseId-0","项目计划编号不能为空"); + String phaseId=tasksPhase.getPhaseId(); + if( !StringUtils.hasText(phaseId) ){ + return ResponseHelper.failed("phaseId-0","项目计划编号不能为空"); } - XmProjectPhase xmProjectPhaseDb=this.xmProjectPhaseService.selectOneObject(new XmProjectPhase(projectPhaseId)); + XmProjectPhase xmProjectPhaseDb=this.xmProjectPhaseService.selectOneObject(new XmProjectPhase(phaseId)); if(xmProjectPhaseDb==null){ @@ -945,7 +945,7 @@ public class XmTaskController { List msgs=new ArrayList<>(); if(allowTasks.size()>0){ BatchRelTasksWithPhase tasksWithPhase=new BatchRelTasksWithPhase(); - tasksWithPhase.setPhaseId(projectPhaseId); + tasksWithPhase.setPhaseId(phaseId); tasksWithPhase.setTaskIds(allowTasks.stream().map(i->i.getId()).collect(Collectors.toList())); xmTaskService.batchRelTasksWithPhase(tasksWithPhase); } diff --git a/xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java b/xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java index 942631bd..8d546724 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java @@ -10,7 +10,7 @@ import java.util.Date; * 实体 XmBranchTaskTypeState所有属性名:
* taskType,planWorkload,planAmount,actWorkload,actAmount,branchId,bizDate,calcTime,planOuserAt,planIuserAt,actOutUserAt,actInnerUserAt,planOuserWorkload,planIuserWorkload,actOuserWorkload,actIuserWorkload,planNouserAt,actNouserAt,id,branchName;
* 表 xm_branch_task_type_state 按机构编号任务类型汇总的所有字段名:
- * task_type,plan_workload,plan_amount,act_workload,act_amount,branch_id,biz_date,calc_time,plan_ouser_at,plan_iuser_at,act_out_user_at,act_inner_user_at,plan_ouser_workload,plan_iuser_workload,act_ouser_workload,act_iuser_workload,plan_nouser_at,act_nouser_at,id,branch_name;
+ * task_type,plan_workload,plan_amount,act_workload,act_amount,branch_id,biz_date,calc_time,plan_ouser_at,plan_iuser_at,act_ouser_at,act_iuser_at,plan_ouser_workload,plan_iuser_workload,act_ouser_workload,act_iuser_workload,plan_nouser_at,act_nouser_at,id,branch_name;
* 当前主键(包括多主键):
* id;
*/ diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectTaskTypeState.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectTaskTypeState.java index 34a18f63..08564c07 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectTaskTypeState.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectTaskTypeState.java @@ -10,7 +10,7 @@ import java.util.Date; * 实体 XmProjectTaskTypeState所有属性名:
* projectId,projectName,taskType,planWorkload,planAmount,actWorkload,actAmount,branchId,bizDate,calcTime,planOuserAt,planIuserAt,actOutUserAt,actInnerUserAt,planOuserWorkload,planIuserWorkload,actOuserWorkload,actIuserWorkload,planNouserAt,actNouserAt,id;
* 表 xm_project_task_type_state 按任务类型汇总的所有字段名:
- * project_id,project_name,task_type,plan_workload,plan_amount,act_workload,act_amount,branch_id,biz_date,calc_time,plan_ouser_at,plan_iuser_at,act_out_user_at,act_inner_user_at,plan_ouser_workload,plan_iuser_workload,act_ouser_workload,act_iuser_workload,plan_nouser_at,act_nouser_at,id;
+ * project_id,project_name,task_type,plan_workload,plan_amount,act_workload,act_amount,branch_id,biz_date,calc_time,plan_ouser_at,plan_iuser_at,act_ouser_at,act_iuser_at,plan_ouser_workload,plan_iuser_workload,act_ouser_workload,act_iuser_workload,plan_nouser_at,act_nouser_at,id;
* 当前主键(包括多主键):
* id;
*/ diff --git a/xm-core/src/main/java/com/xm/core/service/XmPhaseService.java b/xm-core/src/main/java/com/xm/core/service/XmPhaseService.java index 178e6543..e7fd0525 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmPhaseService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmPhaseService.java @@ -19,7 +19,7 @@ import java.util.stream.Collectors; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
- * 实体 XmProjectPhase 表 XM.xm_project_phase 当前主键(包括多主键): id; + * 实体 XmProjectPhase 表 XM.xm_phase 当前主键(包括多主键): id; ***/ @Service("xm.core.xmProjectPhaseService") public class XmPhaseService extends BaseService { @@ -548,13 +548,13 @@ public class XmPhaseService extends BaseService { * res2.id, * res2.phase_budget_workload, * res2.phase_budget_nouser_at, - * res2.phase_budget_inner_user_at, - * res2.phase_budget_out_user_at, + * res2.phase_budget_iuser_at, + * res2.phase_budget_ouser_at, * res2.phase_budget_at, * res0.child_phase_budget_workload, * res0.child_phase_budget_nouser_at, - * res0.child_phase_budget_inner_user_at, - * res0.child_phase_budget_out_user_at, + * res0.child_phase_budget_iuser_at, + * res0.child_phase_budget_ouser_at, * res0.child_phase_budget_at * @param parentPhaseId * @param phaseBudgetCost diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java index d26d761d..c2c505ed 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java @@ -58,9 +58,9 @@ public class XmTaskService extends BaseService { return i2; } - public Map selectTotalPhaseAndTaskBudgetCost(String projectPhaseId, List excludeTaskIds){ + public Map selectTotalPhaseAndTaskBudgetCost(String phaseId, List excludeTaskIds){ Map p=new HashMap<>(); - p.put("projectPhaseId", projectPhaseId); + p.put("phaseId", phaseId); p.put("excludeTaskIds", excludeTaskIds); return this.selectOne("selectTotalPhaseAndTaskBudgetCost", p); } @@ -69,13 +69,13 @@ public class XmTaskService extends BaseService { * @param addTaskBudgetCost * @return */ - public Tips judgetPhaseBudget(String projectPhaseId, BigDecimal addTaskBudgetCost, BigDecimal addTaskBudgetIuserAt, BigDecimal addTaskBudgetOuserAt, BigDecimal addTaskBudgetNouserAt, List excludeTaskIds){ + public Tips judgetPhaseBudget(String phaseId, BigDecimal addTaskBudgetCost, BigDecimal addTaskBudgetIuserAt, BigDecimal addTaskBudgetOuserAt, BigDecimal addTaskBudgetNouserAt, List excludeTaskIds){ Tips tips=new Tips("成功"); - if(!StringUtils.hasText(projectPhaseId)){ - tips.setFailureMsg("projectPhaseId参数不能为空"); + if(!StringUtils.hasText(phaseId)){ + tips.setFailureMsg("phaseId参数不能为空"); return tips; } - Map g=this.selectTotalPhaseAndTaskBudgetCost(projectPhaseId,excludeTaskIds); + Map g=this.selectTotalPhaseAndTaskBudgetCost(phaseId,excludeTaskIds); if(g==null || g.isEmpty()){ return tips; } diff --git a/xm-core/src/main/java/com/xm/core/vo/BatchRelTasksWithPhase.java b/xm-core/src/main/java/com/xm/core/vo/BatchRelTasksWithPhase.java index 1135efd8..4ebf8fb2 100644 --- a/xm-core/src/main/java/com/xm/core/vo/BatchRelTasksWithPhase.java +++ b/xm-core/src/main/java/com/xm/core/vo/BatchRelTasksWithPhase.java @@ -4,16 +4,16 @@ import java.util.List; public class BatchRelTasksWithPhase { - String projectPhaseId; + String phaseId; List taskIds; public String getPhaseId() { - return projectPhaseId; + return phaseId; } - public void setPhaseId(String projectPhaseId) { - this.projectPhaseId = projectPhaseId; + public void setPhaseId(String phaseId) { + this.phaseId = phaseId; } public List getTaskIds() { diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml index 87b4f11d..aab109b5 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml @@ -30,14 +30,14 @@ sum( ifnull( total_need_col_amount, 0 ) ) total_need_col_amount, sum( ifnull( total_finish_col_amount, 0 ) ) total_finish_col_amount, sum( ifnull( total_cost_user_amount, 0 ) ) total_cost_user_amount, - sum( ifnull( total_budget_inner_user_amount, 0 ) ) total_budget_inner_user_amount, + sum( ifnull( total_budget_iuser_amount, 0 ) ) total_budget_iuser_amount, sum( ifnull( total_plan_workload, 0 ) ) total_plan_workload, sum( ifnull( total_risk_cnt, 0 ) ) total_risk_cnt, sum( ifnull( total_complete_risk_cnt, 0 ) ) total_complete_risk_cnt, - sum( ifnull( total_budget_out_user_amount, 0 ) ) total_budget_out_user_amount, + sum( ifnull( total_budget_ouser_amount, 0 ) ) total_budget_ouser_amount, sum( ifnull( total_complete_workload, 0 ) ) total_complete_workload, - sum( ifnull( total_cost_inner_user_amount, 0 ) ) total_cost_inner_user_amount, - sum( ifnull( total_cost_out_user_amount, 0 ) ) total_cost_out_user_amount, + sum( ifnull( total_cost_iuser_amount, 0 ) ) total_cost_iuser_amount, + sum( ifnull( total_cost_ouser_amount, 0 ) ) total_cost_ouser_amount, sum( ifnull( total_progress, 0 ) )/count(1) total_progress, sum( ifnull( total_active_bug_cnt, 0 ) ) total_active_bug_cnt, sum( ifnull( total_confirmed_bug_cnt, 0 ) ) total_confirmed_bug_cnt, @@ -51,8 +51,8 @@ sum( ifnull( total_finish_pay_cnt, 0 ) ) total_finish_pay_cnt, sum( ifnull( total_finish_pay_user_cnt, 0 ) ) total_finish_pay_user_cnt, sum( ifnull( total_need_pay_user_cnt, 0 ) ) total_need_pay_user_cnt, - sum( ifnull( total_plan_inner_user_workload, 0 ) ) total_plan_inner_user_workload, - sum( ifnull( total_plan_out_user_workload, 0 ) ) total_plan_out_user_workload, + sum( ifnull( total_plan_iuser_workload, 0 ) ) total_plan_iuser_workload, + sum( ifnull( total_plan_ouser_workload, 0 ) ) total_plan_ouser_workload, sum( ifnull( test_cases, 0 ) ) test_cases, sum( ifnull( exec_cases, 0 ) ) exec_cases, sum( ifnull( design_cases, 0 ) ) design_cases, diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchTaskTypeStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchTaskTypeStateMapper.xml index 171dfedd..686987b8 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchTaskTypeStateMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchTaskTypeStateMapper.xml @@ -134,7 +134,7 @@ - task_type,plan_workload,plan_amount,act_workload,act_amount,branch_id,biz_date,calc_time,plan_ouser_at,plan_iuser_at,act_out_user_at,act_inner_user_at,plan_ouser_workload,plan_iuser_workload,act_ouser_workload,act_iuser_workload,plan_nouser_at,act_nouser_at,id,branch_name + task_type,plan_workload,plan_amount,act_workload,act_amount,branch_id,biz_date,calc_time,plan_ouser_at,plan_iuser_at,act_ouser_at,act_iuser_at,plan_ouser_workload,plan_iuser_workload,act_ouser_workload,act_iuser_workload,plan_nouser_at,act_nouser_at,id,branch_name @@ -149,8 +149,8 @@ and date_format(res.calc_time,'%Y-%m-%d') = date_format(#{calcTime},'%Y-%m-%d') and res.plan_ouser_at = #{planOuserAt} and res.plan_iuser_at = #{planIuserAt} - and res.act_out_user_at = #{actOutUserAt} - and res.act_inner_user_at = #{actInnerUserAt} + and res.act_ouser_at = #{actOutUserAt} + and res.act_iuser_at = #{actInnerUserAt} and res.plan_ouser_workload = #{planOuserWorkload} and res.plan_iuser_workload = #{planIuserWorkload} and res.act_ouser_workload = #{actOuserWorkload} @@ -172,8 +172,8 @@ calc_time = #{calcTime}, plan_ouser_at = #{planOuserAt}, plan_iuser_at = #{planIuserAt}, - act_out_user_at = #{actOutUserAt}, - act_inner_user_at = #{actInnerUserAt}, + act_ouser_at = #{actOutUserAt}, + act_iuser_at = #{actInnerUserAt}, plan_ouser_workload = #{planOuserWorkload}, plan_iuser_workload = #{planIuserWorkload}, act_ouser_workload = #{actOuserWorkload}, @@ -193,8 +193,8 @@ calc_time = #{calcTime}, plan_ouser_at = #{planOuserAt}, plan_iuser_at = #{planIuserAt}, - act_out_user_at = #{actOutUserAt}, - act_inner_user_at = #{actInnerUserAt}, + act_ouser_at = #{actOutUserAt}, + act_iuser_at = #{actInnerUserAt}, plan_ouser_workload = #{planOuserWorkload}, plan_iuser_workload = #{planIuserWorkload}, act_ouser_workload = #{actOuserWorkload}, @@ -215,8 +215,8 @@ calc_time = #{item.calcTime}, plan_ouser_at = #{item.planOuserAt}, plan_iuser_at = #{item.planIuserAt}, - act_out_user_at = #{item.actOutUserAt}, - act_inner_user_at = #{item.actInnerUserAt}, + act_ouser_at = #{item.actOutUserAt}, + act_iuser_at = #{item.actInnerUserAt}, plan_ouser_workload = #{item.planOuserWorkload}, plan_iuser_workload = #{item.planIuserWorkload}, act_ouser_workload = #{item.actOuserWorkload}, 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 6001a2ba..228cb057 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 @@ -69,7 +69,7 @@ SELECT - sum( ifnull(res.phase_budget_workload,0) ) AS phase_budget_workload, - sum( ifnull(res.phase_budget_nouser_at,0) ) AS phase_budget_nouser_at, - sum( ifnull(res.phase_budget_inner_user_at,0) ) AS phase_budget_inner_user_at, - sum( ifnull(res.phase_budget_out_user_at,0) ) AS phase_budget_out_user_at, - sum( ifnull(res.phase_budget_at,0) ) AS phase_budget_at, + sum( ifnull(res.budget_workload,0) ) AS budget_workload, + sum( ifnull(res.budget_nouser_at,0) ) AS budget_nouser_at, + sum( ifnull(res.budget_iuser_at,0) ) AS budget_iuser_at, + sum( ifnull(res.budget_ouser_at,0) ) AS budget_ouser_at, + sum( ifnull(res.budget_at,0) ) AS budget_at, p.plan_nouser_at, - p.plan_inner_user_at, - p.plan_out_user_at, + p.plan_iuser_at, + p.plan_ouser_at, p.locked, p.plan_workload, p.total_receivables, p.budget_margin_rate, p.contract_amt, - p.plan_inner_user_price, - p.plan_out_user_price, - p.plan_out_user_cnt, - p.plan_inner_user_cnt, + p.plan_iuser_price, + p.plan_ouser_price, + p.plan_ouser_cnt, + p.plan_iuser_cnt, p.plan_working_hours, p.plan_total_cost FROM XM.xm_project p - LEFT JOIN XM.xm_project_phase res + LEFT JOIN XM.xm_phase res ON p.id = res.project_id and res.lvl=1 and res.id not in @@ -60,11 +60,11 @@ select res2.id, - res2.phase_budget_workload, - res2.phase_budget_nouser_at, - res2.phase_budget_inner_user_at, - res2.phase_budget_out_user_at, - res2.phase_budget_at, - res0.child_phase_budget_workload, - res0.child_phase_budget_nouser_at, - res0.child_phase_budget_inner_user_at, - res0.child_phase_budget_out_user_at, - res0.child_phase_budget_at - from xm_project_phase res2 left join + res2.budget_workload, + res2.budget_nouser_at, + res2.budget_iuser_at, + res2.budget_ouser_at, + res2.budget_at, + res0.child_budget_workload, + res0.child_budget_nouser_at, + res0.child_budget_iuser_at, + res0.child_budget_ouser_at, + res0.child_budget_at + from xm_phase res2 left join ( SELECT - res.parent_phase_id, - sum( ifnull(res.phase_budget_workload,0) ) AS child_phase_budget_workload, - sum( ifnull(res.phase_budget_nouser_at,0) ) AS child_phase_budget_nouser_at, - sum( ifnull(res.phase_budget_inner_user_at,0) ) AS child_phase_budget_inner_user_at, - sum( ifnull(res.phase_budget_out_user_at,0) ) AS child_phase_budget_out_user_at, - sum( ifnull(res.phase_budget_at,0) ) AS child_phase_budget_at - FROM xm_project_phase res where res.parent_phase_id=#{id} + res.parent_id, + sum( ifnull(res.budget_workload,0) ) AS child_budget_workload, + sum( ifnull(res.budget_nouser_at,0) ) AS child_budget_nouser_at, + sum( ifnull(res.budget_iuser_at,0) ) AS child_budget_iuser_at, + sum( ifnull(res.budget_ouser_at,0) ) AS child_budget_ouser_at, + sum( ifnull(res.budget_at,0) ) AS child_budget_at + FROM xm_phase res where res.parent_id=#{id} and res.id not in #{item} - group by res.parent_phase_id - ) as res0 on res0.parent_phase_id=res2.id + group by res.parent_id + ) as res0 on res0.parent_id=res2.id where res2.id=#{id} - {call load_tasks_to_xm_project_phase(#{projectId,mode=IN})} + {call load_tasks_to_xm_phase(#{projectId,mode=IN})} @@ -122,29 +122,29 @@ - UPDATE xm_project_phase t - LEFT JOIN ( SELECT count( 1 ) AS children_cnt, tt.parent_phase_id AS id FROM xm_project_phase tt WHERE tt.parent_phase_id = #{id} ) t2 ON t2.id = t.id + UPDATE xm_phase t + LEFT JOIN ( SELECT count( 1 ) AS children_cnt, tt.parent_id AS id FROM xm_phase tt WHERE tt.parent_id = #{id} ) t2 ON t2.id = t.id SET t.children_cnt = ifnull( t2.children_cnt, 0 ) WHERE t.id = #{id} - UPDATE xm_project_phase t - LEFT JOIN ( SELECT count( 1 ) AS children_cnt, tt.parent_phase_id AS id FROM xm_project_phase tt WHERE - (tt.parent_phase_id) in + UPDATE xm_phase t + LEFT JOIN ( SELECT count( 1 ) AS children_cnt, tt.parent_id AS id FROM xm_phase tt WHERE + (tt.parent_id) in ( #{item}) - group by tt.parent_phase_id ) t2 ON t2.id = t.id + group by tt.parent_id ) t2 ON t2.id = t.id SET t.children_cnt = ifnull( t2.children_cnt, 0 ) WHERE (t.id) in @@ -154,32 +154,32 @@ - UPDATE XM.xm_project_phase res + UPDATE XM.xm_phase res LEFT JOIN ( SELECT t.project_id, - t.parent_phase_id, + t.parent_id, count(1) as children_cnt, - sum(t.phase_act_inner_user_workload) as phase_act_inner_user_workload, - sum(t.phase_act_out_user_workload) as phase_act_out_user_workload, - sum(t.phase_act_workload) as phase_act_workload, - sum(t.act_inner_user_at) as act_inner_user_at, - sum(t.act_out_user_at) as act_out_user_at, + sum(t.act_iuser_workload) as act_iuser_workload, + sum(t.act_ouser_workload) as act_ouser_workload, + sum(t.act_workload) as act_workload, + sum(t.act_iuser_at) as act_iuser_at, + sum(t.act_ouser_at) as act_ouser_at, sum(ifnull(t.act_rate,0)*ifnull(t.task_budget_workload,0)) as task_budget_workload_act_rate, sum(t.task_budget_workload) as task_budget_workload, sum(t.task_budget_at) as task_budget_at - FROM xm_project_phase t + FROM xm_phase t WHERE - t.parent_phase_id=#{item} + t.parent_id=#{item} GROUP BY t.project_id, - t.parent_phase_id - ) AS tc ON res.project_id = tc.project_id and res.id=tc.parent_phase_id - SET res.phase_act_inner_user_workload = tc.phase_act_inner_user_workload, - res.phase_act_out_user_workload = tc.phase_act_out_user_workload, - res.phase_act_workload = tc.phase_act_workload, - res.act_inner_user_at = tc.act_inner_user_at, - res.act_out_user_at = tc.act_out_user_at, + t.parent_id + ) AS tc ON res.project_id = tc.project_id and res.id=tc.parent_id + SET res.act_iuser_workload = tc.act_iuser_workload, + res.act_ouser_workload = tc.act_ouser_workload, + res.act_workload = tc.act_workload, + res.act_iuser_at = tc.act_iuser_at, + res.act_ouser_at = tc.act_ouser_at, res.act_rate= case when tc.task_budget_workload_act_rate=0 then 0 else tc.task_budget_workload_act_rate / tc.task_budget_workload end, res.task_budget_workload=tc.task_budget_workload, res.task_budget_at=tc.task_budget_at, @@ -189,35 +189,35 @@ - UPDATE XM.xm_project_phase res + UPDATE XM.xm_phase res LEFT JOIN ( SELECT t.project_id, - t.parent_phase_id, + t.parent_id, count(1) as children_cnt, - sum(t.phase_act_inner_user_workload) as phase_act_inner_user_workload, - sum(t.phase_act_out_user_workload) as phase_act_out_user_workload, - sum(t.phase_act_workload) as phase_act_workload, - sum(t.act_inner_user_at) as act_inner_user_at, - sum(t.act_out_user_at) as act_out_user_at, + sum(t.act_iuser_workload) as act_iuser_workload, + sum(t.act_ouser_workload) as act_ouser_workload, + sum(t.act_workload) as act_workload, + sum(t.act_iuser_at) as act_iuser_at, + sum(t.act_ouser_at) as act_ouser_at, sum(ifnull(t.act_rate,0)*ifnull(t.task_budget_workload,0)) as task_budget_workload_act_rate, sum(t.task_budget_workload) as task_budget_workload, sum(t.task_budget_at) as task_budget_at - FROM xm_project_phase t + FROM xm_phase t WHERE - t.parent_phase_id in + t.parent_id in #{item} GROUP BY t.project_id, - t.parent_phase_id - ) AS tc ON res.project_id = tc.project_id and res.id=tc.parent_phase_id - SET res.phase_act_inner_user_workload = tc.phase_act_inner_user_workload, - res.phase_act_out_user_workload = tc.phase_act_out_user_workload, - res.phase_act_workload = tc.phase_act_workload, - res.act_inner_user_at = tc.act_inner_user_at, - res.act_out_user_at = tc.act_out_user_at, + t.parent_id + ) AS tc ON res.project_id = tc.project_id and res.id=tc.parent_id + SET res.act_iuser_workload = tc.act_iuser_workload, + res.act_ouser_workload = tc.act_ouser_workload, + res.act_workload = tc.act_workload, + res.act_iuser_at = tc.act_iuser_at, + res.act_ouser_at = tc.act_ouser_at, res.act_rate= case when tc.task_budget_workload_act_rate=0 then 0 else tc.task_budget_workload_act_rate / tc.task_budget_workload end, res.task_budget_workload=tc.task_budget_workload, res.task_budget_at=tc.task_budget_at, @@ -230,7 +230,7 @@ and res.ntype='1' - update xm_task res set res.project_phase_id = #{projectPhaseId} where res.id in + update xm_task res set res.phase_id = #{phaseId} where res.id in #{item} @@ -250,7 +250,7 @@ - select (select sum(1) from xm_project_phase p where p.parent_phase_id = res.id) as children_cnt,res.* from xm_project_phase res + select (select sum(1) from xm_phase p where p.parent_id = res.id) as children_cnt,res.* from xm_phase res @@ -268,7 +268,7 @@ @@ -353,7 +353,7 @@ - id,name,remark,parent_id,branch_id,project_id,begin_date,end_date,budget_hours,budget_staff_nu,ctime,budget_nouser_at,budget_iuser_at,budget_ouser_at,baseline_id,biz_proc_inst_id,biz_flow_state,budget_workload,act_workload,act_iuser_workload,act_ouser_workload,task_type,plan_type,seq_no,budget_iuser_workload,budget_ouser_workload,act_nouser_at,act_iuser_at,budget_iuser_price,budget_ouser_price,budget_ouser_cnt,budget_iuser_cnt,act_rate,pstatus,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,phase_class,product_id,budget_at,calc_type,act_at + id,name,remark,parent_id,branch_id,project_id,begin_date,end_date,budget_hours,budget_staff_nu,ctime,budget_nouser_at,budget_iuser_at,budget_ouser_at,baseline_id,biz_proc_inst_id,biz_flow_state,budget_workload,act_workload,act_iuser_workload,act_ouser_workload,task_type,plan_type,seq_no,budget_iuser_workload,budget_ouser_workload,act_nouser_at,act_iuser_at,budget_iuser_price,budget_ouser_price,budget_ouser_cnt,budget_iuser_cnt,act_rate,pstatus,act_ouser_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,phase_class,product_id,budget_at,calc_type,act_at @@ -392,7 +392,7 @@ and res.budget_iuser_cnt = #{budgetIuserCnt} and res.act_rate = #{actRate} and res.pstatus = #{pstatus} - and res.act_out_user_at = #{actOuserAt} + and res.act_ouser_at = #{actOuserAt} and res.task_cnt = #{taskCnt} and res.finish_task_cnt = #{finishTaskCnt} and res.iteration_cnt = #{iterationCnt} @@ -453,7 +453,7 @@ budget_iuser_cnt = #{budgetIuserCnt}, act_rate = #{actRate}, pstatus = #{pstatus}, - act_out_user_at = #{actOuserAt}, + act_ouser_at = #{actOuserAt}, task_cnt = #{taskCnt}, finish_task_cnt = #{finishTaskCnt}, iteration_cnt = #{iterationCnt}, @@ -513,7 +513,7 @@ budget_iuser_cnt = #{budgetIuserCnt}, act_rate = #{actRate}, pstatus = #{pstatus}, - act_out_user_at = #{actOuserAt}, + act_ouser_at = #{actOuserAt}, task_cnt = #{taskCnt}, finish_task_cnt = #{finishTaskCnt}, iteration_cnt = #{iterationCnt}, @@ -574,7 +574,7 @@ budget_iuser_cnt = #{item.budgetIuserCnt}, act_rate = #{item.actRate}, pstatus = #{item.pstatus}, - act_out_user_at = #{item.actOuserAt}, + act_ouser_at = #{item.actOuserAt}, task_cnt = #{item.taskCnt}, finish_task_cnt = #{item.finishTaskCnt}, iteration_cnt = #{item.iterationCnt}, diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostNouserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostNouserMapper.xml index 4334eda3..963b6897 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostNouserMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostNouserMapper.xml @@ -70,17 +70,17 @@ SELECT sum( ifnull(res.budget_cost,0) ) AS budget_cost, p.plan_nouser_at, - p.plan_inner_user_at, - p.plan_out_user_at, + p.plan_iuser_at, + p.plan_ouser_at, p.locked, p.plan_workload, p.total_receivables, p.budget_margin_rate, p.contract_amt, - p.plan_inner_user_price, - p.plan_out_user_price, - p.plan_out_user_cnt, - p.plan_inner_user_cnt, + p.plan_iuser_price, + p.plan_ouser_price, + p.plan_ouser_cnt, + p.plan_iuser_cnt, p.plan_working_hours FROM XM.xm_project p diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostUserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostUserMapper.xml index 32cbf3f4..af3aaa5f 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostUserMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostUserMapper.xml @@ -71,21 +71,21 @@ SELECT - sum( case when res.cost_type='1' then ifnull(res.act_cost_amount,0) else 0 end ) AS act_cost_inner_user_amount, - sum( case when res.cost_type='2' then ifnull(res.act_cost_amount,0) else 0 end ) AS act_cost_out_user_amount, + sum( case when res.cost_type='1' then ifnull(res.act_cost_amount,0) else 0 end ) AS act_cost_iuser_amount, + sum( case when res.cost_type='2' then ifnull(res.act_cost_amount,0) else 0 end ) AS act_cost_ouser_amount, sum( ifnull(res.act_cost_amount,0) ) AS act_cost_user_amount, p.plan_nouser_at, - p.plan_inner_user_at, - p.plan_out_user_at, + p.plan_iuser_at, + p.plan_ouser_at, p.locked, p.plan_workload, p.total_receivables, p.budget_margin_rate, p.contract_amt, - p.plan_inner_user_price, - p.plan_out_user_price, - p.plan_out_user_cnt, - p.plan_inner_user_cnt, + p.plan_iuser_price, + p.plan_ouser_price, + p.plan_ouser_cnt, + p.plan_iuser_cnt, p.plan_working_hours FROM XM.xm_project p diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml index 2673b6ab..49d3ccf4 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml @@ -119,11 +119,11 @@ SELECT - p.phase_budget_nouser_at, - p.phase_budget_inner_user_at, - p.phase_budget_out_user_at, - p.phase_budget_at, - p.phase_budget_workload, - p.phase_budget_hours, - p.phase_budget_staff_nu, + p.budget_nouser_at, + p.budget_iuser_at, + p.budget_ouser_at, + p.budget_at, + p.budget_workload, + p.budget_hours, + p.budget_staff_nu, tc.* - FROM xm_project_phase p LEFT JOIN + FROM xm_phase p LEFT JOIN (select - res.project_phase_id, + res.phase_id, sum( ifnull(res.budget_cost,0) ) AS budget_cost, - sum( case when res.task_out='1' then ifnull(res.budget_cost,0) else 0 end ) AS task_budget_out_user_at, - sum( case when res.task_out='1' then 0 else ifnull(res.budget_cost,0) end ) AS task_budget_inner_user_at, + sum( case when res.task_out='1' then ifnull(res.budget_cost,0) else 0 end ) AS task_budget_ouser_at, + sum( case when res.task_out='1' then 0 else ifnull(res.budget_cost,0) end ) AS task_budget_iuser_at, sum(0) AS task_budget_nouser_at, sum( res.budget_workload ) AS budget_workload from - xm_task res where res.project_phase_id=#{projectPhaseId} and res.lvl=1 + xm_task res where res.phase_id=#{phaseId} and res.lvl=1 and res.id not in #{item} - ) as tc ON p.id = tc.project_phase_id + ) as tc ON p.id = tc.phase_id WHERE - p.id = #{projectPhaseId} + p.id = #{phaseId} diff --git a/xm-core/src/test/java/com/xm/core/TestXmProjectStateService.java b/xm-core/src/test/java/com/xm/core/TestXmProjectStateService.java index ea04164f..153faa93 100644 --- a/xm-core/src/test/java/com/xm/core/TestXmProjectStateService.java +++ b/xm-core/src/test/java/com/xm/core/TestXmProjectStateService.java @@ -24,7 +24,7 @@ import org.springframework.boot.test.context.SpringBootTest; * 当前实体所有属性名:
* projectId,bizDate,totalFileCnt,totalBugCnt,totalTaskCnt,totalBudgetNouserAmount,projectName,id,totalStaffCnt,calCtime,calStatus,totalCostNouserAmount,totalClosedBugCnt,totalResolvedBugCnt,totalCompleteTaskCnt,totalPhaseCnt,totalCompletePhaseCnt,totalNeedPayAmount,totalFinishPayAmount,totalNeedColAmount,totalFinishColAmount,totalCostUserAmount,totalBudgetIuserAmount,totalPlanWorkload,totalRiskCnt,totalCompleteRiskCnt,branchId,branchName,totalBudgetOuserAmount,totalCompleteWorkload,todayNewBugCnt,todayResolvedBugCnt,todayClosedBugCnt,todayNewTaskCnt,todayCompleteTaskCnt,todayNewPhaseCnt,todayCompletePhaseCnt,todayNewStaffCnt,todaySubStaffCnt,todayNewPlanWorkload,todayNewActWorkload,todayNeedColAmount,todayFinishColAmount,todayCostUserAmount,todayCostIuserAmount,todayCostOuserAmount,todayCostNouserAmount,totalCostIuserAmount,totalCostOuserAmount,todayNeedPayAmount,todayFinishPayAmount,todayNewRiskCnt,todayCompleteRiskCnt,todayNewFileCnt,totalProgress,totalActiveBugCnt,totalConfirmedBugCnt,projectStatus,totalActWorkload,totalActOutWorkload,totalActInnerWorkload,totalTaskBudgetCostAt,totalTaskOutCnt,totalNeedPayCnt,totalFinishPayCnt,todayConfirmedBugCnt,todayActiveBugCnt,totalFinishPayUserCnt,totalNeedPayUserCnt,todayNeedPayUserCnt,todayFinishPayUserCnt;
* 当前表的所有字段名:
- * project_id,biz_date,total_file_cnt,total_bug_cnt,total_task_cnt,total_budget_nouser_amount,project_name,id,total_staff_cnt,cal_ctime,cal_status,total_cost_nouser_amount,total_closed_bug_cnt,total_resolved_bug_cnt,total_complete_task_cnt,total_phase_cnt,total_complete_phase_cnt,total_need_pay_amount,total_finish_pay_amount,total_need_col_amount,total_finish_col_amount,total_cost_user_amount,total_budget_inner_user_amount,total_plan_workload,total_risk_cnt,total_complete_risk_cnt,branch_id,branch_name,total_budget_out_user_amount,total_complete_workload,today_new_bug_cnt,today_resolved_bug_cnt,today_closed_bug_cnt,today_new_task_cnt,today_complete_task_cnt,today_new_phase_cnt,today_complete_phase_cnt,today_new_staff_cnt,today_sub_staff_cnt,today_new_plan_workload,today_new_act_workload,today_need_col_amount,today_finish_col_amount,today_cost_user_amount,today_cost_inner_user_amount,today_cost_out_user_amount,today_cost_nouser_amount,total_cost_inner_user_amount,total_cost_out_user_amount,today_need_pay_amount,today_finish_pay_amount,today_new_risk_cnt,today_complete_risk_cnt,today_new_file_cnt,total_progress,total_active_bug_cnt,total_confirmed_bug_cnt,project_status,total_act_workload,total_act_out_workload,total_act_inner_workload,total_task_budget_cost_at,total_task_out_cnt,total_need_pay_cnt,total_finish_pay_cnt,today_confirmed_bug_cnt,today_active_bug_cnt,total_finish_pay_user_cnt,total_need_pay_user_cnt,today_need_pay_user_cnt,today_finish_pay_user_cnt;
+ * project_id,biz_date,total_file_cnt,total_bug_cnt,total_task_cnt,total_budget_nouser_amount,project_name,id,total_staff_cnt,cal_ctime,cal_status,total_cost_nouser_amount,total_closed_bug_cnt,total_resolved_bug_cnt,total_complete_task_cnt,total_phase_cnt,total_complete_phase_cnt,total_need_pay_amount,total_finish_pay_amount,total_need_col_amount,total_finish_col_amount,total_cost_user_amount,total_budget_iuser_amount,total_plan_workload,total_risk_cnt,total_complete_risk_cnt,branch_id,branch_name,total_budget_ouser_amount,total_complete_workload,today_new_bug_cnt,today_resolved_bug_cnt,today_closed_bug_cnt,today_new_task_cnt,today_complete_task_cnt,today_new_phase_cnt,today_complete_phase_cnt,today_new_staff_cnt,today_sub_staff_cnt,today_new_plan_workload,today_new_act_workload,today_need_col_amount,today_finish_col_amount,today_cost_user_amount,today_cost_iuser_amount,today_cost_ouser_amount,today_cost_nouser_amount,total_cost_iuser_amount,total_cost_ouser_amount,today_need_pay_amount,today_finish_pay_amount,today_new_risk_cnt,today_complete_risk_cnt,today_new_file_cnt,total_progress,total_active_bug_cnt,total_confirmed_bug_cnt,project_status,total_act_workload,total_act_out_workload,total_act_inner_workload,total_task_budget_cost_at,total_task_out_cnt,total_need_pay_cnt,total_finish_pay_cnt,today_confirmed_bug_cnt,today_active_bug_cnt,total_finish_pay_user_cnt,total_need_pay_user_cnt,today_need_pay_user_cnt,today_finish_pay_user_cnt;
* 当前主键(包括多主键):
* id;
***/ diff --git a/xm-core/src/test/java/com/xm/push/TestXmPushMsgService.java b/xm-core/src/test/java/com/xm/push/TestXmPushMsgService.java index 891b354a..cc615342 100644 --- a/xm-core/src/test/java/com/xm/push/TestXmPushMsgService.java +++ b/xm-core/src/test/java/com/xm/push/TestXmPushMsgService.java @@ -26,7 +26,7 @@ import org.springframework.boot.test.context.SpringBootTest; * 当前实体所有属性名:
* projectId,bizDate,totalFileCnt,totalBugCnt,totalTaskCnt,totalBudgetNouserAmount,projectName,id,totalStaffCnt,calCtime,calStatus,totalCostNouserAmount,totalClosedBugCnt,totalResolvedBugCnt,totalCompleteTaskCnt,totalPhaseCnt,totalCompletePhaseCnt,totalNeedPayAmount,totalFinishPayAmount,totalNeedColAmount,totalFinishColAmount,totalCostUserAmount,totalBudgetIuserAmount,totalPlanWorkload,totalRiskCnt,totalCompleteRiskCnt,branchId,branchName,totalBudgetOuserAmount,totalCompleteWorkload,todayNewBugCnt,todayResolvedBugCnt,todayClosedBugCnt,todayNewTaskCnt,todayCompleteTaskCnt,todayNewPhaseCnt,todayCompletePhaseCnt,todayNewStaffCnt,todaySubStaffCnt,todayNewPlanWorkload,todayNewActWorkload,todayNeedColAmount,todayFinishColAmount,todayCostUserAmount,todayCostIuserAmount,todayCostOuserAmount,todayCostNouserAmount,totalCostIuserAmount,totalCostOuserAmount,todayNeedPayAmount,todayFinishPayAmount,todayNewRiskCnt,todayCompleteRiskCnt,todayNewFileCnt,totalProgress,totalActiveBugCnt,totalConfirmedBugCnt,projectStatus,totalActWorkload,totalActOutWorkload,totalActInnerWorkload,totalTaskBudgetCostAt,totalTaskOutCnt,totalNeedPayCnt,totalFinishPayCnt,todayConfirmedBugCnt,todayActiveBugCnt,totalFinishPayUserCnt,totalNeedPayUserCnt,todayNeedPayUserCnt,todayFinishPayUserCnt;
* 当前表的所有字段名:
- * project_id,biz_date,total_file_cnt,total_bug_cnt,total_task_cnt,total_budget_nouser_amount,project_name,id,total_staff_cnt,cal_ctime,cal_status,total_cost_nouser_amount,total_closed_bug_cnt,total_resolved_bug_cnt,total_complete_task_cnt,total_phase_cnt,total_complete_phase_cnt,total_need_pay_amount,total_finish_pay_amount,total_need_col_amount,total_finish_col_amount,total_cost_user_amount,total_budget_inner_user_amount,total_plan_workload,total_risk_cnt,total_complete_risk_cnt,branch_id,branch_name,total_budget_out_user_amount,total_complete_workload,today_new_bug_cnt,today_resolved_bug_cnt,today_closed_bug_cnt,today_new_task_cnt,today_complete_task_cnt,today_new_phase_cnt,today_complete_phase_cnt,today_new_staff_cnt,today_sub_staff_cnt,today_new_plan_workload,today_new_act_workload,today_need_col_amount,today_finish_col_amount,today_cost_user_amount,today_cost_inner_user_amount,today_cost_out_user_amount,today_cost_nouser_amount,total_cost_inner_user_amount,total_cost_out_user_amount,today_need_pay_amount,today_finish_pay_amount,today_new_risk_cnt,today_complete_risk_cnt,today_new_file_cnt,total_progress,total_active_bug_cnt,total_confirmed_bug_cnt,project_status,total_act_workload,total_act_out_workload,total_act_inner_workload,total_task_budget_cost_at,total_task_out_cnt,total_need_pay_cnt,total_finish_pay_cnt,today_confirmed_bug_cnt,today_active_bug_cnt,total_finish_pay_user_cnt,total_need_pay_user_cnt,today_need_pay_user_cnt,today_finish_pay_user_cnt;
+ * project_id,biz_date,total_file_cnt,total_bug_cnt,total_task_cnt,total_budget_nouser_amount,project_name,id,total_staff_cnt,cal_ctime,cal_status,total_cost_nouser_amount,total_closed_bug_cnt,total_resolved_bug_cnt,total_complete_task_cnt,total_phase_cnt,total_complete_phase_cnt,total_need_pay_amount,total_finish_pay_amount,total_need_col_amount,total_finish_col_amount,total_cost_user_amount,total_budget_iuser_amount,total_plan_workload,total_risk_cnt,total_complete_risk_cnt,branch_id,branch_name,total_budget_ouser_amount,total_complete_workload,today_new_bug_cnt,today_resolved_bug_cnt,today_closed_bug_cnt,today_new_task_cnt,today_complete_task_cnt,today_new_phase_cnt,today_complete_phase_cnt,today_new_staff_cnt,today_sub_staff_cnt,today_new_plan_workload,today_new_act_workload,today_need_col_amount,today_finish_col_amount,today_cost_user_amount,today_cost_iuser_amount,today_cost_ouser_amount,today_cost_nouser_amount,total_cost_iuser_amount,total_cost_ouser_amount,today_need_pay_amount,today_finish_pay_amount,today_new_risk_cnt,today_complete_risk_cnt,today_new_file_cnt,total_progress,total_active_bug_cnt,total_confirmed_bug_cnt,project_status,total_act_workload,total_act_out_workload,total_act_inner_workload,total_task_budget_cost_at,total_task_out_cnt,total_need_pay_cnt,total_finish_pay_cnt,today_confirmed_bug_cnt,today_active_bug_cnt,total_finish_pay_user_cnt,total_need_pay_user_cnt,today_need_pay_user_cnt,today_finish_pay_user_cnt;
* 当前主键(包括多主键):
* id;
***/