From 4a7c2d65e090ad0bedae37c415d8a348e05ab2be Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 3 Nov 2020 17:27:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=97=B6=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=B7=B2=E7=BB=8F=E5=8F=91=E8=B5=B7=E7=9A=84=E4=BA=BA?= =?UTF-8?q?=E5=91=98id=EF=BC=8C=E8=A7=A3=E5=86=B3=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flow/dao/EvaluationStartStaffMapper.java | 3 +++ .../service/EvaluationStartStaffService.java | 2 ++ .../impl/EvaluationStartStaffServiceImpl.java | 6 ++++++ .../service/impl/FlowStartServiceImpl.java | 18 ++++++++++++++++++ .../mapper/flow/EvaluationStartStaffMapper.xml | 9 +++++++++ 5 files changed, 38 insertions(+) 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..a75c2fab 100644 --- a/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml +++ b/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml @@ -167,5 +167,14 @@ + + From dc2f9cdb3f01106341b88ecb6878424e2906119c Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 3 Nov 2020 17:36:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml b/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml index a75c2fab..5d23fb0e 100644 --- a/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml +++ b/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml @@ -170,11 +170,12 @@