From fc12b8d9e580e3000f58fb1ed994e1748fea6352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com>
Date: Tue, 20 Oct 2020 17:03:36 +0800
Subject: [PATCH] fix

---
 .../modules/performance/res/AssessListRes.java | 18 ++++++++++++++++++
 .../performance/res/ChartStatistical.java      |  5 +++--
 .../service/impl/ChartResultServiceImpl.java   |  8 ++++++--
 .../mapper/app/ResultRecordMapper.xml          |  3 ++-
 4 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/com/lz/modules/performance/res/AssessListRes.java

diff --git a/src/main/java/com/lz/modules/performance/res/AssessListRes.java b/src/main/java/com/lz/modules/performance/res/AssessListRes.java
new file mode 100644
index 00000000..948511e4
--- /dev/null
+++ b/src/main/java/com/lz/modules/performance/res/AssessListRes.java
@@ -0,0 +1,18 @@
+package com.lz.modules.performance.res;
+
+import lombok.Data;
+
+/**
+ * @Author: djc
+ * @Desc:
+ * @Date: 2020/10/20 15:54
+ */
+@Data
+public class AssessListRes {
+    //考核名称
+    private String name;
+    //时间周期
+    private String cycleTime;
+    //组人员
+    private String groupNum;
+}
diff --git a/src/main/java/com/lz/modules/performance/res/ChartStatistical.java b/src/main/java/com/lz/modules/performance/res/ChartStatistical.java
index a6dd5078..077f99aa 100644
--- a/src/main/java/com/lz/modules/performance/res/ChartStatistical.java
+++ b/src/main/java/com/lz/modules/performance/res/ChartStatistical.java
@@ -3,13 +3,14 @@ package com.lz.modules.performance.res;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.commons.lang.StringUtils;
 
 @Data
 @ApiModel(value = "报表统计实体")
 public class ChartStatistical {
     @ApiModelProperty(value = "描述",name = "desc")
-    private String desc;
+    private String desc = StringUtils.EMPTY;
 
     @ApiModelProperty(value = "人数",name = "num")
-    private int num;
+    private int num = 0;
 }
\ No newline at end of file
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 86b3deb5..e7763d3a 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
@@ -1,5 +1,6 @@
 package com.lz.modules.performance.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Maps;
 import com.lz.common.utils.PageUtils;
@@ -52,21 +53,24 @@ public class ChartResultServiceImpl implements ChartResultService {
     public List<ChartStatisticalRes> chartReport(ChartResultReq req) {
         List<ChartStatisticalRes> data = new ArrayList<>();
         AssessListReq query = new AssessListReq();
-        ChartStatisticalRes res = null;
+        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);
-        List<String> strings = evaluationGroupService.selectAllStaffIdsByGroupId(1L);
+        data.add(res);
+        List<String> strings = evaluationGroupService.selectAllStaffIdsByGroupId(3L);
         List<ChartStatistical> depstaff = this.countDepartmentAndStaffNum(strings);
         res = new ChartStatisticalRes();
         res.setType(2);
         res.setData(depstaff);
+        data.add(res);
         return data;
 
     }
diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml
index b11df7f6..404796d0 100644
--- a/src/main/resources/mapper/app/ResultRecordMapper.xml
+++ b/src/main/resources/mapper/app/ResultRecordMapper.xml
@@ -339,10 +339,11 @@
     </select>
 
     <select id="countNumByFlowProcess" resultType="com.lz.modules.performance.res.ChartStatistical">
-        SELECT count(flow_process) num,flow_process type from lz_result_record where is_delete=0 GROUP BY flow_process
+        SELECT count(flow_process) num,flow_process as 'desc' from lz_result_record where is_delete=0 GROUP BY flow_process
     </select>
 
     <select id="countNumByScoreLevel" resultType="com.lz.modules.performance.res.ChartStatistical">
+        SELECT count(score_level) num,score_level as 'desc' from lz_result_record where is_delete=0 GROUP BY score_level
     </select>
 
     <select id="selectResultRankList" resultType="com.lz.modules.performance.res.ResultRankListRes">