From 44e7692f8c24c9549778f1096cb3493c0580c131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Tue, 3 Oct 2023 05:34:48 +0800 Subject: [PATCH] 2.0 --- .../core/mapper/XmBranchStateHisMapper.java | 4 +- .../mapper/XmBranchTaskTypeStateMapper.java | 4 +- .../xm/core/mapper/XmBudgetLaborMapper.java | 4 +- .../xm/core/mapper/XmBudgetNlaborMapper.java | 4 +- .../xm/core/mapper/XmCostNlaborMapper.java | 4 +- .../com/xm/core/mapper/XmEnvListMapper.java | 8 +- .../com/xm/core/mapper/XmIterationMapper.java | 6 +- .../core/mapper/XmIterationStateMapper.java | 4 +- .../xm/core/mapper/XmMenuCommentMapper.java | 8 +- .../java/com/xm/core/mapper/XmMenuMapper.java | 18 +- .../com/xm/core/mapper/XmMenuStateMapper.java | 10 +- .../com/xm/core/mapper/XmMyFocusMapper.java | 4 +- .../com/xm/core/mapper/XmProductMapper.java | 4 +- .../mapper/XmProductProjectLinkMapper.java | 4 +- .../xm/core/mapper/XmProductStateMapper.java | 4 +- .../xm/core/mapper/XmProjectStateMapper.java | 8 +- .../com/xm/core/mapper/XmQuestionMapper.java | 16 +- .../com/xm/core/mapper/XmRecordMapper.java | 10 +- .../com/xm/core/mapper/XmTaskEvalMapper.java | 8 +- .../xm/core/mapper/XmTaskExecuserMapper.java | 6 +- .../java/com/xm/core/mapper/XmTaskMapper.java | 35 +++- .../com/xm/core/mapper/XmTaskSbillMapper.java | 4 +- .../com/xm/core/mapper/XmTaskSkillMapper.java | 4 +- .../com/xm/core/mapper/XmTestCaseMapper.java | 4 +- .../xm/core/mapper/XmTestCasedbMapper.java | 4 +- .../xm/core/mapper/XmTestPlanCaseMapper.java | 12 +- .../com/xm/core/mapper/XmTestPlanMapper.java | 4 +- .../com/xm/core/mapper/XmWorkloadMapper.java | 21 ++- .../xm/core/service/XmAttachmentService.java | 34 ---- .../com/xm/core/service/XmEnvListService.java | 2 +- .../com/xm/core/service/XmFileService.java | 171 ------------------ .../xm/core/service/XmIterationService.java | 4 +- .../xm/core/service/XmMenuCommentService.java | 4 - .../xm/core/service/XmMenuOperQxService.java | 11 +- .../com/xm/core/service/XmMenuService.java | 4 + .../xm/core/service/XmMenuStateService.java | 6 +- .../service/XmProductProjectLinkService.java | 2 +- .../xm/core/service/XmProductQxService.java | 38 ++-- .../service/XmProjectContractService.java | 3 +- .../xm/core/service/XmProjectQxService.java | 38 ++-- .../com/xm/core/service/XmProjectService.java | 15 +- .../XmProjectTaskTypeStateService.java | 1 - .../xm/core/service/XmQuestionService.java | 12 +- .../com/xm/core/service/XmRecordService.java | 8 +- .../xm/core/service/XmTaskEvalService.java | 4 +- .../core/service/XmTaskExecuserService.java | 10 +- .../service/XmTaskSbillDetailService.java | 1 - .../com/xm/core/service/XmTaskService.java | 29 ++- .../xm/core/service/XmTestCaseService.java | 1 - .../core/service/XmTestPlanCaseService.java | 2 +- .../xm/core/service/XmWorkloadService.java | 2 +- 51 files changed, 261 insertions(+), 367 deletions(-) delete mode 100644 xm-core/src/main/java/com/xm/core/service/XmAttachmentService.java delete mode 100644 xm-core/src/main/java/com/xm/core/service/XmFileService.java diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmBranchStateHisMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmBranchStateHisMapper.java index 2e212b11..f4797eb9 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmBranchStateHisMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmBranchStateHisMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmBranchStateHis; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmBranchStateHis; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,6 @@ public interface XmBranchStateHisMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + List> listXmBranchFiveDayTaskCnt(Map xmBranchStateHis); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmBranchTaskTypeStateMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmBranchTaskTypeStateMapper.java index 010a94af..41a1f7cc 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmBranchTaskTypeStateMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmBranchTaskTypeStateMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmBranchTaskTypeState; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmBranchTaskTypeState; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,6 @@ public interface XmBranchTaskTypeStateMapper extends BaseMapper> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + void loadProjectTaskTypeStateToXmBranchTaskTypeState(String branchId); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmBudgetLaborMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmBudgetLaborMapper.java index c34110b0..5f0fd19c 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmBudgetLaborMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmBudgetLaborMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmBudgetLabor; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmBudgetLabor; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,6 @@ public interface XmBudgetLaborMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + List> listSum(Map xmBudgetLabor); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmBudgetNlaborMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmBudgetNlaborMapper.java index 57e01c26..f2769829 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmBudgetNlaborMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmBudgetNlaborMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmBudgetNlabor; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmBudgetNlabor; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,6 @@ public interface XmBudgetNlaborMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + List> listSum(Map xmBudgetNlabor); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmCostNlaborMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmCostNlaborMapper.java index e6fa760e..3de1210b 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmCostNlaborMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmCostNlaborMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmCostNlabor; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmCostNlabor; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,6 @@ public interface XmCostNlaborMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + List> listSum(Map xmCostNlabor); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmEnvListMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmEnvListMapper.java index cf9c7f12..0bdc4360 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmEnvListMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmEnvListMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmEnvList; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmEnvList; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,10 @@ public interface XmEnvListMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + void updateFlowStateByProcInstForDeleteSuccess(Map flowVars); + + void updateProcessApprova(Map flowVars); + + void insertProcessApprova(Map flowVars); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmIterationMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmIterationMapper.java index 8e66364d..671da2de 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmIterationMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmIterationMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmIteration; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmIteration; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,8 @@ public interface XmIterationMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + void load_tasks_to_xm_iteration_state(String inIterationId); + + List> selectListMapByWhereWithState(Map iterationMap); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmIterationStateMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmIterationStateMapper.java index 4738ab23..9749e9bb 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmIterationStateMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmIterationStateMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmIterationState; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmIterationState; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,6 @@ public interface XmIterationStateMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + int loadTasksToXmIterationState(String iterationId); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmMenuCommentMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmMenuCommentMapper.java index 983efb56..e6b729e9 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmMenuCommentMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmMenuCommentMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmMenuComment; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmMenuComment; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,10 @@ public interface XmMenuCommentMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + void showComment(String[] ids); + + void unShowComment(String[] ids); + + void updateChildrenSum(Map map); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmMenuMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmMenuMapper.java index 70e2e635..620234fa 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmMenuMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmMenuMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmMenu; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmMenu; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,20 @@ public interface XmMenuMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + List getUserCanOpMenusByIds(Map map); + + List> selectListMapByWhereWithPlan(Map xmMenu); + + List> selectListMapByWhereWithState(Map xmMenu); + + List> selectListMapByWhereWithPhase(Map xmMenu); + + void updateMenuChildrenCntByMenuId(String menuId); + + void updateChildrenCntByIds(List ids); + + List> queryTaskUsersByMenuId(String menuId); + + List selectExistIterationMenus(Map menuIds); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmMenuStateMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmMenuStateMapper.java index 1abdd812..9d7be452 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmMenuStateMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmMenuStateMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmMenuState; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmMenuState; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,12 @@ public interface XmMenuStateMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + long batchLoadXmMenuToState(Map map); + + void sumParents(List pidPathsList); + + void batchSumParents(List ids); + + int loadTasksToXmMenuState(String productId); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmMyFocusMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmMyFocusMapper.java index d310945a..f3f42929 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmMyFocusMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmMyFocusMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmMyFocus; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmMyFocus; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,6 @@ public interface XmMyFocusMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + List> myFocusForIndex(String userid); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.java index 5c290461..2378adc2 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmProduct; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmProduct; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,6 @@ public interface XmProductMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + List> selectListMapByWhereWithState(Map iterationMap); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmProductProjectLinkMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmProductProjectLinkMapper.java index db28341d..f292ff1f 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmProductProjectLinkMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmProductProjectLinkMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmProductProjectLink; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmProductProjectLink; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,6 @@ public interface XmProductProjectLinkMapper extends BaseMapper> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + List selectListByIterationId(String iterationId); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmProductStateMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmProductStateMapper.java index 826a8950..5ff6835d 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmProductStateMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmProductStateMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmProductState; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmProductState; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,6 @@ public interface XmProductStateMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + int loadTasksToXmProductState(String productId); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmProjectStateMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmProjectStateMapper.java index fd1a081d..7356d758 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmProjectStateMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmProjectStateMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmProjectState; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmProjectState; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,10 @@ public interface XmProjectStateMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + int loadTasksToXmProjectState(String projectId); + + int loadTasksSettleToXmProjectState(String projectId); + + List> selectPortalProjectStates(Map params); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmQuestionMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmQuestionMapper.java index fb1b0370..faa96e6d 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmQuestionMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmQuestionMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmQuestion; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmQuestion; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,18 @@ public interface XmQuestionMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + void insertProcessApprova(Map flowVars); + + void updateFlowStateByProcInstForDeleteSuccess(Map flowVars); + + void updateProcessApprova(Map flowVars); + + List> getXmQuestionAttDist(Map xmQuestion); + + List> getXmQuestionAgeDist(Map xmQuestion); + + List> getXmQuestionSort(Map xmQuestion); + + List> getXmQuestionRetestDist(Map xmQuestion); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmRecordMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmRecordMapper.java index 8e4aaf2b..35154f3a 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmRecordMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmRecordMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmRecord; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmRecord; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,12 @@ public interface XmRecordMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + List selectChangeProjectIds(Map map); + + List selectChangeProductIds(Map map); + + List selectChangeBranchIds(Map map); + + List selectChangeIterationIds(Map map); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmTaskEvalMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmTaskEvalMapper.java index 6e44114b..1c2a3278 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmTaskEvalMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmTaskEvalMapper.java @@ -3,12 +3,13 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.mdp.safe.client.entity.User; +import com.xm.core.entity.MyTotalEval; +import com.xm.core.entity.XmTaskEval; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmTaskEval; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +25,8 @@ public interface XmTaskEvalMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + MyTotalEval getServiceProviderEval(User user); + + MyTotalEval getPersonEval(User user); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmTaskExecuserMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmTaskExecuserMapper.java index 98bcf910..189844a1 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmTaskExecuserMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmTaskExecuserMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmTaskExecuser; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmTaskExecuser; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,8 @@ public interface XmTaskExecuserMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + void updateXmTaskExeUseridsAndUsernamesByTaskId(String taskId); + + List> selectListMapByWhereWithTask(Map params); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmTaskMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmTaskMapper.java index e4e2e5f4..45adb909 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmTaskMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmTaskMapper.java @@ -3,12 +3,12 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmTask; +import com.xm.core.vo.BatchRelTasksWithPhase; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmTask; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +24,36 @@ public interface XmTaskMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + List selectTaskListByIds(Map ids); + + void batchRelTasksWithMenu(Map map); + + void updateChildrenCntByIds(List ids); + + void batchRelTasksWithPhase(BatchRelTasksWithPhase tasksPhase); + + void updateActCostAndActWorkloadAfterSettle(Map map); + + void calcWorkloadByRecord(List ids); + + void batchUpdateBudgetWorkloadAndRate(Map map); + + List> getXmTaskAttDist(Map xmTask); + + List> getXmTaskAgeDist(Map xmTask); + + void upBrowseTimes(Map map); + + void updateSomeFieldByPkAfterPaySuccess(XmTask xmTaskUpdate); + + List> getXmTaskSort(Map xmTask); + + List listTenTaskByProjectIdAndProductId(Map projectId); + + List listTenTaskByProjectIdAndIterationId(Map map); + + void batchChangeParent(Map map); + + void updateTaskChildrenCntByTaskId(String taskId); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmTaskSbillMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmTaskSbillMapper.java index 3349d94d..484d40e0 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmTaskSbillMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmTaskSbillMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmTaskSbill; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmTaskSbill; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,6 @@ public interface XmTaskSbillMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + void updateBySbillDetailList(List sbillIds); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmTaskSkillMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmTaskSkillMapper.java index e19c838c..06783b0e 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmTaskSkillMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmTaskSkillMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmTaskSkill; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmTaskSkill; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,6 @@ public interface XmTaskSkillMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + void updateXmTaskSkillIdsAndNamesByTaskId(String taskId); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmTestCaseMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmTestCaseMapper.java index 1de86484..09e9e5fd 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmTestCaseMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmTestCaseMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmTestCase; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmTestCase; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,6 @@ public interface XmTestCaseMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + List> getXmTestCaseSort(Map xmTestCase); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmTestCasedbMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmTestCasedbMapper.java index cd530ad4..78a39d24 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmTestCasedbMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmTestCasedbMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmTestCasedb; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmTestCasedb; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,6 @@ public interface XmTestCasedbMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + List getExistsPlanCasedbIds(List casedbIds); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmTestPlanCaseMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmTestPlanCaseMapper.java index 9db0823a..5af7f6b9 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmTestPlanCaseMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmTestPlanCaseMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmTestPlanCase; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmTestPlanCase; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,14 @@ public interface XmTestPlanCaseMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + List selectListByCaseIdsAndPlanId(Map map); + + List> getXmTestPlanCaseExecStatusDist(Map xmTestPlanCase); + + List> getXmTestPlanCaseUserDist(Map xmTestPlanCase); + + List> getXmTestDayTimesList(Map xmTestPlanCase); + + List> getXmTestCaseToPlanCalcList(Map xmTestPlanCase); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmTestPlanMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmTestPlanMapper.java index f23447e6..66420a29 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmTestPlanMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmTestPlanMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmTestPlan; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmTestPlan; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,6 @@ public interface XmTestPlanMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + void calcXmTestPlan(String id); } diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmWorkloadMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmWorkloadMapper.java index c6a92052..872405b0 100644 --- a/xm-core/src/main/java/com/xm/core/mapper/XmWorkloadMapper.java +++ b/xm-core/src/main/java/com/xm/core/mapper/XmWorkloadMapper.java @@ -3,12 +3,11 @@ package com.xm.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xm.core.entity.XmWorkload; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; - -import com.xm.core.entity.XmWorkload; /** * @author maimeng-mdp code-gen * @since 2023-10-3 @@ -24,5 +23,23 @@ public interface XmWorkloadMapper extends BaseMapper { */ List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + List> listProjectWorkloadSetDay(Map xmWorkload); + + List> listProjectWorkloadSetMonth(Map xmWorkload); + + List> listTaskWorkloadBySbillIdGroupByUseridAndTaskId(String sbillId); + + void updateStatusBySbillIdBySbillDel(String sbillId); + + void updateStatusBySbillIdByFlowState(Map map); + + List> selectListMapGroupByTaskIdAndUserid(Map xmWorkload); + + + void updateStatusAfterJoinSbill(Map details); + + void updateStatusAfterDetailDel(List detailIds); + + List> listGroupByTaskIdAndUseridToSet(Map xmWorkload); } diff --git a/xm-core/src/main/java/com/xm/core/service/XmAttachmentService.java b/xm-core/src/main/java/com/xm/core/service/XmAttachmentService.java deleted file mode 100644 index 707c5ee4..00000000 --- a/xm-core/src/main/java/com/xm/core/service/XmAttachmentService.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.xm.core.service; - -import com.mdp.core.service.BaseService; -import com.xm.core.entity.XmAttachment; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
- * 实体 XmAttachment 表 XM.xm_attachment 当前主键(包括多主键): id; - ***/ -@Service("xm.core.xmAttachmentService") -public class XmAttachmentService extends BaseService { - - public void insertOrUpdate(String originId,String originType, List attachmentList) { - XmAttachment del = new XmAttachment(); - del.setOriginId(originId); - del.setOriginType(originType); - this.baseMapper.deleteByOrigin(del); - if(attachmentList.size() > 0) { - attachmentList.forEach(attach->{ - attach.setOriginId(originId); - attach.setOriginType(originType); - this.insert(attach); - }); - } - } - - /** 请在此类添加自定义函数 */ - -} - diff --git a/xm-core/src/main/java/com/xm/core/service/XmEnvListService.java b/xm-core/src/main/java/com/xm/core/service/XmEnvListService.java index e6684c1d..4aa525c7 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmEnvListService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmEnvListService.java @@ -98,7 +98,7 @@ public class XmEnvListService extends BaseService { } } flowVars.put("id", this.createKey("id")); - this.insert("insertProcessApprova", flowVars); + this.baseMapper.insertProcessApprova( flowVars); this.updateFlowStateByProcInst("1", flowVars); }else if("PROCESS_COMPLETED".equals(eventName)) { if("1".equals(agree)) { diff --git a/xm-core/src/main/java/com/xm/core/service/XmFileService.java b/xm-core/src/main/java/com/xm/core/service/XmFileService.java deleted file mode 100644 index 8d8a82c4..00000000 --- a/xm-core/src/main/java/com/xm/core/service/XmFileService.java +++ /dev/null @@ -1,171 +0,0 @@ -package com.xm.core.service; - -import com.mdp.core.entity.Tips; -import com.mdp.core.err.BizException; -import com.mdp.core.service.BaseService; -import com.mdp.safe.client.entity.User; -import com.mdp.safe.client.utils.LoginUtils; -import com.xm.core.entity.XmFile; -import com.xm.core.vo.XmFileVo; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
- * 实体 XmFile 表 XM.xm_file 当前主键(包括多主键): id; - ***/ -@Service("xm.core.xmFileService") -public class XmFileService extends BaseService { - - final String Type = "文档"; - - @Autowired - XmAttachmentService xmAttachmentService; - - @Autowired - XmRecordService xmRecordService; - - - /** 请在此类添加自定义函数 */ - - public List> getFile(Map params) { - List> fs = this.selectListMapByWhere(params); - return fs; - } - - public Map updateFile(XmFileVo xmFileVo){ - XmFile xmFile = new XmFile(); - BeanUtils.copyProperties(xmFileVo,xmFile); - this.updateSomeFieldByPk(xmFile); - if(xmFileVo.getAttachment()!=null && xmFileVo.getAttachment().size()>0){ - xmAttachmentService.insertOrUpdate(xmFileVo.getId(),Type,xmFileVo.getAttachment()); - } - return null; - } - - - public XmFileVo addFile(XmFileVo xmFileVo){ - Tips tips = new Tips(); - if(StringUtils.isEmpty(xmFileVo.getId())) { - xmFileVo.setId(this.createKey("id")); - }else{ - XmFile xmFileQuery = new XmFile(xmFileVo.getId()); - if(this.countByWhere(xmFileQuery)>0){ - tips.setFailureMsg("编号重复，请修改编号再提交"); - throw new BizException(tips); - } - } - - User user = LoginUtils.getCurrentUserInfo(); - xmFileVo.setCreateUserid(user.getUserid()); - xmFileVo.setCreateUsername(user.getUsername()); - xmFileVo.setCreateTime(new Date()); - - XmFile xmFile = new XmFile(); - BeanUtils.copyProperties(xmFileVo,xmFile); - this.insert(xmFile); - if(xmFileVo.getAttachment()!=null && xmFileVo.getAttachment().size()>0){ - xmAttachmentService.insertOrUpdate(xmFileVo.getId(),Type,xmFileVo.getAttachment()); - } - xmRecordService.addXmProjectRecord(xmFileVo.getProjectId(), "项目-增加文档", "增加文档"+xmFile.getName()); - return xmFileVo; - } - - public void deleteFile(XmFile xmFile) { - this.deleteByPk(xmFile); - xmRecordService.addXmProjectRecord(xmFile.getProjectId(), "项目-删除文档", "删除文档"+xmFile.getName(),xmFile.getId(),null); - } - - - /** - * 流程审批过程中回调该接口，更新业务数据 - * 如果发起流程时上送了restUrl，则无论流程中是否配置了监听器都会在流程发生以下事件时推送数据过来 - * eventName: PROCESS_STARTED 流程启动完成 全局 - * PROCESS_COMPLETED 流程正常结束 全局 - * PROCESS_CANCELLED 流程删除 全局 - * create 人工任务启动 - * complete 人工任务完成 - * assignment 人工任务分配给了具体的人 - * delete 人工任务被删除 - * TASK_COMPLETED_FORM_DATA_UPDATE 人工任务提交完成后，智能表单数据更新 - * - * 其中 create/complete/assignment/delete事件是需要在模型中人工节点上配置了委托代理表达式 ${taskBizCallListener}才会推送过来。 - * 在人工任务节点上配置 任务监听器 建议事件为 complete,其它assignment/create/complete/delete也可以，一般建议在complete,委托代理表达式 ${taskBizCallListener} - * - * @param flowVars {flowBranchId,agree,procInstId,startUserid,assignee,actId,taskName,mainTitle,branchId,bizKey,commentMsg,eventName,modelKey} 等 - * @return 如果tips.isOk==false，将影响流程提交 - **/ - public void processApprova(Map flowVars) { - String eventName=(String) flowVars.get("eventName"); - String agree=(String) flowVars.get("agree"); - String branchId=(String) flowVars.get("branchId"); - String fileId=(String) flowVars.get("fileId"); - String bizKey=(String) flowVars.get("bizKey"); - if("xm_file_approva".equals(bizKey) ) { - }else { - throw new BizException("不支持的业务,请上送业务编码【bizKey】参数"); - } - if("complete".equals(eventName)) { - if("1".equals(agree)) { - this.updateFlowStateByProcInst("", flowVars); - }else { - this.updateFlowStateByProcInst("", flowVars); - } - }else { - if("PROCESS_STARTED".equals(eventName)) { - Map bizQuery=new HashMap<>(); - bizQuery.put("fileId", fileId); - if(StringUtils.isEmpty(fileId)) { - throw new BizException("请上送fileId"); - } - if(StringUtils.isEmpty(branchId)) { - throw new BizException("请上送branchId"); - } - List> bizList=this.selectListMapByWhere(bizQuery); - if(bizList==null || bizList.size()==0) { - throw new BizException("没有找到对应文档,文档为【"+fileId+"】"); - }else { - Map bizObject=bizList.get(0); - if("1".equals(bizObject.get("bizFlowState"))) { - throw new BizException("该文档正在审批中，不能再发起审批"); - } - } - flowVars.put("id", this.createKey("id")); - this.insert("insertProcessApprova", flowVars); - this.updateFlowStateByProcInst("1", flowVars); - }else if("PROCESS_COMPLETED".equals(eventName)) { - if("1".equals(agree)) { - this.updateFlowStateByProcInst("2", flowVars); - - }else { - this.updateFlowStateByProcInst("3", flowVars); - } - }else if("PROCESS_CANCELLED".equals(eventName)) { - this.updateFlowStateByProcInst("4", flowVars); - } - } - } - - private void updateFlowStateByProcInstForDeleteSuccess(Map flowVars) { - baseMapper.updateFlowStateByProcInstForDeleteSuccess( flowVars); - - } - - public void updateFlowStateByProcInst(String flowState,Map flowVars) { - flowVars.put("flowState", flowState); - flowVars.put("bizFlowState", flowState); - if("1".equals(flowState)) { - flowVars.put("bizProcInstId", flowVars.get("procInstId")); - } - baseMapper.updateProcessApprova( flowVars); - } - -} \ No newline at end of file diff --git a/xm-core/src/main/java/com/xm/core/service/XmIterationService.java b/xm-core/src/main/java/com/xm/core/service/XmIterationService.java index 378a04b0..d5498010 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmIterationService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmIterationService.java @@ -1,6 +1,8 @@ package com.xm.core.service; import com.mdp.core.service.BaseService; +import com.xm.core.entity.XmIteration; +import com.xm.core.mapper.XmIterationMapper; import com.xm.core.vo.XmIterationVo; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -14,7 +16,7 @@ import java.util.Map; * 实体 XmIteration 表 XM.xm_iteration 当前主键(包括多主键): id; ***/ @Service("xm.core.xmIterationService") -public class XmIterationService extends BaseService { +public class XmIterationService extends BaseService { diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuCommentService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuCommentService.java index 638af271..bcfb3e04 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmMenuCommentService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuCommentService.java @@ -42,9 +42,5 @@ public class XmMenuCommentService extends BaseService> selectListByPids(List pids) { - return baseMapper.selectListByPids(pids); - } } diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuOperQxService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuOperQxService.java index 3144b1be..c06b35cc 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmMenuOperQxService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuOperQxService.java @@ -1,16 +1,15 @@ package com.xm.core.service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.mdp.core.entity.Tips; import com.xm.core.entity.XmMenu; import com.xm.core.entity.XmProduct; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import java.util.Arrays; import java.util.List; -import java.util.Map; + +import static com.mdp.core.utils.BaseUtils.map; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
@@ -19,6 +18,8 @@ import java.util.Map; ***/ @Service("xm.core.xmProductOperQxService") public class XmMenuOperQxService { + @Autowired + XmMenuService xmMenuService; /** * 检查某个人是否为产品级管理人员 @@ -65,7 +66,7 @@ public class XmMenuOperQxService { if(menuIds==null || menuIds.size()==0){ return null; } - List xmMenus=super.selectList("getUserCanOpMenusByIds",map("mmUserid",mmUserid,"menuIds",menuIds,"childrenCnt",childrenCnt)); + List xmMenus=xmMenuService.getUserCanOpMenusByIds(map("mmUserid",mmUserid,"menuIds",menuIds,"childrenCnt",childrenCnt)); return xmMenus; } } diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuService.java index bae63978..c0ae0905 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmMenuService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuService.java @@ -428,5 +428,9 @@ public class XmMenuService extends BaseService { public void upReads(String menuId,Integer reads) { baseMapper.upReads(map("menuId",menuId,"reads",reads)); } + + public List getUserCanOpMenusByIds(Map map) { + return baseMapper.getUserCanOpMenusByIds(map); + } } diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java index 69e3a2c2..6615af87 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java @@ -47,11 +47,11 @@ public class XmMenuStateService extends BaseService selectListByIterationId(String iterationId){ - List data=super.selectList("selectListByIterationId",iterationId); + List data=baseMapper.selectListByIterationId(iterationId); return data; } } diff --git a/xm-core/src/main/java/com/xm/core/service/XmProductQxService.java b/xm-core/src/main/java/com/xm/core/service/XmProductQxService.java index afafa2d8..451022b0 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProductQxService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProductQxService.java @@ -81,7 +81,7 @@ public class XmProductQxService { boolean headIsPm=xmGroupService.checkUserIsProductAdm(xmProduct,head.getUserid()); if("1".equals(scopeQx)){//同组织 if( !headIsPm && !head.getBranchId().equals(xmProduct.getBranchId())){ - tips.setFailureMsg("pdqx-scope-branch-0",String.format("产品【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProduct.getId(),headUsername,xmProduct.getBranchId())); + tips.setErrMsg("pdqx-scope-branch-0",String.format("产品【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProduct.getId(),headUsername,xmProduct.getBranchId())); return tips; } if(xmGroupService.checkUserIsProductAdm(xmProduct,memUserid)){ @@ -98,14 +98,14 @@ public class XmProductQxService { }else if (memBranchId.equals(xmProduct.getBranchId())){ return tips; } - tips.setFailureMsg("pdqx-scope-branch-1",String.format("产品【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProduct.getId(),memUsername,xmProduct.getBranchId())); + tips.setErrMsg("pdqx-scope-branch-1",String.format("产品【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProduct.getId(),memUsername,xmProduct.getBranchId())); return tips; }else if("2".equals(scopeQx)){//同产品 List groups=this.getProductGroupsFromLocalCache(xmProduct.getId()); if( !headIsPm && !xmGroupService.checkUserExistsGroup(groups, head.getUserid())){ - tips.setFailureMsg("pdqx-scope-product-0",String.format("产品【%s】只开放给同一个产品团队人员,【%s】不在产品团队中。",xmProduct.getId(),headUsername)); + tips.setErrMsg("pdqx-scope-product-0",String.format("产品【%s】只开放给同一个产品团队人员,【%s】不在产品团队中。",xmProduct.getId(),headUsername)); return tips; }; if(xmGroupService.checkUserIsProductAdm(xmProduct,memUserid)){ @@ -114,7 +114,7 @@ public class XmProductQxService { if( xmGroupService.checkUserExistsGroup(groups,memUserid) ){ return tips; }; - tips.setFailureMsg("pdqx-scope-product-1",String.format("产品【%s】只开放给同一个产品团队人员,【%s】不在产品团队中。",xmProduct.getId(),memUsername)); + tips.setErrMsg("pdqx-scope-product-1",String.format("产品【%s】只开放给同一个产品团队人员,【%s】不在产品团队中。",xmProduct.getId(),memUsername)); return tips; }else if("3".equals(scopeQx)){//同小组 List groups=this.getProductGroupsFromLocalCache(xmProduct.getId()); @@ -123,7 +123,7 @@ public class XmProductQxService { if( !headIsPm ){ headGroups=xmGroupService.getUserGroups(groups,head.getUserid()); if( headGroups==null || headGroups.size()==0 ){ - tips.setFailureMsg("pdqx-scope-team-1",String.format("产品【%s】只开放给同一个产品团队下同一个小组人员,【%s】不在产品团队中。",xmProduct.getId(),headUsername)); + tips.setErrMsg("pdqx-scope-team-1",String.format("产品【%s】只开放给同一个产品团队下同一个小组人员,【%s】不在产品团队中。",xmProduct.getId(),headUsername)); return tips; } } @@ -135,7 +135,7 @@ public class XmProductQxService { if( memGroups!=null && memGroups.size()>0 ){ return tips; } - tips.setFailureMsg("pdqx-scope-team-2",String.format("产品【%s】只开放给同一个产品团队下同一个小组人员,【%s】不在产品团队中。",xmProduct.getId(),memUsername)); + tips.setErrMsg("pdqx-scope-team-2",String.format("产品【%s】只开放给同一个产品团队下同一个小组人员,【%s】不在产品团队中。",xmProduct.getId(),memUsername)); return tips; } return tips; @@ -163,30 +163,30 @@ public class XmProductQxService { User sysUser=sysClient.getUserByUserid(memUserid); if(sysUser==null || StringUtils.isEmpty(sysUser.getUserid())){ //如果账户不存在，可能已注销，再判断没有意义，会导致企业无法操作遗留数据问题 - //tips.setFailureMsg("no-qx-branchId","产品【"+xmProduct.getId()+"】只开放给同企业人员。"); + //tips.setErrMsg("no-qx-branchId","产品【"+xmProduct.getId()+"】只开放给同企业人员。"); return tips; } memBranchId=sysUser.getBranchId(); if(!sysUser.getBranchId().equals(xmProduct.getBranchId())){ - tips.setFailureMsg("pdqx-scope-branch-0",String.format("产品【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProduct.getId(),memUsername,xmProduct.getBranchId())); + tips.setErrMsg("pdqx-scope-branch-0",String.format("产品【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProduct.getId(),memUsername,xmProduct.getBranchId())); return tips; } }else{ if(!memBranchId.equals(xmProduct.getBranchId())){ - tips.setFailureMsg("pdqx-scope-branch-0",String.format("产品【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProduct.getId(),memUsername,xmProduct.getBranchId())); + tips.setErrMsg("pdqx-scope-branch-0",String.format("产品【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProduct.getId(),memUsername,xmProduct.getBranchId())); return tips; } } }else if("2".equals(scopeQx)){//同产品 if(!xmGroupService.checkUserExistsGroup(getProductGroupsFromLocalCache(xmProduct.getId()), memUserid)){ - tips.setFailureMsg("pdqx-scope-product-0",String.format("产品【%s】只开放给同一个产品团队人员,【%s】不在产品团队中。",xmProduct.getId(),memUsername)); + tips.setErrMsg("pdqx-scope-product-0",String.format("产品【%s】只开放给同一个产品团队人员,【%s】不在产品团队中。",xmProduct.getId(),memUsername)); return tips; }; }else if("3".equals(scopeQx)){//同小组 if(!xmGroupService.checkUserExistsGroup(getProductGroupsFromLocalCache(xmProduct.getId()), memUserid)){ - tips.setFailureMsg("pdqx-scope-team-0",String.format("产品【%s】只开放给同一个产品团队下同一个小组人员,【%s】不在产品团队中。",xmProduct.getId(),memUsername)); + tips.setErrMsg("pdqx-scope-team-0",String.format("产品【%s】只开放给同一个产品团队下同一个小组人员,【%s】不在产品团队中。",xmProduct.getId(),memUsername)); return tips; } } @@ -214,7 +214,7 @@ public class XmProductQxService { if(xmGroupService.checkUserIsOtherUserTeamHeadOrAss(groups, head.getUserid(), memUserid)){ return tips; } - tips.setFailureMsg("pdqx-transmit-0", + tips.setErrMsg("pdqx-transmit-0", String.format("产品【%s】开启了上下级关系检查，您当前账户【%s】不属于账户【%s】的上级，无权操作。",xmProduct.getId(),head.getUsername(),memUsername)); @@ -246,7 +246,7 @@ public class XmProductQxService { boolean headIsPm=xmGroupService.checkUserIsProductAdm(xmProduct,head.getUserid()); if("1".equals(scopeQx)){//同组织 if( !headIsPm && !head.getBranchId().equals(xmProduct.getBranchId())){ - tips.setFailureMsg("pdqx-scope-branch-0",String.format("产品【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProduct.getId(),username,xmProduct.getBranchId())); + tips.setErrMsg("pdqx-scope-branch-0",String.format("产品【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProduct.getId(),username,xmProduct.getBranchId())); return tips; } boolean isAllNull=true; @@ -266,7 +266,7 @@ public class XmProductQxService { if(isAllNull){ return tips; }else{ - tips.setFailureMsg("pdqx-scope-branch-1",String.format("产品【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProduct.getId(),memUseridSet.stream().collect(Collectors.joining(",")),xmProduct.getBranchId())); + tips.setErrMsg("pdqx-scope-branch-1",String.format("产品【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProduct.getId(),memUseridSet.stream().collect(Collectors.joining(",")),xmProduct.getBranchId())); return tips; } @@ -274,7 +274,7 @@ public class XmProductQxService { }else if("2".equals(scopeQx)){//同产品 List groups=this.getProductGroupsFromLocalCache(xmProduct.getId()); if( !headIsPm && !xmGroupService.checkUserExistsGroup(groups, head.getUserid())){ - tips.setFailureMsg("pdqx-scope-product-0",String.format("产品【%s】只开放给同一个产品团队人员,【%s】不在产品团队中。",xmProduct.getId(),username)); + tips.setErrMsg("pdqx-scope-product-0",String.format("产品【%s】只开放给同一个产品团队人员,【%s】不在产品团队中。",xmProduct.getId(),username)); return tips; }; for (String memUserid : memUseridSet) { @@ -285,7 +285,7 @@ public class XmProductQxService { return tips; }; } - tips.setFailureMsg("pdqx-scope-product-1",String.format("产品【%s】只开放给同一个产品团队人员,【%s】不在产品团队中。",xmProduct.getId(),memUseridSet.stream().collect(Collectors.joining(",")))); + tips.setErrMsg("pdqx-scope-product-1",String.format("产品【%s】只开放给同一个产品团队人员,【%s】不在产品团队中。",xmProduct.getId(),memUseridSet.stream().collect(Collectors.joining(",")))); return tips; }else if("3".equals(scopeQx)){//同小组 List groups=this.getProductGroupsFromLocalCache(xmProduct.getId()); @@ -294,7 +294,7 @@ public class XmProductQxService { if( !headIsPm ){ headGroups=xmGroupService.getUserGroups(groups,head.getUserid()); if( headGroups==null || headGroups.size()==0 ){ - tips.setFailureMsg("pdqx-scope-team-1",String.format("产品【%s】只开放给同一个产品团队下同一个小组人员,【%s】不在产品团队中。",xmProduct.getId(),username)); + tips.setErrMsg("pdqx-scope-team-1",String.format("产品【%s】只开放给同一个产品团队下同一个小组人员,【%s】不在产品团队中。",xmProduct.getId(),username)); return tips; } } @@ -307,7 +307,7 @@ public class XmProductQxService { return tips; } } - tips.setFailureMsg("pdqx-scope-team-2",String.format("产品【%s】只开放给同一个产品团队下同一个小组人员,【%s】不在产品团队中。",xmProduct.getId(),memUseridSet.stream().collect(Collectors.joining(",")))); + tips.setErrMsg("pdqx-scope-team-2",String.format("产品【%s】只开放给同一个产品团队下同一个小组人员,【%s】不在产品团队中。",xmProduct.getId(),memUseridSet.stream().collect(Collectors.joining(",")))); return tips; } return tips; @@ -339,7 +339,7 @@ public class XmProductQxService { return tips; } } - tips.setFailureMsg("pdqx-transmit-0", + tips.setErrMsg("pdqx-transmit-0", String.format("产品【%s】开启了上下级关系检查，您当前账户不属于【%s】中任意账户的上级，无权操作。",xmProduct.getId(),memUseridSet.stream().collect(Collectors.joining(",")))); diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectContractService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectContractService.java index b48c35b6..b32156d6 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectContractService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectContractService.java @@ -3,7 +3,6 @@ package com.xm.core.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.mdp.core.err.BizException; -import com.mdp.core.service.BaseService; import com.xm.core.entity.XmProjectContract; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -85,7 +84,7 @@ public class XmProjectContractService extends BaseService groups=this.getProjectGroupsFromLocalCache(xmProject.getId()); if( !headIsPm && !xmGroupService.checkUserExistsGroup(groups, head.getUserid())){ - tips.setFailureMsg("pdqx-scope-product-0",String.format("项目【%s】只开放给同一个项目团队人员,【%s】不在项目团队中。",xmProject.getId(),headUsername)); + tips.setErrMsg("pdqx-scope-product-0",String.format("项目【%s】只开放给同一个项目团队人员,【%s】不在项目团队中。",xmProject.getId(),headUsername)); return tips; }; if(xmGroupService.checkUserIsProjectAdm(xmProject,memUserid)){ @@ -121,7 +121,7 @@ public class XmProjectQxService { if( xmGroupService.checkUserExistsGroup(groups,memUserid) ){ return tips; }; - tips.setFailureMsg("pdqx-scope-product-1",String.format("项目【%s】只开放给同一个项目团队人员,【%s】不在项目团队中。",xmProject.getId(),memUsername)); + tips.setErrMsg("pdqx-scope-product-1",String.format("项目【%s】只开放给同一个项目团队人员,【%s】不在项目团队中。",xmProject.getId(),memUsername)); return tips; }else if("3".equals(scopeQx)){//同小组 List groups=this.getProjectGroupsFromLocalCache(xmProject.getId()); @@ -130,7 +130,7 @@ public class XmProjectQxService { if( !headIsPm ){ headGroups=xmGroupService.getUserGroups(groups,head.getUserid()); if( headGroups==null || headGroups.size()==0 ){ - tips.setFailureMsg("pdqx-scope-team-1",String.format("项目【%s】只开放给同一个项目团队下同一个小组人员,【%s】不在项目团队中。",xmProject.getId(),headUsername)); + tips.setErrMsg("pdqx-scope-team-1",String.format("项目【%s】只开放给同一个项目团队下同一个小组人员,【%s】不在项目团队中。",xmProject.getId(),headUsername)); return tips; } } @@ -142,7 +142,7 @@ public class XmProjectQxService { if( memGroups!=null && memGroups.size()>0 ){ return tips; } - tips.setFailureMsg("pdqx-scope-team-2",String.format("项目【%s】只开放给同一个项目团队下同一个小组人员,【%s】不在项目团队中。",xmProject.getId(),memUsername)); + tips.setErrMsg("pdqx-scope-team-2",String.format("项目【%s】只开放给同一个项目团队下同一个小组人员,【%s】不在项目团队中。",xmProject.getId(),memUsername)); return tips; } return tips; @@ -170,30 +170,30 @@ public class XmProjectQxService { User sysUser=sysClient.getUserByUserid(memUserid); if(sysUser==null || StringUtils.isEmpty(sysUser.getUserid())){ //如果账户不存在，可能已注销，再判断没有意义，会导致企业无法操作遗留数据问题 - //tips.setFailureMsg("no-qx-branchId","项目【"+xmProject.getId()+"】只开放给同企业人员。"); + //tips.setErrMsg("no-qx-branchId","项目【"+xmProject.getId()+"】只开放给同企业人员。"); return tips; } memBranchId=sysUser.getBranchId(); if(!sysUser.getBranchId().equals(xmProject.getBranchId())){ - tips.setFailureMsg("pdqx-scope-branch-0",String.format("项目【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProject.getId(),memUsername,xmProject.getBranchId())); + tips.setErrMsg("pdqx-scope-branch-0",String.format("项目【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProject.getId(),memUsername,xmProject.getBranchId())); return tips; } }else{ if(!memBranchId.equals(xmProject.getBranchId())){ - tips.setFailureMsg("pdqx-scope-branch-0",String.format("项目【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProject.getId(),memUsername,xmProject.getBranchId())); + tips.setErrMsg("pdqx-scope-branch-0",String.format("项目【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProject.getId(),memUsername,xmProject.getBranchId())); return tips; } } }else if("2".equals(scopeQx)){//同项目 if(!xmGroupService.checkUserExistsGroup(getProjectGroupsFromLocalCache(xmProject.getId()), memUserid)){ - tips.setFailureMsg("pdqx-scope-product-0",String.format("项目【%s】只开放给同一个项目团队人员,【%s】不在项目团队中。",xmProject.getId(),memUsername)); + tips.setErrMsg("pdqx-scope-product-0",String.format("项目【%s】只开放给同一个项目团队人员,【%s】不在项目团队中。",xmProject.getId(),memUsername)); return tips; }; }else if("3".equals(scopeQx)){//同小组 if(!xmGroupService.checkUserExistsGroup(getProjectGroupsFromLocalCache(xmProject.getId()), memUserid)){ - tips.setFailureMsg("pdqx-scope-team-0",String.format("项目【%s】只开放给同一个项目团队下同一个小组人员,【%s】不在项目团队中。",xmProject.getId(),memUsername)); + tips.setErrMsg("pdqx-scope-team-0",String.format("项目【%s】只开放给同一个项目团队下同一个小组人员,【%s】不在项目团队中。",xmProject.getId(),memUsername)); return tips; } } @@ -221,7 +221,7 @@ public class XmProjectQxService { if(xmGroupService.checkUserIsOtherUserTeamHeadOrAss(groups, head.getUserid(), memUserid)){ return tips; } - tips.setFailureMsg("pdqx-transmit-0", + tips.setErrMsg("pdqx-transmit-0", String.format("项目【%s】开启了上下级关系检查，您当前账户【%s】不属于账户【%s】的上级，无权操作。",xmProject.getId(),head.getUsername(),memUsername)); @@ -258,7 +258,7 @@ public class XmProjectQxService { boolean headIsPm=xmGroupService.checkUserIsProjectAdm(xmProject,head.getUserid()); if("1".equals(scopeQx)){//同组织 if( !headIsPm && !head.getBranchId().equals(xmProject.getBranchId())){ - tips.setFailureMsg("pdqx-scope-branch-0",String.format("项目【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProject.getId(),username,xmProject.getBranchId())); + tips.setErrMsg("pdqx-scope-branch-0",String.format("项目【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProject.getId(),username,xmProject.getBranchId())); return tips; } boolean isAllNull=true; @@ -278,7 +278,7 @@ public class XmProjectQxService { if(isAllNull){ return tips; }else{ - tips.setFailureMsg("pdqx-scope-branch-1",String.format("项目【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProject.getId(),memUseridSet.stream().collect(Collectors.joining(",")),xmProject.getBranchId())); + tips.setErrMsg("pdqx-scope-branch-1",String.format("项目【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProject.getId(),memUseridSet.stream().collect(Collectors.joining(",")),xmProject.getBranchId())); return tips; } @@ -286,7 +286,7 @@ public class XmProjectQxService { }else if("2".equals(scopeQx)){//同项目 List groups=this.getProjectGroupsFromLocalCache(xmProject.getId()); if( !headIsPm && !xmGroupService.checkUserExistsGroup(groups, head.getUserid())){ - tips.setFailureMsg("pdqx-scope-product-0",String.format("项目【%s】只开放给同一个项目团队人员,【%s】不在项目团队中。",xmProject.getId(),username)); + tips.setErrMsg("pdqx-scope-product-0",String.format("项目【%s】只开放给同一个项目团队人员,【%s】不在项目团队中。",xmProject.getId(),username)); return tips; }; for (String memUserid : memUseridSet) { @@ -297,7 +297,7 @@ public class XmProjectQxService { return tips; }; } - tips.setFailureMsg("pdqx-scope-product-1",String.format("项目【%s】只开放给同一个项目团队人员,【%s】不在项目团队中。",xmProject.getId(),memUseridSet.stream().collect(Collectors.joining(",")))); + tips.setErrMsg("pdqx-scope-product-1",String.format("项目【%s】只开放给同一个项目团队人员,【%s】不在项目团队中。",xmProject.getId(),memUseridSet.stream().collect(Collectors.joining(",")))); return tips; }else if("3".equals(scopeQx)){//同小组 List groups=this.getProjectGroupsFromLocalCache(xmProject.getId()); @@ -306,7 +306,7 @@ public class XmProjectQxService { if( !headIsPm ){ headGroups=xmGroupService.getUserGroups(groups,head.getUserid()); if( headGroups==null || headGroups.size()==0 ){ - tips.setFailureMsg("pdqx-scope-team-1",String.format("项目【%s】只开放给同一个项目团队下同一个小组人员,【%s】不在项目团队中。",xmProject.getId(),username)); + tips.setErrMsg("pdqx-scope-team-1",String.format("项目【%s】只开放给同一个项目团队下同一个小组人员,【%s】不在项目团队中。",xmProject.getId(),username)); return tips; } } @@ -319,7 +319,7 @@ public class XmProjectQxService { return tips; } } - tips.setFailureMsg("pdqx-scope-team-2",String.format("项目【%s】只开放给同一个项目团队下同一个小组人员,【%s】不在项目团队中。",xmProject.getId(),memUseridSet.stream().collect(Collectors.joining(",")))); + tips.setErrMsg("pdqx-scope-team-2",String.format("项目【%s】只开放给同一个项目团队下同一个小组人员,【%s】不在项目团队中。",xmProject.getId(),memUseridSet.stream().collect(Collectors.joining(",")))); return tips; } return tips; @@ -352,7 +352,7 @@ public class XmProjectQxService { return tips; } } - tips.setFailureMsg("pdqx-transmit-0", + tips.setErrMsg("pdqx-transmit-0", String.format("项目【%s】开启了上下级关系检查，您当前账户不属于【%s】中任意账户的上级，无权操作。",xmProject.getId(),memUseridSet.stream().collect(Collectors.joining(",")))); diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java index 80abe6bd..8b05693f 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.mdp.core.entity.Tips; import com.mdp.core.err.BizException; +import com.mdp.core.query.QueryTools; import com.mdp.core.service.BaseService; import com.mdp.core.service.SequenceService; import com.mdp.core.utils.BaseUtils; @@ -47,9 +48,6 @@ public class XmProjectService extends BaseService { @Autowired XmQuestionService xmQuestionService; - @Autowired - XmFileService xmFileService; - @Autowired XmRecordService xmRecordService; @@ -244,12 +242,7 @@ public class XmProjectService extends BaseService { xmProjectCacheService.clear(projectId); } - /** 请在此类添加自定义函数 */ - public List> getProject(Map params) { - List> xmProjectList = this.selectListMapByWhere(params); //列出XmProject列表 - return xmProjectList; - } public void updateProject(XmProject xmProject) { String projectId = xmProject.getId(); @@ -281,7 +274,7 @@ public class XmProjectService extends BaseService { xmProjectVo.setBranchId(user.getBranchId()); if(!StringUtils.isEmpty(xmProjectVo.getId()) && xmProjectVo.getId().equals(xmProjectVo.getCode())) { - tips.setFailureMsg("id不能事先预设"); + tips.setErrMsg("id不能事先预设"); throw new BizException(tips); } if(StringUtils.hasText(xmProjectVo.getCode())) { @@ -289,7 +282,7 @@ public class XmProjectService extends BaseService { xmProjectQuery.setCode(xmProjectVo.getCode()); xmProjectQuery.setBranchId(user.getBranchId()); if(this.countByWhere(xmProjectQuery)>0){ - tips.setFailureMsg("项目代号重复，请修改代号再提交"); + tips.setErrMsg("项目代号重复，请修改代号再提交"); throw new BizException(tips); } xmProjectVo.setId(this.createProjectId(xmProjectVo.getCode())); @@ -439,7 +432,7 @@ public class XmProjectService extends BaseService { if(StringUtils.isEmpty(bizProject.getBranchId())) { throw new BizException("请上送flowVars.data.branchId"); } - List> bizList=this.selectListMapByWhere(bizQuery); + List> bizList=this.selectListMapByWhere(QueryTools.initPage(bizQuery),QueryTools.initQueryWrapper(XmProject.class),bizQuery); if(bizList==null || bizList.size()==0) { throw new BizException("没有找到对应项目,项目为【"+bizProject.getId()+"】"); }else { diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectTaskTypeStateService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectTaskTypeStateService.java index ea066e3d..408b0507 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectTaskTypeStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectTaskTypeStateService.java @@ -2,7 +2,6 @@ package com.xm.core.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.mdp.core.service.BaseService; import com.xm.core.entity.XmProjectTaskTypeState; import org.springframework.stereotype.Service; diff --git a/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java b/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java index 3d3d4d1f..ccb70e4f 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.mdp.core.entity.Tips; import com.mdp.core.err.BizException; +import com.mdp.core.query.QueryTools; import com.mdp.core.service.BaseService; import com.mdp.core.utils.BaseUtils; import com.mdp.safe.client.entity.User; @@ -29,9 +30,7 @@ import java.util.Map; ***/ @Service("xm.core.xmQuestionService") public class XmQuestionService extends BaseService { - - @Autowired - XmAttachmentService xmAttachmentService; + @Autowired XmQuestionHandleService xmQuestionHandleService; @@ -81,9 +80,6 @@ public class XmQuestionService extends BaseService handle.setId(this.xmQuestionHandleService.createKey("id")); xmQuestionHandleService.insert(handle); - if(xmQuestionVo.getAttachment()!=null && xmQuestionVo.getAttachment().size()>0) { - xmAttachmentService.insertOrUpdate(xmQuestionVo.getId(),"问题",xmQuestionVo.getAttachment()); - } return xmQuestionVo; } /** @@ -166,7 +162,7 @@ public class XmQuestionService extends BaseService if(StringUtils.isEmpty(questionId)) { throw new BizException("请上送问题编号flowVars.data.id"); } - List> bizList=this.selectListMapByWhere(bizQuery); + List> bizList=this.selectListMapByWhere(QueryTools.initPage(bizQuery),QueryTools.initQueryWrapper(XmQuestion.class),bizQuery); if(bizList==null || bizList.size()==0) { throw new BizException("没有找到对应问题单,问题单为【"+questionId+"】"); }else { @@ -176,7 +172,7 @@ public class XmQuestionService extends BaseService } } flowVars.put("id", this.createKey("id")); - this.insert("insertProcessApprova", flowVars); + this.baseMapper.insertProcessApprova( flowVars); this.updateFlowStateByProcInst("1", flowVars); }else if("PROCESS_COMPLETED".equals(eventName)) { if("1".equals(agree)) { diff --git a/xm-core/src/main/java/com/xm/core/service/XmRecordService.java b/xm-core/src/main/java/com/xm/core/service/XmRecordService.java index e04a2783..90d02b41 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmRecordService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmRecordService.java @@ -448,19 +448,19 @@ public class XmRecordService extends BaseService { } public List selectChangeProjectIds() { - return selectList("selectChangeProjectIds",map()); + return baseMapper.selectChangeProjectIds(map()); } public List selectChangeProductIds() { - return selectList("selectChangeProductIds",map()); + return baseMapper.selectChangeProductIds(map()); } public List selectChangeBranchIds() { - return selectList("selectChangeBranchIds",map()); + return baseMapper.selectChangeBranchIds(map()); } public List selectChangeIterationIds() { - return selectList("selectChangeIterationIds",map()); + return baseMapper.selectChangeIterationIds(map()); } } diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskEvalService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskEvalService.java index cb8b4b54..f54dd044 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskEvalService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskEvalService.java @@ -35,11 +35,11 @@ public class XmTaskEvalService extends BaseService } public MyTotalEval getServiceProviderEval(User user) { - return super.selectOne("getServiceProviderEval",user); + return baseMapper.getServiceProviderEval(user); } public MyTotalEval getPersonEval(User user) { - return super.selectOne("getPersonEval",user); + return baseMapper.getPersonEval(user); } } diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java index 6153eb7b..7958dcd6 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java @@ -98,7 +98,7 @@ public class XmTaskExecuserService extends BaseService0){ @@ -236,7 +236,7 @@ public class XmTaskExecuserService extends BaseService { @Autowired XmTaskExecuserService xmTaskExecuserService; - - @Autowired - XmAttachmentService xmAttachmentService; @Autowired @@ -97,7 +94,7 @@ public class XmTaskService extends BaseService { public Tips judgetPhaseBudget(String phaseId, BigDecimal addTaskBudgetCost, BigDecimal addTaskBudgetIuserAt, BigDecimal addTaskBudgetOuserAt, BigDecimal addTaskBudgetNouserAt, List excludeTaskIds){ Tips tips=new Tips("成功"); if(!StringUtils.hasText(phaseId)){ - tips.setFailureMsg("phaseId参数不能为空"); + tips.setErrMsg("phaseId参数不能为空"); return tips; } Map g=this.selectTotalPhaseAndTaskBudgetCost(phaseId,excludeTaskIds); @@ -131,21 +128,21 @@ public class XmTaskService extends BaseService { /** if(addTaskBudgetIuserAt.add(taskBudgetIuserAt).compareTo(phaseBudgetIuserAt)>0) { - tips.setFailureMsg("内部人力预算超出项目内部人力预算"); + tips.setErrMsg("内部人力预算超出项目内部人力预算"); return tips; } if(addTaskBudgetOuserAt.add(taskBudgetOuserAt).compareTo(phaseBudgetOuserAt)>0) { - tips.setFailureMsg("外部人力预算超出项目外部人力预算"); + tips.setErrMsg("外部人力预算超出项目外部人力预算"); return tips; } if(addTaskBudgetNouserAt.add(taskBudgetNouserAt).compareTo(phaseBudgetNouserAt)>0) { - tips.setFailureMsg("非人力预算超出项目非人力预算"); + tips.setErrMsg("非人力预算超出项目非人力预算"); return tips; } **/ BigDecimal totalTaskBudgetAt=taskBudgetTotalCost.add(addTaskBudgetCost); if(phaseBudgetAt.compareTo(totalTaskBudgetAt)<0) { - tips.setFailureMsg("任务合计总预算超出计划总预算"+totalTaskBudgetAt.subtract(phaseBudgetAt)+"元"); + tips.setErrMsg("任务合计总预算超出计划总预算"+totalTaskBudgetAt.subtract(phaseBudgetAt)+"元"); return tips; }else { return tips; @@ -166,7 +163,7 @@ public class XmTaskService extends BaseService { public Tips judgetTaskBudget(String parentTaskid, BigDecimal addTaskBudgetCost, BigDecimal addTaskBudgetIuserAt, BigDecimal addTaskBudgetOuserAt, BigDecimal addTaskBudgetNouserAt, List excludeTaskIds){ Tips tips=new Tips("成功"); if(!StringUtils.hasText(parentTaskid)){ - tips.setFailureMsg("parentTaskid参数不能为空"); + tips.setErrMsg("parentTaskid参数不能为空"); return tips; } Map g=this.selectTotalTaskBudgetCost(parentTaskid,excludeTaskIds); @@ -178,7 +175,7 @@ public class XmTaskService extends BaseService { BigDecimal childBudgetAt=NumberUtil.getBigDecimal(g.get("childBudgetAt"),BigDecimal.ZERO); childBudgetAt=childBudgetAt.add(addTaskBudgetCost); if(budgetAt.compareTo(childBudgetAt)<0) { - tips.setFailureMsg("任务合计总预算超出上级总预算"+childBudgetAt.subtract(budgetAt)+"元"); + tips.setErrMsg("任务合计总预算超出上级总预算"+childBudgetAt.subtract(budgetAt)+"元"); return tips; }else { return tips; @@ -299,7 +296,7 @@ public class XmTaskService extends BaseService { xmRecordService.addXmTaskRecord(xmTask.getProjectId(), xmTask.getId(), "项目-任务-新增任务", "新增任务"+xmTask.getName()); //草稿不提醒 if(!"0".equals(xmTaskVo.getStatus())){ - notifyMsgService.pushMsg(user, xmTask.getCreateUserid(), xmTask.getCreateUsername(), "2", xmTask.getProjectId(), xmTask.getId(), "您成为任务【" + xmTask.getName() + "】的负责人，请注意跟进。"); + notifyMsgService.pushMsg(user, xmTask.getCreateUserid(), xmTask.getCreateUsername(), "您成为任务【" + xmTask.getName() + "】的负责人，请注意跟进。",null); } return xmTaskVo; @@ -399,7 +396,7 @@ public class XmTaskService extends BaseService { return this.selectTaskListByIds(ids); } public List selectTaskListByIds(List ids){ - return baseMapper.selectTaskListByIds",map("ids(ids)); + return baseMapper.selectTaskListByIds(map("ids",ids)); } @@ -776,14 +773,14 @@ public class XmTaskService extends BaseService { Tips tips=new Tips("成功"); Map data=this.calcProjectAndTaskBudget(projectId,excludeTaskIds); if(data==null || data.isEmpty()){ - tips.setFailureMsg("项目不存在"); + tips.setErrMsg("项目不存在"); return tips; } BigDecimal planTotalCost=NumberUtil.getBigDecimal(data.get("planTotalCost"),BigDecimal.ZERO); BigDecimal taskBudgetCost=NumberUtil.getBigDecimal(data.get("budgetAt"),BigDecimal.ZERO); BigDecimal chaochu=taskBudgetCost.add(addBudgetCost).subtract(planTotalCost); if(chaochu.compareTo(BigDecimal.ZERO)>0){ - tips.setFailureMsg("超出项目总预算"+chaochu+"元"); + tips.setErrMsg("超出项目总预算"+chaochu+"元"); return tips; } return tips; @@ -791,13 +788,13 @@ public class XmTaskService extends BaseService { public List listTenTaskByProjectIdAndProductId(String projectId,String productId) { - return baseMapper.listTenTaskByProjectIdAndProductId",map("projectId", projectId, "productId( productId)); + return baseMapper.listTenTaskByProjectIdAndProductId(map("projectId", projectId, productId)); } public List listTenTaskByProjectIdAndIterationId(String projectId, String iterationId) { - return baseMapper.listTenTaskByProjectIdAndIterationId", map("projectId", projectId, "iterationId( iterationId)); + return baseMapper.listTenTaskByProjectIdAndIterationId(map("projectId", projectId, "iterationId",iterationId)); } @Transactional diff --git a/xm-core/src/main/java/com/xm/core/service/XmTestCaseService.java b/xm-core/src/main/java/com/xm/core/service/XmTestCaseService.java index ba3acc51..7503358b 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTestCaseService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTestCaseService.java @@ -29,7 +29,6 @@ public class XmTestCaseService extends BaseService } public List> getXmTestCaseSort(Map xmTestCase) { return baseMapper.getXmTestCaseSort(xmTestCase); - return baseMapper. } /** 请在此类添加自定义函数 */ diff --git a/xm-core/src/main/java/com/xm/core/service/XmTestPlanCaseService.java b/xm-core/src/main/java/com/xm/core/service/XmTestPlanCaseService.java index 6167385c..330520ae 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTestPlanCaseService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTestPlanCaseService.java @@ -33,7 +33,7 @@ public class XmTestPlanCaseService extends BaseService selectListByCaseIdsAndPlanId(String planId, List caseIds) { - return baseMapper.selectListByCaseIdsAndPlanId",map("planId",planId,"caseIds(caseIds)); + return baseMapper.selectListByCaseIdsAndPlanId(map("planId",planId,"caseIds",caseIds)); } public List> getXmTestPlanCaseExecStatusDist(Map xmTestPlanCase) { diff --git a/xm-core/src/main/java/com/xm/core/service/XmWorkloadService.java b/xm-core/src/main/java/com/xm/core/service/XmWorkloadService.java index 96f76f0e..eca3529e 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmWorkloadService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmWorkloadService.java @@ -68,7 +68,7 @@ public class XmWorkloadService extends BaseService } public List> ListGroupByTaskIdAndUseridToSet(Map xmWorkload) { - return baseMapper.ListGroupByTaskIdAndUseridToSet(xmWorkload); + return baseMapper.listGroupByTaskIdAndUseridToSet(xmWorkload); } public void updateStatusAfterJoinSbill(Map details) {