diff --git a/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java b/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java index a205681f..f437367a 100644 --- a/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java @@ -35,7 +35,10 @@ public interface EvaluationGroupMapper extends BaseMapper { int deleteEvaluationGroupById(@Param("id")Long id); - List seleteEvaluationGroupByReq(@Param("page") IPage page, @Param("req") EvaluationGroupReq req, @Param("list") List gIds); + List seleteEvaluationGroupByReq(@Param("page") IPage page, + @Param("req") EvaluationGroupReq req, + @Param("list") List gIds, + @Param("isStart") Boolean isStart); List selectEvaluationGroupByIds(@Param("ids") List ids); 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 7625cba0..a8af783f 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 @@ -123,6 +123,7 @@ public class EvaluationGroupServiceImpl extends ServiceImpl gIds = null; + Boolean isStart = false; if(req.getStartId() != null){//发起评分时调用,传发起的id FlowStart flowStart = flowStartService.selectFlowStartById(req.getStartId()); if(flowStart == null){ @@ -136,6 +137,7 @@ public class EvaluationGroupServiceImpl extends ServiceImpl staffRoles = staffRoleService.selectAllByStaffId(sysUserEntity.getUserId());//一个人只会有一个 @@ -166,8 +168,9 @@ public class EvaluationGroupServiceImpl extends ServiceImpl finalGIds = gIds; + Boolean isStart1 = isStart; PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(), req.getPageSize()) - .doSelect(page -> evaluationGroupMapper.seleteEvaluationGroupByReq(page, req, finalGIds)); + .doSelect(page -> evaluationGroupMapper.seleteEvaluationGroupByReq(page, req, finalGIds, isStart1)); //下面实时统计考核人数 List groups = pageUtils.getList(); for (EvaluationGroup group:groups diff --git a/src/main/resources/mapper/flow/EvaluationGroupMapper.xml b/src/main/resources/mapper/flow/EvaluationGroupMapper.xml index 4af838b6..840a0079 100644 --- a/src/main/resources/mapper/flow/EvaluationGroupMapper.xml +++ b/src/main/resources/mapper/flow/EvaluationGroupMapper.xml @@ -100,7 +100,8 @@