wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
杜建超 2020-10-22 17:24:07 +08:00
parent 378b3a062f
commit 36e06f47ac
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/lz/modules/performance/controller/AssessManagerController.java
View File

@ -3,6 +3,7 @@ package com.lz.modules.performance.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.lz.common.utils.PageUtils; import com.lz.common.utils.PageUtils;
import com.lz.common.utils.R; import com.lz.common.utils.R;
import com.lz.common.utils.StringUtil;
import com.lz.modules.flow.dao.FlowStartMapper; import com.lz.modules.flow.dao.FlowStartMapper;
import com.lz.modules.flow.entity.EvaluationGroup; import com.lz.modules.flow.entity.EvaluationGroup;
import com.lz.modules.flow.entity.FlowStart; import com.lz.modules.flow.entity.FlowStart;
@ -63,8 +64,9 @@ public class AssessManagerController {
if(name.contains("绩效考核")){ if(name.contains("绩效考核")){
res.setCycleTime(name.substring(0,name.lastIndexOf("绩效考核"))); res.setCycleTime(name.substring(0,name.lastIndexOf("绩效考核")));
} }
int i = resultRecordMapper.countStartAndGroupNum(flowStart.getId());
res.setJoinNum(""); ResultRecord resultRecord = resultRecordMapper.selectOneByStartId(flowStart.getId());
res.setJoinNum(resultRecord == null? StringUtil.EMPTY : resultRecord.getStaffName() + i + "人");
data.add(res); data.add(res);
}); });
PageUtils pages = new PageUtils(); PageUtils pages = new PageUtils();

2
src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
View File

@ -82,4 +82,6 @@ public interface ResultRecordMapper extends BaseMapper<ResultRecord> {
void batchDeleteByStaffIdsAndMonth(@Param("staffIds")List<String> staffIds,@Param("startTime")String startTime,@Param("endTime")String endTime); void batchDeleteByStaffIdsAndMonth(@Param("staffIds")List<String> staffIds,@Param("startTime")String startTime,@Param("endTime")String endTime);
int countStartAndGroupNum(@Param("startId")Long startId); int countStartAndGroupNum(@Param("startId")Long startId);
ResultRecord selectOneByStartId(@Param("startId")Long startId);
} }

5
src/main/resources/mapper/app/ResultRecordMapper.xml
View File

@ -368,5 +368,10 @@
<select id="countStartAndGroupNum" resultType="int"> <select id="countStartAndGroupNum" resultType="int">
select COUNT(1) from lz_result_record where is_delete = 0 and start_id = #{startId} select COUNT(1) from lz_result_record where is_delete = 0 and start_id = #{startId}
</select> </select>
<select id="selectOneByStartId" resultType="int">
select * from lz_result_record where is_delete = 0 and start_id = #{startId} limit 1
</select>
</mapper> </mapper>