From 89efd3ef51fb0b53a79d6f0dcca07e3ee1f14653 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com>
Date: Tue, 13 Oct 2020 15:26:26 +0800
Subject: [PATCH] fix

---
 .../lz/modules/flow/dao/FlowRecordMapper.java |  4 ++++
 .../flow/service/FlowRecordService.java       |  2 ++
 .../service/impl/FlowRecordServiceImpl.java   |  5 +++-
 .../modules/performance/TaskController.java   | 23 +++++++++++++++++--
 .../mapper/flow/FlowRecordMapper.xml          |  4 ++++
 5 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java
index 99a4bd10..18aa08ae 100644
--- a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java
+++ b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java
@@ -50,4 +50,8 @@ public interface FlowRecordMapper extends BaseMapper<FlowRecord> {
     List<FlowRecord> selectFlowRecordByResultRecordIdTypeStatus(@Param("recordResultId") Long recordResultId, @Param("type") Integer type, @Param("status") int status);
 
 	Long copyFlowRecord(FlowRecord flowRecord);
+
+	//查看自己要审批的记录 status为1代表流程走到了这里
+	List<FlowRecord> selectFlowRecordListByApprovalStaffId(@Param("approvalStaffId") Long approvalStaffId);
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/flow/service/FlowRecordService.java b/src/main/java/com/lz/modules/flow/service/FlowRecordService.java
index 9e5c519d..e1860e66 100644
--- a/src/main/java/com/lz/modules/flow/service/FlowRecordService.java
+++ b/src/main/java/com/lz/modules/flow/service/FlowRecordService.java
@@ -52,4 +52,6 @@ public interface FlowRecordService extends IService<FlowRecord> {
 	List<FlowRecord> selectFlowRecordByResultRecordIdTypeStatus(Long recordResultId, Integer type, int status);
 
 	Long copyFlowRecord(FlowRecord flowRecord);
+
+	List<FlowRecord> selectFlowRecordListByApprovalStaffId(Long approvalStaffId);
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java
index 57dd8f77..ab4107eb 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java
@@ -138,5 +138,8 @@ public class FlowRecordServiceImpl extends ServiceImpl<FlowRecordMapper, FlowRec
 		return flowRecordMapper.copyFlowRecord(flowRecord);
 	}
 
-
+	@Override
+	public List<FlowRecord> selectFlowRecordListByApprovalStaffId(Long approvalStaffId) {
+		return flowRecordMapper.selectFlowRecordListByApprovalStaffId(approvalStaffId);
+	}
 }
diff --git a/src/main/java/com/lz/modules/performance/TaskController.java b/src/main/java/com/lz/modules/performance/TaskController.java
index 635f6805..8a12d85e 100644
--- a/src/main/java/com/lz/modules/performance/TaskController.java
+++ b/src/main/java/com/lz/modules/performance/TaskController.java
@@ -1,11 +1,19 @@
 package com.lz.modules.performance;
 
 import com.lz.common.utils.R;
+import com.lz.modules.flow.entity.FlowRecord;
+import com.lz.modules.flow.service.FlowRecordService;
 import com.lz.modules.sys.controller.AbstractController;
+import com.lz.modules.sys.entity.app.ResultRecord;
+import com.lz.modules.sys.service.app.ResultRecordService;
 import com.lz.modules.third.service.ThirdMsgSendRecordService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+import java.util.function.Consumer;
+
 /**
  * @Author: djc
  * @Desc:
@@ -14,12 +22,23 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/performance")
 public class TaskController extends AbstractController{
-    private ThirdMsgSendRecordService thirdMsgSendRecordService;
+    private FlowRecordService flowRecordService;
+    private ResultRecordService resultRecordService;
 
     @RequestMapping("task/list")
     public R list(){
         Long userId = getUserId();
-        thirdMsgSendRecordService.list();
+        List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordListByApprovalStaffId(userId);
+        if(CollectionUtils.isEmpty(flowRecords)){
+            return R.ok();
+        }
+        flowRecords.stream().forEach(flowRecord -> {
+            Long recordId = flowRecord.getRecordId();
+            ResultRecord resultRecord = resultRecordService.selectResultRecordById(recordId);
+        });
+        ThreadLocal<Long> threadLocal = new ThreadLocal<>();
+        threadLocal.set(1L);
+        threadLocal.get();
 
         return R.ok();
     }
diff --git a/src/main/resources/mapper/flow/FlowRecordMapper.xml b/src/main/resources/mapper/flow/FlowRecordMapper.xml
index f715e1a4..32c6687a 100644
--- a/src/main/resources/mapper/flow/FlowRecordMapper.xml
+++ b/src/main/resources/mapper/flow/FlowRecordMapper.xml
@@ -200,6 +200,10 @@
          select * from lz_flow_record  where  is_delete = 0 and record_id = #{recordResultId} and type = #{type}  and status = #{status}
     </select>
 
+    <select id="selectFlowRecordListByApprovalStaffId" resultType="com.lz.modules.flow.entity.FlowRecord">
+        select * from lz_flow_record  where  is_delete = 0 and approval_staff_id = #{approvalStaffId}  and status = 1
+    </select>
+
 
 </mapper>