From 382ea51922a280366054ce346868db8843b2d899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 22 Oct 2020 09:45:02 +0800 Subject: [PATCH] fix --- .../com/lz/modules/performance/res/ChartStatisticalRes.java | 2 +- .../performance/service/impl/ChartResultServiceImpl.java | 6 +++--- src/main/resources/application-dev.yml | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/res/ChartStatisticalRes.java b/src/main/java/com/lz/modules/performance/res/ChartStatisticalRes.java index 8e673c68..04829e53 100644 --- a/src/main/java/com/lz/modules/performance/res/ChartStatisticalRes.java +++ b/src/main/java/com/lz/modules/performance/res/ChartStatisticalRes.java @@ -17,7 +17,7 @@ public class ChartStatisticalRes { @ApiModelProperty(value = "类型 0：节点统计 1：等级统计 2:人数统计 ",name = "type") private int type; - private List data; + private List statisticals; } 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 aa29e516..234e0f34 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 @@ -50,20 +50,20 @@ public class ChartResultServiceImpl implements ChartResultService { List process = resultRecordService.countNumByFlowProcess(query); res = new ChartStatisticalRes(); res.setType(0); - res.setData(process); + res.setStatisticals(process); data.add(res); List scoreLevel = resultRecordService.countNumByScoreLevel(query); res = new ChartStatisticalRes(); res.setType(1); - res.setData(scoreLevel); + res.setStatisticals(scoreLevel); data.add(res); List strings = evaluationGroupService.selectAllStaffIdsByGroupId(3L); List depstaff = this.countDepartmentAndStaffNum(strings); res = new ChartStatisticalRes(); res.setType(2); - res.setData(depstaff); + res.setStatisticals(depstaff); data.add(res); return data; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index f3c0b9d9..a33a1510 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -28,6 +28,7 @@ spring: wall: config: multi-statement-allow: true + none-base-statement-allow: true console: env: dev dingtalk: