diff --git a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java index 9ac16041..d65e2ebd 100644 --- a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java +++ b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java @@ -3,6 +3,7 @@ package com.lz.modules.performance.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; +import com.lz.common.utils.StringUtil; import com.lz.modules.flow.dao.FlowStartMapper; import com.lz.modules.flow.entity.EvaluationGroup; import com.lz.modules.flow.entity.FlowStart; @@ -63,8 +64,9 @@ public class AssessManagerController { if(name.contains("绩效考核")){ res.setCycleTime(name.substring(0,name.lastIndexOf("绩效考核"))); } - - res.setJoinNum(""); + int i = resultRecordMapper.countStartAndGroupNum(flowStart.getId()); + ResultRecord resultRecord = resultRecordMapper.selectOneByStartId(flowStart.getId()); + res.setJoinNum(resultRecord == null? StringUtil.EMPTY : resultRecord.getStaffName() + i + "人"); data.add(res); }); PageUtils pages = new PageUtils(); diff --git a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java index 6bc57278..8a78825d 100644 --- a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java +++ b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java @@ -82,4 +82,6 @@ public interface ResultRecordMapper extends BaseMapper { void batchDeleteByStaffIdsAndMonth(@Param("staffIds")List staffIds,@Param("startTime")String startTime,@Param("endTime")String endTime); int countStartAndGroupNum(@Param("startId")Long startId); + + ResultRecord selectOneByStartId(@Param("startId")Long startId); } \ No newline at end of file diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index 5d58efd4..2c570ee5 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -368,5 +368,10 @@ + + +