From d90ea0b15a8a6581e8bd06c18e8f848864ef8ca3 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Mon, 26 Oct 2020 16:01:20 +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

---
 src/main/java/com/lz/modules/flow/dao/FlowMapper.java        | 2 +-
 src/main/java/com/lz/modules/flow/service/FlowService.java   | 2 +-
 .../com/lz/modules/flow/service/impl/FlowServiceImpl.java    | 4 ++--
 .../sys/service/app/impl/ResultDetailServiceImpl.java        | 2 +-
 .../sys/service/app/impl/ResultRecordServiceImpl.java        | 5 ++---
 src/main/resources/mapper/flow/FlowMapper.xml                | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/lz/modules/flow/dao/FlowMapper.java b/src/main/java/com/lz/modules/flow/dao/FlowMapper.java
index 5889418e..35eb72ef 100644
--- a/src/main/java/com/lz/modules/flow/dao/FlowMapper.java
+++ b/src/main/java/com/lz/modules/flow/dao/FlowMapper.java
@@ -33,5 +33,5 @@ public interface FlowMapper extends BaseMapper<Flow> {
 	int deleteFlowById(@Param("id")Long id);
 
 
-    List<Flow> selectByFlowId(@Param("flowId") Long flowId);
+    List<Flow> selectByFlowId(@Param("flowId") Long flowId, @Param("startId") Long startId);
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/flow/service/FlowService.java b/src/main/java/com/lz/modules/flow/service/FlowService.java
index f01cc681..3e96a946 100644
--- a/src/main/java/com/lz/modules/flow/service/FlowService.java
+++ b/src/main/java/com/lz/modules/flow/service/FlowService.java
@@ -33,7 +33,7 @@ public interface FlowService extends IService<Flow> {
 	int deleteFlowById(Long id);
 
 
-    List<Flow> selectByFlowId(Long flowId);
+    List<Flow> selectByFlowId(Long flowId,Long startId);
 
     FlowChart selectFlowChartByChartId(Long flowId);
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowServiceImpl.java
index 57c36e07..4c6a11b8 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/FlowServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/FlowServiceImpl.java
@@ -66,8 +66,8 @@ public class FlowServiceImpl extends ServiceImpl<FlowMapper, Flow> implements Fl
 	}
 
     @Override
-    public List<Flow> selectByFlowId(Long flowId) {
-        return flowMapper.selectByFlowId(flowId);
+    public List<Flow> selectByFlowId(Long flowId,Long startId) {
+        return flowMapper.selectByFlowId(flowId,startId);
     }
 
 	@Override
diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java
index 5c1dfe64..49998998 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java
@@ -245,7 +245,7 @@ public class ResultDetailServiceImpl extends ServiceImpl<ResultDetailMapper, Res
 		Map<String, FlowDepartment> staffEntityMap = list.stream().collect(Collectors.toMap(FlowDepartment::getDepartmentLevel, p -> p));
 
 		Long flowId = flowInfo.getFirst();
-		List<Flow> flows = flowService.selectByFlowId(flowId);
+		List<Flow> flows = flowService.selectByFlowId(flowId,0l);
 
 		int flowIndex = lastFlowRecord != null ? lastFlowRecord.getFlowIndex() + 1 : 1;
 		log.info("flowIndex = " + flowIndex);
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 9e6c23b0..4cddc7c0 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
@@ -465,7 +465,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             }
         }
         log.info("approvalList approval : " + Arrays.toString(approvalList.toArray()) );
-        List<Flow> flows = flowService.selectByFlowId(flowId);
+        List<Flow> flows = flowService.selectByFlowId(flowId,0l);
         FlowRecord lastFlowRecord = flowRecordService.selectLastFlowRecordByRecordId(resultRecordId);
         FlowRecord notFlowRecord = flowRecordService.selectNotApprovalStaffIdFlowRecords(resultRecord.getId());
         if (notFlowRecord != null) {
@@ -757,7 +757,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
     @Override
     public R initFlowRecord(Long resultRecordId) {
         ResultRecord resultRecord = resultRecordMapper.selectResultRecordById(resultRecordId);
-        List<Flow> flows = flowService.selectByFlowId(resultRecord.getEvaluationId());
+        List<Flow> flows = flowService.selectByFlowId(resultRecord.getEvaluationId(),resultRecord.getStartId());
         List<Long> flowIds = new ArrayList<>();
         for(Flow flow:flows){
             flowIds.add(flow.getId());
@@ -786,7 +786,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             }else if(FlowApprovalRoleTypeEnums.FOUR_SUPPER.getType().equals(flowApprovalRole.getType())){
                 staffEntity = getDepartmentStaff(map,5);
             }
-
             flowRecord.setApprovalStaffName(staffEntity.getName());
             flowRecord.setApprovalStaffId(staffEntity.getId());
             flowRecord.setFlowName(getFlow(flows,flowApprovalRole.getFlowId()).getOptDesc());
diff --git a/src/main/resources/mapper/flow/FlowMapper.xml b/src/main/resources/mapper/flow/FlowMapper.xml
index e8f2cde1..0d59c825 100644
--- a/src/main/resources/mapper/flow/FlowMapper.xml
+++ b/src/main/resources/mapper/flow/FlowMapper.xml
@@ -100,7 +100,7 @@
     </update>
 
     <select id="selectByFlowId" resultType="com.lz.modules.flow.entity.Flow">
-        select * from lz_flow where flow_id = #{flowId} and is_delete = 0
+        select * from lz_flow where flow_id = #{flowId} and is_delete =  0 and start_id = #{startId}
     </select>
 
 </mapper>