From 2b2ab2ff07a79863ac46ae7f13d2470bf1f8de02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com>
Date: Wed, 28 Oct 2020 11:06:32 +0800
Subject: [PATCH] fix

---
 .../lz/modules/performance/req/ChartResultReq.java    |  4 ++--
 .../performance/res/AssessManagerDetailRes.java       | 11 +++++++++++
 .../service/impl/ChartResultServiceImpl.java          |  2 +-
 .../lz/modules/sys/dao/app/ResultRecordMapper.java    |  2 +-
 src/main/resources/mapper/app/ResultRecordMapper.xml  |  6 +++---
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/lz/modules/performance/req/ChartResultReq.java b/src/main/java/com/lz/modules/performance/req/ChartResultReq.java
index 5d49ac0c..89921e5e 100644
--- a/src/main/java/com/lz/modules/performance/req/ChartResultReq.java
+++ b/src/main/java/com/lz/modules/performance/req/ChartResultReq.java
@@ -20,6 +20,6 @@ public class ChartResultReq extends BasePage{
     @ApiModelProperty(value = "考核id",name = "startId")
     private Long startId;
 
-    @ApiModelProperty(value = "状态",name = "flowProcess")
-    private Long flowProcess;
+    @ApiModelProperty(value = "等级",name = "scoreLevel")
+    private Long scoreLevel;
 }
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 81b67935..cc80f341 100644
--- a/src/main/java/com/lz/modules/performance/res/AssessManagerDetailRes.java
+++ b/src/main/java/com/lz/modules/performance/res/AssessManagerDetailRes.java
@@ -1,5 +1,7 @@
 package com.lz.modules.performance.res;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -11,15 +13,24 @@ import java.util.List;
  * @Date: 2020/10/21 11:35
  */
 @Data
+@ApiModel("考核详情列表实体")
 public class AssessManagerDetailRes {
 
+    @ApiModelProperty(value = "姓名",name = "staffName")
     private String staffName;
 
+    @ApiModelProperty(value = "部门名称",name = "departmentName")
     private String departmentName;
 
+    @ApiModelProperty(value = "考核组",name = "evaluationName")
     private String evaluationName;
 
+    @ApiModelProperty(value = "考核结果",name = "allScore")
     private String allScore;
 
+    @ApiModelProperty(value = "绩效等级",name = "scoreLevel")
     private String scoreLevel;
+
+    @ApiModelProperty(value = "id",name = "id")
+    private Long id;
 }
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 9a2a18f2..3beeeca5 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
@@ -138,7 +138,7 @@ public class ChartResultServiceImpl implements ChartResultService {
         List<String> allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(req.getDepartmentId());
         List<String> ids = staffService.staffsByAllDeparmentIds(allDeparmentIds);
         PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(), req.getPageSize()).doSelect(
-                page -> resultRecordMapper.selectChartDetailList(page,ids,req.getStartId(),req.getFlowProcess())
+                page -> resultRecordMapper.selectChartDetailList(page,ids,req.getStartId(),req.getScoreLevel())
         );
         return pageUtils;
     }
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 1ac62e74..91ac06e9 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
@@ -77,7 +77,7 @@ public interface ResultRecordMapper extends BaseMapper<ResultRecord> {
 
     List<ChartStatistical> countNumByScoreLevel(@Param("startId") Long startId);
 
-    List<ResultRecord> selectChartDetailList(@Param("page") IPage page, @Param("staffIds") List<String> staffIds, @Param("startId")Long startId,@Param("flowProcess")Long flowProcess);
+    List<ResultRecord> selectChartDetailList(@Param("page") IPage page, @Param("staffIds") List<String> staffIds, @Param("startId")Long startId,@Param("scoreLevel")Long scoreLevel);
 
     void batchDeleteByStartId(@Param("startId")Long startId);
 
diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml
index 93c566d2..19403641 100644
--- a/src/main/resources/mapper/app/ResultRecordMapper.xml
+++ b/src/main/resources/mapper/app/ResultRecordMapper.xml
@@ -373,8 +373,8 @@
             </foreach>
             )
         </if>
-        <if test="flowProcess !=null">
-            and r.flow_process = #{flowProcess}
+        <if test="scoreLevel !=null">
+            and r.score_level = #{scoreLevel}
         </if>
         ORDER BY all_score desc
     </select>
@@ -395,7 +395,7 @@
     </select>
 
     <select id="selectAssessListByStartId" resultType="com.lz.modules.performance.res.AssessManagerDetailRes">
-        select staff_name,department_name,all_score,score_level,evaluation_name from lz_result_record  r
+        select r.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