fix
This commit is contained in:
parent
2562b7c608
commit
382ea51922
@ -17,7 +17,7 @@ public class ChartStatisticalRes {
|
||||
@ApiModelProperty(value = "类型 0:节点统计 1:等级统计 2:人数统计 ",name = "type")
|
||||
private int type;
|
||||
|
||||
private List<ChartStatistical> data;
|
||||
private List<ChartStatistical> statisticals;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -50,20 +50,20 @@ public class ChartResultServiceImpl implements ChartResultService {
|
||||
List<ChartStatistical> process = resultRecordService.countNumByFlowProcess(query);
|
||||
res = new ChartStatisticalRes();
|
||||
res.setType(0);
|
||||
res.setData(process);
|
||||
res.setStatisticals(process);
|
||||
data.add(res);
|
||||
|
||||
List<ChartStatistical> scoreLevel = resultRecordService.countNumByScoreLevel(query);
|
||||
res = new ChartStatisticalRes();
|
||||
res.setType(1);
|
||||
res.setData(scoreLevel);
|
||||
res.setStatisticals(scoreLevel);
|
||||
data.add(res);
|
||||
|
||||
List<String> strings = evaluationGroupService.selectAllStaffIdsByGroupId(3L);
|
||||
List<ChartStatistical> depstaff = this.countDepartmentAndStaffNum(strings);
|
||||
res = new ChartStatisticalRes();
|
||||
res.setType(2);
|
||||
res.setData(depstaff);
|
||||
res.setStatisticals(depstaff);
|
||||
data.add(res);
|
||||
return data;
|
||||
|
||||
|
||||
@ -28,6 +28,7 @@ spring:
|
||||
wall:
|
||||
config:
|
||||
multi-statement-allow: true
|
||||
none-base-statement-allow: true
|
||||
console:
|
||||
env: dev
|
||||
dingtalk:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user