From cd7ae3deb0ad46a720f72a6b088bbdbb54d8dcc3 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, 26 Oct 2020 11:03:34 +0800
Subject: [PATCH] fix

---
 .../controller/AssessManagerController.java       |  1 +
 .../modules/performance/req/AssessDetailReq.java  | 15 +++++----------
 .../resources/mapper/app/ResultRecordMapper.xml   | 13 +++++++++++++
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java
index 929a95c8..35028f44 100644
--- a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java
+++ b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java
@@ -43,6 +43,7 @@ public class AssessManagerController {
     }
 
     @PostMapping("assess/manager/detail")
+    @ApiOperation("获取考核详情列表")
     @ApiResponses({@ApiResponse(code = 200,message = "成功",response = AssessManagerDetailRes.class)})
     public R assessDetail(@RequestBody AssessDetailReq req){
         PageUtils pageUtils = assessManagerService.assessDetail(req);
diff --git a/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java b/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java
index 054977b0..3653ec1b 100644
--- a/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java
+++ b/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java
@@ -1,6 +1,7 @@
 package com.lz.modules.performance.req;
 
 import com.lz.modules.equipment.entity.model.BasePage;
+import io.swagger.models.auth.In;
 import lombok.Data;
 
 import java.util.List;
@@ -13,15 +14,9 @@ import java.util.List;
 @Data
 public class AssessDetailReq extends BasePage{
     //考勤组id
-    private Long groupId;
-
-    private String month;
-
-    private String startTime;
-
-    private String endTime;
-    //周期类型
-    private int type;
+    private Long evaluationId;
+    //发起考核的id
+    private int startId;
     //员工名称
     private String staffName;
     //部门ids数组
@@ -29,5 +24,5 @@ public class AssessDetailReq extends BasePage{
     //人员id数组
     private List<Long> staffIds;
     //状态 确认 执行 结果录入。。。
-    private int status;
+    private Integer flowProcess;
 }
diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml
index c66b9b39..50d4b090 100644
--- a/src/main/resources/mapper/app/ResultRecordMapper.xml
+++ b/src/main/resources/mapper/app/ResultRecordMapper.xml
@@ -388,6 +388,19 @@
         ON r.start_id = s.start_id and r.staff_id = s.staff_id
         where r.is_delete = 0 and s.is_delete = 0
         and r.start_id = #{startId}
+        <if test="evaluationId !=null">
+            and r.evaluation_id = #{evaluationId}
+        </if>
+        <if test="flowProcess !=null">
+            and r.flow_process = #{flowProcess}
+        </if>
+        <if test="staffIds !=null and staffIds.size() !=0">
+            and staff_id in(
+            <foreach collection="staffIds" item="staff_id" separator=",">
+                #{staff_id}
+            </foreach>
+            )
+        </if>
     </select>
 
 </mapper>