diff --git a/src/main/java/com/lz/modules/flow/dao/EvaluationStartStaffMapper.java b/src/main/java/com/lz/modules/flow/dao/EvaluationStartStaffMapper.java index ce4e07b1..60fab0f7 100644 --- a/src/main/java/com/lz/modules/flow/dao/EvaluationStartStaffMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/EvaluationStartStaffMapper.java @@ -8,6 +8,7 @@ package com.lz.modules.flow.dao; * @since 2020-10-13 */ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.lz.modules.app.entity.StaffSimpleInfo; import com.lz.modules.flow.entity.EvaluationStartStaff; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -46,4 +47,6 @@ public interface EvaluationStartStaffMapper extends BaseMapper staffIds); List selectStaffIdsByStart(@Param("startId") Long startId); + + List selectStaffIdsByStartAndStaffId(@Param("startId") Long id, @Param("list") List staffIds); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/EvaluationStartStaffService.java b/src/main/java/com/lz/modules/flow/service/EvaluationStartStaffService.java index 04122182..e8053fc5 100644 --- a/src/main/java/com/lz/modules/flow/service/EvaluationStartStaffService.java +++ b/src/main/java/com/lz/modules/flow/service/EvaluationStartStaffService.java @@ -1,6 +1,7 @@ package com.lz.modules.flow.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.lz.modules.app.entity.StaffSimpleInfo; import com.lz.modules.flow.entity.EvaluationStartStaff; import java.util.List; @@ -40,4 +41,5 @@ public interface EvaluationStartStaffService extends IService selectStaffIdsByStartAndStaffId(Long id, List staffIds); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/EvaluationStartStaffServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/EvaluationStartStaffServiceImpl.java index 0b739f1f..70b470a4 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/EvaluationStartStaffServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/EvaluationStartStaffServiceImpl.java @@ -1,6 +1,7 @@ package com.lz.modules.flow.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.lz.modules.app.entity.StaffSimpleInfo; import com.lz.modules.flow.dao.EvaluationStartStaffMapper; import com.lz.modules.flow.entity.EvaluationStartStaff; import com.lz.modules.flow.service.EvaluationStartStaffService; @@ -103,4 +104,9 @@ public class EvaluationStartStaffServiceImpl extends ServiceImpl selectStaffIdsByStartAndStaffId(Long id, List staffIds){ + return evaluationStartStaffMapper.selectStaffIdsByStartAndStaffId(id, staffIds); + } } diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java index 3cde6edc..476bcc3f 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java @@ -8,6 +8,7 @@ import com.lz.common.utils.StringUtil; import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.entity.StaffSimpleInfo; import com.lz.modules.app.service.StaffService; +import com.lz.modules.flow.dao.EvaluationStartStaffMapper; import com.lz.modules.flow.dao.FlowStartMapper; import com.lz.modules.flow.entity.*; import com.lz.modules.flow.model.*; @@ -83,6 +84,7 @@ public class FlowStartServiceImpl extends ServiceImpl staffIds = evaluationGroupService.selectAllStaffSimpleInfoByGroupId(evaluationGroup); + if(flowStart.getIsDelete() != null){//已经发起过的 + //下面去调已经发起的用户 + List longs = evaluationStartStaffService.selectStaffIdsByStartAndStaffId(flowStart.getId(), staffIds); + if(longs.size() > 0){ + Map map + = staffIds.stream().collect(Collectors.toMap(StaffSimpleInfo::getId, e->e)); + for (Long key:longs + ) { + map.remove(key); + } + staffIds = map.values().stream().collect(Collectors.toList()); + } + } + + if(staffIds.size() == 0){ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//事务回滚 diff --git a/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml b/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml index 484d23ac..5d23fb0e 100644 --- a/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml +++ b/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml @@ -167,5 +167,15 @@ + +