diff --git a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java index e7763d3a..a9f9a10e 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java @@ -55,16 +55,19 @@ public class ChartResultServiceImpl implements ChartResultService { AssessListReq query = new AssessListReq(); ChartStatisticalRes res; BeanUtils.copyProperties(req,query); + List process = resultRecordService.countNumByFlowProcess(query); res = new ChartStatisticalRes(); res.setType(0); res.setData(process); data.add(res); + List scoreLevel = resultRecordService.countNumByScoreLevel(query); res = new ChartStatisticalRes(); res.setType(1); res.setData(scoreLevel); data.add(res); + List strings = evaluationGroupService.selectAllStaffIdsByGroupId(3L); List depstaff = this.countDepartmentAndStaffNum(strings); res = new ChartStatisticalRes(); @@ -80,10 +83,12 @@ public class ChartResultServiceImpl implements ChartResultService { if(CollectionUtils.isEmpty(staffIds)){ return Collections.EMPTY_LIST; } + List data = new ArrayList<>(); List list = departmentsStaffRelateService.list(new QueryWrapper() .eq("is_delete", 0) .in("staff_id", staffIds)); + Map map = Maps.newHashMap(); for(DepartmentsStaffRelateEntity entity:list){ String departmentId = entity.getDepartmentId();