From 7d5c4122b305dadfc3b5ffb23104c4b77f9732be Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Fri, 13 Nov 2020 14:33:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=A9=E6=95=88=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=B5=81=E8=BD=AC=E7=8E=A9=E6=97=B6=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/ResultRecordController.java     | 14 ++++++++++++--
 .../resources/mapper/flow/FlowRecordMapper.xml     |  2 +-
 2 files changed, 13 insertions(+), 3 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 0b3d2087..287a3ea4 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -397,8 +397,17 @@ public class ResultRecordController extends AbstractController {
                 log.info("无法找到评分人员，开始找绩效管理人员");
                 staffs = staffService.findManger(resultRecord.getId(), ChartFlowType.SCORE.getCode());
             }
-            List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordIdStatus(resultRecord.getId(), 2);//获取当前的流程节点
-            if(flowRecords.get(0).getFlowProcess().intValue() > ChartFlowType.SCORE.getCode()){
+            List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordIdStatus(resultRecord.getId(), 0);//获取未执行的节点
+            if(flowRecords.size() > 0){
+                if(flowRecords.get(0).getFlowProcess().intValue() > ChartFlowType.SCORE.getCode()){
+                    //流程已经到了审批节点，那么判断评分是否为或签，如果是那么只需要返回实际评分的那个人即可，否则全部返回
+                    flowRecords = flowRecordService.selectFlowRecordByRecordIdFlowProcess(resultRecord.getId(), ChartFlowType.SCORE.getCode());//获取当前的流程节点
+                    if(flowRecords.get(0).getType().intValue() == 1){
+                        //或签
+                        isAllScore = false;
+                    }
+                }
+            }else{//绩效流程已经走完
                 //流程已经到了审批节点，那么判断评分是否为或签，如果是那么只需要返回实际评分的那个人即可，否则全部返回
                 flowRecords = flowRecordService.selectFlowRecordByRecordIdFlowProcess(resultRecord.getId(), ChartFlowType.SCORE.getCode());//获取当前的流程节点
                 if(flowRecords.get(0).getType().intValue() == 1){
@@ -410,6 +419,7 @@ public class ResultRecordController extends AbstractController {
 
 
 
+
             for (StaffEntity staff:staffs
             ) {
                 ResultScoreDto resultScore = new ResultScoreDto();
diff --git a/src/main/resources/mapper/flow/FlowRecordMapper.xml b/src/main/resources/mapper/flow/FlowRecordMapper.xml
index 0ae60ceb..c58c61ac 100644
--- a/src/main/resources/mapper/flow/FlowRecordMapper.xml
+++ b/src/main/resources/mapper/flow/FlowRecordMapper.xml
@@ -238,7 +238,7 @@
 
 
     <select id="selectFlowRecordByRecordIdStatus" resultType="com.lz.modules.flow.entity.FlowRecord">
-        select * from lz_flow_record  where  is_delete = 0 and record_id = #{resultRecordId} and status = #{status}
+        select * from lz_flow_record  where  is_delete = 0 and record_id = #{resultRecordId} and status = #{status} order by flow_index asc
     </select>
 
     <select id="selectFlowRecordByRecordIdAndFlowId" resultType="com.lz.modules.flow.entity.FlowRecord">