fix
This commit is contained in:
parent
4e89c24e49
commit
cfdc86c01e
@ -55,16 +55,19 @@ public class ChartResultServiceImpl implements ChartResultService {
|
||||
AssessListReq query = new AssessListReq();
|
||||
ChartStatisticalRes res;
|
||||
BeanUtils.copyProperties(req,query);
|
||||
|
||||
List<ChartStatistical> process = resultRecordService.countNumByFlowProcess(query);
|
||||
res = new ChartStatisticalRes();
|
||||
res.setType(0);
|
||||
res.setData(process);
|
||||
data.add(res);
|
||||
|
||||
List<ChartStatistical> scoreLevel = resultRecordService.countNumByScoreLevel(query);
|
||||
res = new ChartStatisticalRes();
|
||||
res.setType(1);
|
||||
res.setData(scoreLevel);
|
||||
data.add(res);
|
||||
|
||||
List<String> strings = evaluationGroupService.selectAllStaffIdsByGroupId(3L);
|
||||
List<ChartStatistical> 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<ChartStatistical> data = new ArrayList<>();
|
||||
List<DepartmentsStaffRelateEntity> list = departmentsStaffRelateService.list(new QueryWrapper<DepartmentsStaffRelateEntity>()
|
||||
.eq("is_delete", 0)
|
||||
.in("staff_id", staffIds));
|
||||
|
||||
Map<String,Integer> map = Maps.newHashMap();
|
||||
for(DepartmentsStaffRelateEntity entity:list){
|
||||
String departmentId = entity.getDepartmentId();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user