diff --git a/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java b/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java index 2cd353b1..c79cdb10 100644 --- a/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java +++ b/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.java @@ -63,5 +63,5 @@ public interface DepartmentsStaffRelateDao extends BaseMapper getDepartmentNameByStaffIds(@Param("staffIds") List staffIds); - + List selectStaffIdsByDepartments(@Param("deparmentIds")List deparmentIds); } diff --git a/src/main/java/com/lz/modules/app/dao/StaffOccupationDao.java b/src/main/java/com/lz/modules/app/dao/StaffOccupationDao.java index 34f217a3..f0ce615e 100644 --- a/src/main/java/com/lz/modules/app/dao/StaffOccupationDao.java +++ b/src/main/java/com/lz/modules/app/dao/StaffOccupationDao.java @@ -31,4 +31,6 @@ public interface StaffOccupationDao extends BaseMapper { void updateAllOccupation(); void updateStatusByStaff(Long staffId, DepartmentStaffBo departmentStaffBo); + + List removeDimissionStaffByStaffIds(@Param("staffIds") List staffIds); } diff --git a/src/main/java/com/lz/modules/app/service/DepartmentsStaffRelateService.java b/src/main/java/com/lz/modules/app/service/DepartmentsStaffRelateService.java index c024b7eb..f2c7233a 100644 --- a/src/main/java/com/lz/modules/app/service/DepartmentsStaffRelateService.java +++ b/src/main/java/com/lz/modules/app/service/DepartmentsStaffRelateService.java @@ -40,5 +40,7 @@ public interface DepartmentsStaffRelateService extends IService selectStaffIdsByDepartments(List deparmentIds); } diff --git a/src/main/java/com/lz/modules/app/service/StaffOccupationService.java b/src/main/java/com/lz/modules/app/service/StaffOccupationService.java index b1a63333..61ab3b85 100644 --- a/src/main/java/com/lz/modules/app/service/StaffOccupationService.java +++ b/src/main/java/com/lz/modules/app/service/StaffOccupationService.java @@ -31,5 +31,7 @@ public interface StaffOccupationService extends IService void updateAllOccupation(); void updateStatusByStaff(Long staffId, DepartmentStaffBo departmentStaffBo); + + List removeDimissionStaffByStaffIds(List staffIds); } diff --git a/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java index c0e3b509..0d745290 100644 --- a/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java @@ -3,8 +3,10 @@ package com.lz.modules.app.service.impl; import com.google.common.collect.Lists; import com.lz.common.utils.StringUtil; import com.lz.modules.job.model.responseBo.DepartmentStaffBo; +import org.apache.commons.collections.CollectionUtils; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -90,4 +92,12 @@ public class DepartmentsStaffRelateServiceImpl extends ServiceImpl selectStaffIdsByDepartments(List deparmentIds) { + if(CollectionUtils.isEmpty(deparmentIds)){ + return Collections.EMPTY_LIST; + } + return departmentsStaffRelateDao.selectStaffIdsByDepartments(deparmentIds); + } } diff --git a/src/main/java/com/lz/modules/app/service/impl/StaffOccupationServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/StaffOccupationServiceImpl.java index 112f331b..214bde65 100644 --- a/src/main/java/com/lz/modules/app/service/impl/StaffOccupationServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/StaffOccupationServiceImpl.java @@ -10,9 +10,12 @@ import com.lz.modules.app.dao.StaffOccupationDao; import com.lz.modules.app.entity.StaffOccupationEntity; import com.lz.modules.app.service.StaffOccupationService; import com.lz.modules.job.model.responseBo.DepartmentStaffBo; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -62,4 +65,11 @@ public class StaffOccupationServiceImpl extends ServiceImpl removeDimissionStaffByStaffIds(List staffIds) { + if(CollectionUtils.isEmpty(staffIds)){ + return Collections.EMPTY_LIST; + } + return staffOccupationDao.removeDimissionStaffByStaffIds(staffIds); + } } diff --git a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java index e59bd75e..580c4b69 100644 --- a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java @@ -23,6 +23,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -411,24 +412,13 @@ public class StaffServiceImpl extends ServiceImpl impleme return Lists.newArrayList(); } //获取所有人员 - List list = departmentsStaffRelateService.list(new QueryWrapper() - .select("staff_id") - .eq("is_delete", 0) - .in("department_id", deparmentIds)); + List list = departmentsStaffRelateService.selectStaffIdsByDepartments(deparmentIds); if(CollectionUtils.isEmpty(list)){ return Lists.newArrayList(); } - //获取人员个数去重 - List staffs = list.stream().map(e -> e.getStaffId() + "").collect(Collectors.toList()); - staffs.removeIf(s -> { - StaffOccupationInfoDto occupationByStaffId = staffOccupationService.getOccupationByStaffId(Long.valueOf(s)); - if(occupationByStaffId==null || "1".equals(occupationByStaffId.getStaffStatus())){ - return true; - } - return false; - }); - List staffdistincts = staffs.stream().distinct().collect(Collectors.toList()); - return staffdistincts; + //获取人员个数去重, 去除离职 + List data = staffOccupationService.removeDimissionStaffByStaffIds(list); + return new ArrayList<>(new HashSet(data)); } diff --git a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java index c8e97948..8ad281d0 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lz.common.utils.ISelect; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; +import com.lz.modules.app.service.StaffOccupationService; import com.lz.modules.app.service.StaffService; import com.lz.modules.flow.dao.EvaluationGroupMapper; import com.lz.modules.flow.entity.EvaluationGroup; @@ -33,6 +34,8 @@ public class EvaluationGroupServiceImpl extends ServiceImpl(new HashSet(depStaffIds)); + List distDepStaffIds = new ArrayList<>(new HashSet(depStaffIds)); + //去除离职 + List data = staffOccupationService.removeDimissionStaffByStaffIds(distDepStaffIds); + return data; } } diff --git a/src/main/java/com/lz/modules/performance/res/AssessListRes.java b/src/main/java/com/lz/modules/performance/res/AssessListRes.java deleted file mode 100644 index 948511e4..00000000 --- a/src/main/java/com/lz/modules/performance/res/AssessListRes.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.lz.modules.performance.res; - -import lombok.Data; - -/** - * @Author: djc - * @Desc: - * @Date: 2020/10/20 15:54 - */ -@Data -public class AssessListRes { - //考核名称 - private String name; - //时间周期 - private String cycleTime; - //组人员 - private String groupNum; -} diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index 404796d0..7dae2690 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -343,7 +343,7 @@ + + diff --git a/src/main/resources/mapper/generator/StaffOccupationDao.xml b/src/main/resources/mapper/generator/StaffOccupationDao.xml index fcbde85d..c5e70cfc 100644 --- a/src/main/resources/mapper/generator/StaffOccupationDao.xml +++ b/src/main/resources/mapper/generator/StaffOccupationDao.xml @@ -59,4 +59,13 @@ update lz_staff_occupation set staff_status=#{departmentStaffBo.status},resignation_time=null, position=#{departmentStaffBo.position}, staff_no=#{departmentStaffBo.employeeNo} where is_delete=0 and staff_id = #{staffId} + +