From 491f31797dcde22d0c65578c36550b44fb1d31a6 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Tue, 3 Nov 2020 15:14:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/ResultRecordController.java      |  5 +----
 .../com/lz/modules/app/resp/FlowDetailResp.java     |  1 +
 .../service/app/impl/ResultRecordServiceImpl.java   | 13 ++++++++++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
index 95d696ed..ff74be58 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -966,13 +966,10 @@ public class ResultRecordController extends AbstractController {
     }
 
 
-
-
-
     /**
      * 删除
      */
-    // 审批：http://localhost:8080/lz_management/user/lzresultrecord/new/approval?resultRecordId=267&status=1&comment=xxx&menuName=bbb
+    // 审批：http://localhost:8080/lz_management/user/lzresultrecord/new/approval?resultRecordId=215&status=1&comment=xxx&menuName=bbb
     // 跳过：http://localhost:8080/lz_management/user/lzresultrecord/new/approval?resultRecordId=215&status=4&menuName=bbb&flowRecordId=360
     // 转交：http://localhost:8080/lz_management/user/lzresultrecord/new/approval?resultRecordId=215&status=8&menuName=bbb&flowRecordId=360&transferStaffId=294
     @RequestMapping("/new/approval")
diff --git a/src/main/java/com/lz/modules/app/resp/FlowDetailResp.java b/src/main/java/com/lz/modules/app/resp/FlowDetailResp.java
index a463ed2d..14c1225a 100644
--- a/src/main/java/com/lz/modules/app/resp/FlowDetailResp.java
+++ b/src/main/java/com/lz/modules/app/resp/FlowDetailResp.java
@@ -8,5 +8,6 @@ public class FlowDetailResp {
     private String staffName;
     private Long flowRecordId;
     private String departName;
+    private String avatar;
 
 }
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 5c9fd4dc..9603f5bd 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
@@ -3,7 +3,6 @@ package com.lz.modules.sys.service.app.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dingtalk.api.response.OapiDepartmentListResponse;
 import com.lz.common.emun.WorkMsgTypeEnum;
 import com.lz.common.exception.RRException;
 import com.lz.common.utils.*;
@@ -1107,16 +1106,22 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
 
             List<FlowDetailResp> flowDetailRespList = new ArrayList<>();
             mySetFlowDetailRespList(flowDetailRespList,flowRecord);
-
             resp.setFlowDetailRespList(flowDetailRespList);
             flowRecordList.add(resp);
             flowIndex = flowRecord.getFlowIndex();
         }
+        boolean flag = true;
+        for(FlowRecordResp flowRecordResp : flowRecordList) {
+            if (flowRecordResp.getStatus() == 0) {
+                flag = false;
+                break;
+            }
+        }
         FlowRecordResp end = new FlowRecordResp();
         end.setFlowName("结束");
+        end.setStatus(flag ? 1 : 0);
         flowRecordList.add(end);
         List<ResultComment> resultCommentList = resultCommentService.selectByRecordId(recordDetailDto.getResultRecordId());
-
         Map<String,Integer> auth = new HashMap<>();
         auth.put("showScore",1);
         auth.put("showResult",1);
@@ -1161,7 +1166,9 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         flowDetailResp.setCurrentStaffId(flowRecord.getApprovalStaffId());
         flowDetailResp.setStaffName(flowRecord.getApprovalStaffName());
         flowDetailResp.setFlowRecordId(flowRecord.getId());
+        StaffEntity staffEntity = staffService.selectStaffById(flowRecord.getApprovalStaffId());
         DepartmentsStaffRelateEntity departmentsStaffRelateEntity = departmentsStaffRelateService.selectLastDepartmentByStaffId(flowRecord.getApprovalStaffId());
+        flowDetailResp.setAvatar(staffEntity.getAvatar());
         if(departmentsStaffRelateEntity !=null){
             DepartmentsEntity departmentsEntity = departmentsDao.selectByDepartmentId(departmentsStaffRelateEntity.getDepartmentId());
             flowDetailResp.setDepartName(departmentsEntity.getDepartmentName());