From 8d9d82da6d2670e6884acfe40893636348297eaa 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 17:43:14 +0800 Subject: [PATCH] fix --- .../lz/modules/flow/dao/FlowRecordMapper.java | 2 +- .../flow/service/FlowRecordService.java | 2 +- .../service/impl/FlowRecordServiceImpl.java | 4 +-- .../modules/performance/TaskController.java | 28 +++++++++++++------ .../modules/performance/res/TaskListRes.java | 20 +++++++++++++ .../mapper/flow/FlowRecordMapper.xml | 5 ++-- 6 files changed, 46 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/lz/modules/performance/res/TaskListRes.java 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 18aa08ae..d0a33b7b 100644 --- a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java @@ -52,6 +52,6 @@ public interface FlowRecordMapper extends BaseMapper { Long copyFlowRecord(FlowRecord flowRecord); //查看自己要审批的记录 status为1代表流程走到了这里 - List selectFlowRecordListByApprovalStaffId(@Param("approvalStaffId") Long approvalStaffId); + List selectFlowRecordIdsByApprovalStaffId(@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 e1860e66..b4cc0c42 100644 --- a/src/main/java/com/lz/modules/flow/service/FlowRecordService.java +++ b/src/main/java/com/lz/modules/flow/service/FlowRecordService.java @@ -53,5 +53,5 @@ public interface FlowRecordService extends IService { Long copyFlowRecord(FlowRecord flowRecord); - List selectFlowRecordListByApprovalStaffId(Long approvalStaffId); + List selectFlowRecordIdsByApprovalStaffId(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 ab4107eb..3eed82ec 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 @@ -139,7 +139,7 @@ public class FlowRecordServiceImpl extends ServiceImpl selectFlowRecordListByApprovalStaffId(Long approvalStaffId) { - return flowRecordMapper.selectFlowRecordListByApprovalStaffId(approvalStaffId); + public List selectFlowRecordIdsByApprovalStaffId(Long approvalStaffId) { + return flowRecordMapper.selectFlowRecordIdsByApprovalStaffId(approvalStaffId); } } diff --git a/src/main/java/com/lz/modules/performance/TaskController.java b/src/main/java/com/lz/modules/performance/TaskController.java index 8a12d85e..d1acd373 100644 --- a/src/main/java/com/lz/modules/performance/TaskController.java +++ b/src/main/java/com/lz/modules/performance/TaskController.java @@ -1,8 +1,12 @@ package com.lz.modules.performance; import com.lz.common.utils.R; +import com.lz.common.utils.StringUtil; +import com.lz.modules.app.entity.StaffEntity; +import com.lz.modules.app.service.StaffService; import com.lz.modules.flow.entity.FlowRecord; import com.lz.modules.flow.service.FlowRecordService; +import com.lz.modules.performance.res.TaskListRes; import com.lz.modules.sys.controller.AbstractController; import com.lz.modules.sys.entity.app.ResultRecord; import com.lz.modules.sys.service.app.ResultRecordService; @@ -11,8 +15,12 @@ import org.apache.commons.collections.CollectionUtils; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; import java.util.List; +import java.util.Optional; import java.util.function.Consumer; +import java.util.function.Function; +import java.util.stream.Collectors; /** * @Author: djc @@ -24,22 +32,26 @@ import java.util.function.Consumer; public class TaskController extends AbstractController{ private FlowRecordService flowRecordService; private ResultRecordService resultRecordService; + private StaffService staffService; @RequestMapping("task/list") public R list(){ + List list = new ArrayList<>(); Long userId = getUserId(); - List flowRecords = flowRecordService.selectFlowRecordListByApprovalStaffId(userId); - if(CollectionUtils.isEmpty(flowRecords)){ + List flowRecordIds = flowRecordService.selectFlowRecordIdsByApprovalStaffId(userId); + if(CollectionUtils.isEmpty(flowRecordIds)){ return R.ok(); } - flowRecords.stream().forEach(flowRecord -> { - Long recordId = flowRecord.getRecordId(); + flowRecordIds.stream().forEach(recordId -> { + TaskListRes res = new TaskListRes(); ResultRecord resultRecord = resultRecordService.selectResultRecordById(recordId); + StaffEntity staffEntity = staffService.selectStaffById(resultRecord.getStaffId()); + res.setAvatar(Optional.ofNullable(staffEntity.getAvatar()).orElse(StringUtil.EMPTY)); + //res.setTitle(); 根据状态拼接文案 + //res.setTime(); + //res.setUrl(); + list.add(res); }); - ThreadLocal threadLocal = new ThreadLocal<>(); - threadLocal.set(1L); - threadLocal.get(); - return R.ok(); } } diff --git a/src/main/java/com/lz/modules/performance/res/TaskListRes.java b/src/main/java/com/lz/modules/performance/res/TaskListRes.java new file mode 100644 index 00000000..e034df09 --- /dev/null +++ b/src/main/java/com/lz/modules/performance/res/TaskListRes.java @@ -0,0 +1,20 @@ +package com.lz.modules.performance.res; + +import lombok.Data; + +/** + * @Author: djc + * @Desc: + * @Date: 2020/10/13 17:15 + */ +@Data +public class TaskListRes { + //头像 + private String avatar; + //标题 + private String title; + //时间 + private String time; + //跳转路径 + private String url; +} diff --git a/src/main/resources/mapper/flow/FlowRecordMapper.xml b/src/main/resources/mapper/flow/FlowRecordMapper.xml index 32c6687a..6bf94bed 100644 --- a/src/main/resources/mapper/flow/FlowRecordMapper.xml +++ b/src/main/resources/mapper/flow/FlowRecordMapper.xml @@ -200,10 +200,9 @@ select * from lz_flow_record where is_delete = 0 and record_id = #{recordResultId} and type = #{type} and status = #{status} - + select distinct(record_id) from lz_flow_record where is_delete = 0 and approval_staff_id = #{approvalStaffId} and status = 1 -