From d5623b7d3e6d6162d3c3a12c14cd454d9d8a76bf Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Fri, 13 Nov 2020 09:59:43 +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

---
 .../java/com/lz/modules/app/resp/FlowRecordResp.java   |  4 ++++
 .../sys/service/app/impl/ResultRecordServiceImpl.java  | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/lz/modules/app/resp/FlowRecordResp.java b/src/main/java/com/lz/modules/app/resp/FlowRecordResp.java
index 782a4456..9e0d1b3e 100644
--- a/src/main/java/com/lz/modules/app/resp/FlowRecordResp.java
+++ b/src/main/java/com/lz/modules/app/resp/FlowRecordResp.java
@@ -13,6 +13,10 @@ public class FlowRecordResp {
 
     private int status;
 
+    private int realStatus;
+
     private List<FlowDetailResp> flowDetailRespList;
 
+
+
 }
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 92c57ac1..94dd5535 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
@@ -1146,6 +1146,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             }
             FlowRecordResp resp = new FlowRecordResp();
             resp.setFlowName(flowRecord.getFlowName());
+            resp.setRealStatus(flowRecord.getStatus());
             resp.setStaffName(flowRecord.getApprovalStaffName());
             resp.setStatus(flowRecord.getStatus() == 2 ? 1 : flowRecord.getStatus());
 
@@ -1204,11 +1205,12 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
 
         for(FlowRecordResp flowRecordResp : flowRecordList){
             List<FlowDetailResp>  flowDetailResps = flowRecordResp.getFlowDetailRespList();
-            if(flowDetailResps !=null && flowDetailResps.size() ==1 ){
+            if(flowDetailResps !=null && flowDetailResps.size() ==1 && flowRecordResp.getRealStatus() == 2){
                 auth.put("transfer",flowDetailResps.get(0).getTransfer());
                 auth.put("tiaozhuang",flowDetailResps.get(0).getTiaozhuang());
             }
         }
+
         Map<String, Object> map = new HashMap<>();
         map.put("flowRecordList", flowRecordList);
         map.put("resultCommentList", resultCommentList);
@@ -1232,7 +1234,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         return auth;
     }
 
-
     public void mySetFlowDetailRespList(List<FlowDetailResp> flowDetailRespList ,FlowRecord flowRecord,Long loginUserId,Long recordStaffId){
         FlowDetailResp flowDetailResp  = new FlowDetailResp();
         flowDetailResp.setCurrentStaffId(flowRecord.getApprovalStaffId());
@@ -1251,7 +1252,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         flowDetailResp.setAvatar(staffEntity.getAvatar());
         DepartmentsEntity departmentsEntity = departmentsDao.selectByDepartmentId(departmentsStaffRelateEntity.getDepartmentId());
         flowDetailResp.setDepartName(departmentsEntity.getDepartmentName());
-        if((new Integer(0).equals(flowRecord.getStatus()) || new Integer(2).equals(flowRecord.getStatus())) && flowRecord.getFlowProcess() != 0  ){
+        if(new Integer(0).equals(flowRecord.getStatus()) || new Integer(2).equals(flowRecord.getStatus())){
             int position = 0 ;
             StaffRole staffRole = staffRoleService.selectStaffRolesByStaffIdDepartmentLevelList(loginUserId,
                     Arrays.asList(new String[]{RoleEnums.CHILD_PM.getName(),RoleEnums.MASTER_PM.getName()}));
@@ -1292,6 +1293,9 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
              */
             if(position == 1){     //如果是绩效管理员
                 initTiaoZhuangZhuangJiao(flowDetailResp,1,1);
+                if(flowRecord.getFlowProcess() == 0 ){//目标制定有转交，但是没有跳过
+                    initTiaoZhuangZhuangJiao(flowDetailResp,0,1);
+                }
             }else if (position == 2 ){ //如果是审批节点人员
                 Map<String,Integer> auth = getAuth(flowRecord.getFlowStaffIdRole());
                 if(new Integer(1).equals(auth.get("transfer"))){