From 3ecabfe9eb93e7393685bde5ca2ca1bf7fd5d5ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Mon, 2 Nov 2020 15:38:07 +0800 Subject: [PATCH 1/3] fix --- .../performance/service/AssessService.java | 6 +++++- .../service/impl/AssessServiceImpl.java | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/performance/service/AssessService.java b/src/main/java/com/lz/modules/performance/service/AssessService.java index 84870015..1ab76990 100644 --- a/src/main/java/com/lz/modules/performance/service/AssessService.java +++ b/src/main/java/com/lz/modules/performance/service/AssessService.java @@ -1,6 +1,7 @@ package com.lz.modules.performance.service; import com.lz.common.utils.PageUtils; +import com.lz.modules.flow.entity.StaffRole; import com.lz.modules.performance.req.AssessTaskReq; import com.lz.modules.performance.res.ChartStatisticalRes; @@ -14,5 +15,8 @@ import java.util.List; public interface AssessService { PageUtils userTaskList(AssessTaskReq req,Long userId); - //List chartResult(ChartResultReq req); + List roleDepartment(StaffRole staffRole); + + List roleEvgroup(StaffRole staffRole); + } diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java index ad8c013d..be1f1e75 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java @@ -5,8 +5,11 @@ import com.lz.common.utils.PageUtils; import com.lz.common.utils.StringUtil; import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.service.StaffService; +import com.lz.modules.flow.entity.StaffRole; +import com.lz.modules.flow.entity.StaffRoleDepartment; import com.lz.modules.flow.service.FlowChangeService; import com.lz.modules.flow.service.FlowRecordService; +import com.lz.modules.flow.service.StaffRoleDepartmentService; import com.lz.modules.performance.dto.TaskListDto; import com.lz.modules.performance.req.AssessTaskReq; import com.lz.modules.performance.res.ChartStatisticalRes; @@ -33,6 +36,8 @@ public class AssessServiceImpl implements AssessService { private StaffService staffService; @Autowired private FlowChangeService flowChangeService; + @Autowired + private StaffRoleDepartmentService staffRoleDepartmentService; @Override public PageUtils userTaskList(AssessTaskReq req,Long userId) { @@ -66,4 +71,17 @@ public class AssessServiceImpl implements AssessService { return data; } + + @Override + public List roleDepartment(StaffRole staffRole) { + List staffRoleDepartments = staffRoleDepartmentService.selectStaffRoleDepartmentByStaffRoleId(staffRole.getId()); + return null; + } + + @Override + public List roleEvgroup(StaffRole staffRole) { + return null; + } + + } From d9a67cbd998cbe2bce2c0cd9e0393f89cb839aa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Mon, 2 Nov 2020 16:18:48 +0800 Subject: [PATCH 2/3] fix --- .../dao/StaffRoleEvaluationGroupMapper.java | 5 +++ .../StaffRoleEvaluationGroupService.java | 4 +++ .../StaffRoleEvaluationGroupServiceImpl.java | 7 +++- .../service/impl/AssessServiceImpl.java | 36 +++++++++++++++++-- .../flow/StaffRoleEvaluationGroupMapper.xml | 5 +++ 5 files changed, 53 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/dao/StaffRoleEvaluationGroupMapper.java b/src/main/java/com/lz/modules/flow/dao/StaffRoleEvaluationGroupMapper.java index c10c2862..bf25539e 100644 --- a/src/main/java/com/lz/modules/flow/dao/StaffRoleEvaluationGroupMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/StaffRoleEvaluationGroupMapper.java @@ -11,6 +11,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.lz.modules.flow.entity.StaffRoleEvaluationGroup; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; + +import java.util.List; + @Mapper public interface StaffRoleEvaluationGroupMapper extends BaseMapper { @@ -29,5 +32,7 @@ public interface StaffRoleEvaluationGroupMapper extends BaseMapper selectEvaluationGroupIdsByRoleId(@Param("roleId")Long roleId); + } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/StaffRoleEvaluationGroupService.java b/src/main/java/com/lz/modules/flow/service/StaffRoleEvaluationGroupService.java index 9370ed1e..71abaa7f 100644 --- a/src/main/java/com/lz/modules/flow/service/StaffRoleEvaluationGroupService.java +++ b/src/main/java/com/lz/modules/flow/service/StaffRoleEvaluationGroupService.java @@ -3,6 +3,8 @@ package com.lz.modules.flow.service; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.modules.flow.entity.StaffRoleEvaluationGroup; +import java.util.List; + /** *

* 绩效管理菜单表 服务类 @@ -29,5 +31,7 @@ public interface StaffRoleEvaluationGroupService extends IService selectEvaluationGroupIdsByRoleId(Long roleId); + } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleEvaluationGroupServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleEvaluationGroupServiceImpl.java index e8fe5029..8343417a 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleEvaluationGroupServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleEvaluationGroupServiceImpl.java @@ -7,6 +7,8 @@ import com.lz.modules.flow.service.StaffRoleEvaluationGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 绩效管理菜单表 服务类 @@ -59,5 +61,8 @@ public class StaffRoleEvaluationGroupServiceImpl extends ServiceImpl selectEvaluationGroupIdsByRoleId(Long roleId) { + return staffRoleEvaluationGroupMapper.selectEvaluationGroupIdsByRoleId(roleId); + } } diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java index be1f1e75..6bfb8a61 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java @@ -10,18 +10,24 @@ import com.lz.modules.flow.entity.StaffRoleDepartment; import com.lz.modules.flow.service.FlowChangeService; import com.lz.modules.flow.service.FlowRecordService; import com.lz.modules.flow.service.StaffRoleDepartmentService; +import com.lz.modules.flow.service.StaffRoleEvaluationGroupService; import com.lz.modules.performance.dto.TaskListDto; import com.lz.modules.performance.req.AssessTaskReq; import com.lz.modules.performance.res.ChartStatisticalRes; import com.lz.modules.performance.res.TaskListRes; import com.lz.modules.performance.service.AssessService; +import net.bytebuddy.asm.Advice; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Optional; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.stream.Collectors; /** * @Author: djc @@ -38,6 +44,8 @@ public class AssessServiceImpl implements AssessService { private FlowChangeService flowChangeService; @Autowired private StaffRoleDepartmentService staffRoleDepartmentService; + @Autowired + private StaffRoleEvaluationGroupService staffRoleEvaluationGroupService; @Override public PageUtils userTaskList(AssessTaskReq req,Long userId) { @@ -74,13 +82,35 @@ public class AssessServiceImpl implements AssessService { @Override public List roleDepartment(StaffRole staffRole) { - List staffRoleDepartments = staffRoleDepartmentService.selectStaffRoleDepartmentByStaffRoleId(staffRole.getId()); - return null; + if (staffRole.getDepartmentId() == 0) { + return null; + } + else { + List staffRoleDepartments = staffRoleDepartmentService.selectStaffRoleDepartmentByStaffRoleId(staffRole.getId()); + if (CollectionUtils.isNotEmpty(staffRoleDepartments)) { + List allDepart = new ArrayList<>(); + staffRoleDepartments.forEach(staffRoleDepartment -> { + List strings = staffService.selectAllDeparmentIdsByDepartmentParentId(staffRoleDepartment.getDepartmentId()); + allDepart.addAll(strings); + }); + + List collect = allDepart.stream().distinct().map(s -> Long.valueOf(s)).collect(Collectors.toList()); + return collect; + } + return Collections.EMPTY_LIST; + } + } + @Override public List roleEvgroup(StaffRole staffRole) { - return null; + if (staffRole.getDepartmentId() == 0) { + return null; + } + else { + return staffRoleEvaluationGroupService.selectEvaluationGroupIdsByRoleId(staffRole.getId()); + } } diff --git a/src/main/resources/mapper/flow/StaffRoleEvaluationGroupMapper.xml b/src/main/resources/mapper/flow/StaffRoleEvaluationGroupMapper.xml index 2ff1e439..232d0bd9 100644 --- a/src/main/resources/mapper/flow/StaffRoleEvaluationGroupMapper.xml +++ b/src/main/resources/mapper/flow/StaffRoleEvaluationGroupMapper.xml @@ -79,5 +79,10 @@ update lz_staff_role_evaluation_group set is_delete = 1 where id=#{id} limit 1 + + + From bceda01ab8d827bd03685a25876c14dd5809ff51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Mon, 2 Nov 2020 16:40:12 +0800 Subject: [PATCH 3/3] fix --- .../performance/service/impl/AssessManagerServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java index 9e8f1787..01e8acca 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java @@ -233,7 +233,7 @@ public class AssessManagerServiceImpl implements AssessManagerService { //更新流程绩效 ApprovalDto approvalDto = new ApprovalDto(); approvalDto.setStatus(1); - approvalDto.setResultRecordId(1L); + approvalDto.setResultRecordId(aLong); approvalDto.setMenuName("开始评分"); try { resultRecordService.newApproval(approvalDto);