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-21 11:17:42 +08:00
parent 4e89c24e49
commit cfdc86c01e
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java
View File

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