From 3e6332791e4ebf08bb313277b0204a500877a8c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com>
Date: Mon, 2 Nov 2020 18:16:19 +0800
Subject: [PATCH 1/2] fix

---
 .../res/AssessManagerDetailRes.java           |  6 ++-
 .../service/impl/ChartResultServiceImpl.java  |  4 +-
 .../sys/dao/app/ResultRecordMapper.java       |  4 +-
 .../sys/service/app/ResultRecordService.java  |  4 +-
 .../app/impl/ResultRecordServiceImpl.java     |  8 ++--
 .../mapper/app/ResultRecordMapper.xml         | 38 +++++++++++++++++--
 6 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/lz/modules/performance/res/AssessManagerDetailRes.java b/src/main/java/com/lz/modules/performance/res/AssessManagerDetailRes.java
index cc80f341..7c9a840c 100644
--- a/src/main/java/com/lz/modules/performance/res/AssessManagerDetailRes.java
+++ b/src/main/java/com/lz/modules/performance/res/AssessManagerDetailRes.java
@@ -31,6 +31,10 @@ public class AssessManagerDetailRes {
     @ApiModelProperty(value = "绩效等级",name = "scoreLevel")
     private String scoreLevel;
 
-    @ApiModelProperty(value = "id",name = "id")
+    @ApiModelProperty(value = "绩效record id",name = "id")
     private Long id;
+
+    @ApiModelProperty(value = "人员staff id",name = "staffId")
+    private Long staffId;
+
 }
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 0b896738..20a59c38 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
@@ -83,7 +83,7 @@ public class ChartResultServiceImpl implements ChartResultService {
         List<ChartStatisticalRes> data = new ArrayList<>();
         ChartStatisticalRes res;
 
-        List<ChartStatistical> process = resultRecordService.countNumByFlowProcess(startId);
+        List<ChartStatistical> process = resultRecordService.countNumByFlowProcess(startId,null,null);
 
         res = new ChartStatisticalRes();
         res.setType(0);
@@ -95,7 +95,7 @@ public class ChartResultServiceImpl implements ChartResultService {
         }
         data.add(res);
 
-        List<ChartStatistical> scoreLevel = resultRecordService.countNumByScoreLevel(startId);
+        List<ChartStatistical> scoreLevel = resultRecordService.countNumByScoreLevel(startId,null,null);
         res = new ChartStatisticalRes();
         res.setType(1);
         res.setStatisticals(scoreLevel);
diff --git a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
index 62fb07c9..bf9f9a14 100644
--- a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
+++ b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
@@ -73,9 +73,9 @@ public interface ResultRecordMapper extends BaseMapper<ResultRecord> {
 
     List<ResultRecord> selectResultRecordAllByStaffId(@Param("staffId") Long staffId);
 
-    List<ChartStatistical> countNumByFlowProcess(@Param("startId") Long startId);
+    List<ChartStatistical> countNumByFlowProcess(@Param("startId") Long startId,@Param("evaluationIds")List<Long> evaluationIds,@Param("departmentIds")List<Long> departmentIds);
 
-    List<ChartStatistical> countNumByScoreLevel(@Param("startId") Long startId);
+    List<ChartStatistical> countNumByScoreLevel(@Param("startId") Long startId,@Param("evaluationIds")List<Long> evaluationIds,@Param("departmentIds")List<Long> departmentIds);
 
     List<ResultRecord> selectChartDetailList(@Param("page") IPage page, @Param("staffIds") List<String> staffIds, @Param("startId")Long startId,@Param("scoreLevel")Long scoreLevel);
 
diff --git a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java
index a19563bc..0479e567 100644
--- a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java
+++ b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java
@@ -103,9 +103,9 @@ public interface ResultRecordService extends IService<ResultRecord> {
 
 	List<ResultRecord> selectResultRecordAllByStaffId(Long staffId);
 
-	List<ChartStatistical> countNumByFlowProcess(Long startId);
+	List<ChartStatistical> countNumByFlowProcess(Long startId,List<Long> evaluationIds,List<Long> departmentIds);
 
-	List<ChartStatistical> countNumByScoreLevel(Long startId);
+	List<ChartStatistical> countNumByScoreLevel(Long startId,List<Long> evaluationIds,List<Long> departmentIds);
 
 	void batchDeleteByStaffIds(List<String> staffIds);
 
diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
index 09288aff..7933dfae 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
@@ -750,13 +750,13 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
     }
 
     @Override
-    public List<ChartStatistical> countNumByFlowProcess(Long startId) {
-        return resultRecordMapper.countNumByFlowProcess(startId);
+    public List<ChartStatistical> countNumByFlowProcess(Long startId,List<Long> evaluationIds,List<Long> departmentIds) {
+        return resultRecordMapper.countNumByFlowProcess(startId,evaluationIds,departmentIds);
     }
 
     @Override
-    public List<ChartStatistical> countNumByScoreLevel(Long startId) {
-        return resultRecordMapper.countNumByScoreLevel(startId);
+    public List<ChartStatistical> countNumByScoreLevel(Long startId,List<Long> evaluationIds,List<Long> departmentIds) {
+        return resultRecordMapper.countNumByScoreLevel(startId,evaluationIds,departmentIds);
     }
 
     @Override
diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml
index fdba51f8..886340b8 100644
--- a/src/main/resources/mapper/app/ResultRecordMapper.xml
+++ b/src/main/resources/mapper/app/ResultRecordMapper.xml
@@ -353,11 +353,43 @@
     </select>
 
     <select id="countNumByFlowProcess" resultType="com.lz.modules.performance.res.ChartStatistical">
-        SELECT count(flow_process) num,flow_process as 'desc' from lz_result_record where is_delete=0 and start_id =#{startId} GROUP BY flow_process
+        SELECT count(flow_process) num,flow_process as 'desc' from lz_result_record where is_delete=0
+        and start_id =#{startId}
+        <if test="evaluationIds !=null and evaluationIds.size()!=0">
+            and evaluation_id in (
+            <foreach collection="evaluationIds" item="evaluation_id" separator=",">
+                #{evaluation_id}
+            </foreach>
+            )
+        </if>
+        <if test="departmentIds !=null and departmentIds.size()!=0">
+            and department_id in (
+            <foreach collection="departmentIds" item="department_id" separator=",">
+                #{department_id}
+            </foreach>
+            )
+        </if>
+        GROUP BY flow_process
     </select>
 
     <select id="countNumByScoreLevel" resultType="com.lz.modules.performance.res.ChartStatistical">
-        SELECT count(score_level) num,case score_level WHEN 0 THEN '无等级' ELSE score_level END as 'desc' from lz_result_record where is_delete=0 and start_id =#{startId} GROUP BY score_level
+        SELECT count(score_level) num,case score_level WHEN 0 THEN '无等级' ELSE score_level END as 'desc' from lz_result_record where is_delete=0
+        and start_id =#{startId}
+        <if test="evaluationIds !=null and evaluationIds.size()!=0">
+            and evaluation_id in (
+            <foreach collection="evaluationIds" item="evaluation_id" separator=",">
+                #{evaluation_id}
+            </foreach>
+            )
+        </if>
+        <if test="departmentIds !=null and departmentIds.size()!=0">
+            and department_id in (
+            <foreach collection="departmentIds" item="department_id" separator=",">
+                #{department_id}
+            </foreach>
+            )
+        </if>
+        GROUP BY score_level
     </select>
 
     <select id="selectChartDetailList" resultType="com.lz.modules.performance.res.ResultRankListRes">
@@ -395,7 +427,7 @@
     </select>
 
     <select id="selectAssessListByStartId" resultType="com.lz.modules.performance.res.AssessManagerDetailRes">
-        select r.id,staff_name,department_name,all_score,score_level,evaluation_name from lz_result_record  r
+        select r.id,r.staff_id,staff_name,department_name,all_score,score_level,evaluation_name from lz_result_record  r
         LEFT JOIN lz_evaluation_start_staff s
         ON r.start_id = s.start_id and r.staff_id = s.staff_id
         where r.is_delete = 0 and s.is_delete = 0

From 3f87608dcbd478ef2bfdf64fdb1ce363254b77ff Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Tue, 3 Nov 2020 09:22:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BA=BF=E6=9D=9F?=
 =?UTF-8?q?=E4=B8=BA=E7=BB=93=E6=9D=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/service/app/impl/ResultRecordServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
index 7933dfae..82def16b 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
@@ -1111,7 +1111,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             flowIndex = flowRecord.getFlowIndex();
         }
         FlowRecordResp end = new FlowRecordResp();
-        end.setFlowName("线束");
+        end.setFlowName("结束");
         flowRecordList.add(end);
         List<ResultComment> resultCommentList = resultCommentService.selectByRecordId(recordDetailDto.getResultRecordId());