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 1/3] 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 { List selectFlowRecordByResultRecordIdTypeStatus(@Param("recordResultId") Long recordResultId, @Param("type") Integer type, @Param("status") int status); Long copyFlowRecord(FlowRecord flowRecord); + + //查看自己要审批的记录 status为1代表流程走到了这里 + List 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 { List selectFlowRecordByResultRecordIdTypeStatus(Long recordResultId, Integer type, int status); Long copyFlowRecord(FlowRecord flowRecord); + + List 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 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 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 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} + + 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 2/3] 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 - From 42d85bb4b6bf8eddc91d0999350323e96ea253af 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:54:47 +0800 Subject: [PATCH 3/3] fix --- .../{ => controller}/EvaluationGroupController.java | 2 +- .../{ => controller}/EvaluationStartStaffController.java | 2 +- .../{ => controller}/FlowApprovalRoleController.java | 2 +- .../performance/{ => controller}/FlowChangeController.java | 2 +- .../performance/{ => controller}/FlowChartController.java | 2 +- .../performance/{ => controller}/FlowStartController.java | 2 +- .../performance/{ => controller}/ResultModelController.java | 2 +- .../performance/{ => controller}/ResultScoreController.java | 2 +- .../modules/performance/{ => controller}/TaskController.java | 4 +++- 9 files changed, 11 insertions(+), 9 deletions(-) rename src/main/java/com/lz/modules/performance/{ => controller}/EvaluationGroupController.java (97%) rename src/main/java/com/lz/modules/performance/{ => controller}/EvaluationStartStaffController.java (97%) rename src/main/java/com/lz/modules/performance/{ => controller}/FlowApprovalRoleController.java (97%) rename src/main/java/com/lz/modules/performance/{ => controller}/FlowChangeController.java (96%) rename src/main/java/com/lz/modules/performance/{ => controller}/FlowChartController.java (97%) rename src/main/java/com/lz/modules/performance/{ => controller}/FlowStartController.java (96%) rename src/main/java/com/lz/modules/performance/{ => controller}/ResultModelController.java (96%) rename src/main/java/com/lz/modules/performance/{ => controller}/ResultScoreController.java (96%) rename src/main/java/com/lz/modules/performance/{ => controller}/TaskController.java (93%) diff --git a/src/main/java/com/lz/modules/performance/EvaluationGroupController.java b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java similarity index 97% rename from src/main/java/com/lz/modules/performance/EvaluationGroupController.java rename to src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java index 423e4282..20c40a12 100644 --- a/src/main/java/com/lz/modules/performance/EvaluationGroupController.java +++ b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java @@ -1,4 +1,4 @@ -package com.lz.modules.performance; +package com.lz.modules.performance.controller; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/lz/modules/performance/EvaluationStartStaffController.java b/src/main/java/com/lz/modules/performance/controller/EvaluationStartStaffController.java similarity index 97% rename from src/main/java/com/lz/modules/performance/EvaluationStartStaffController.java rename to src/main/java/com/lz/modules/performance/controller/EvaluationStartStaffController.java index bfcb8c89..5b59a2fd 100644 --- a/src/main/java/com/lz/modules/performance/EvaluationStartStaffController.java +++ b/src/main/java/com/lz/modules/performance/controller/EvaluationStartStaffController.java @@ -1,4 +1,4 @@ -package com.lz.modules.performance; +package com.lz.modules.performance.controller; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/lz/modules/performance/FlowApprovalRoleController.java b/src/main/java/com/lz/modules/performance/controller/FlowApprovalRoleController.java similarity index 97% rename from src/main/java/com/lz/modules/performance/FlowApprovalRoleController.java rename to src/main/java/com/lz/modules/performance/controller/FlowApprovalRoleController.java index a7af7657..936e64bd 100644 --- a/src/main/java/com/lz/modules/performance/FlowApprovalRoleController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowApprovalRoleController.java @@ -1,4 +1,4 @@ -package com.lz.modules.performance; +package com.lz.modules.performance.controller; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/lz/modules/performance/FlowChangeController.java b/src/main/java/com/lz/modules/performance/controller/FlowChangeController.java similarity index 96% rename from src/main/java/com/lz/modules/performance/FlowChangeController.java rename to src/main/java/com/lz/modules/performance/controller/FlowChangeController.java index 851e0f83..f0a25d71 100644 --- a/src/main/java/com/lz/modules/performance/FlowChangeController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowChangeController.java @@ -1,4 +1,4 @@ -package com.lz.modules.performance; +package com.lz.modules.performance.controller; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/lz/modules/performance/FlowChartController.java b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java similarity index 97% rename from src/main/java/com/lz/modules/performance/FlowChartController.java rename to src/main/java/com/lz/modules/performance/controller/FlowChartController.java index 73708fcb..ee0d8e74 100644 --- a/src/main/java/com/lz/modules/performance/FlowChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java @@ -1,4 +1,4 @@ -package com.lz.modules.performance; +package com.lz.modules.performance.controller; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/lz/modules/performance/FlowStartController.java b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java similarity index 96% rename from src/main/java/com/lz/modules/performance/FlowStartController.java rename to src/main/java/com/lz/modules/performance/controller/FlowStartController.java index ea84debe..7d660770 100644 --- a/src/main/java/com/lz/modules/performance/FlowStartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java @@ -1,4 +1,4 @@ -package com.lz.modules.performance; +package com.lz.modules.performance.controller; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/lz/modules/performance/ResultModelController.java b/src/main/java/com/lz/modules/performance/controller/ResultModelController.java similarity index 96% rename from src/main/java/com/lz/modules/performance/ResultModelController.java rename to src/main/java/com/lz/modules/performance/controller/ResultModelController.java index c38349bf..7ca7cf1d 100644 --- a/src/main/java/com/lz/modules/performance/ResultModelController.java +++ b/src/main/java/com/lz/modules/performance/controller/ResultModelController.java @@ -1,4 +1,4 @@ -package com.lz.modules.performance; +package com.lz.modules.performance.controller; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/lz/modules/performance/ResultScoreController.java b/src/main/java/com/lz/modules/performance/controller/ResultScoreController.java similarity index 96% rename from src/main/java/com/lz/modules/performance/ResultScoreController.java rename to src/main/java/com/lz/modules/performance/controller/ResultScoreController.java index 43e829e4..4a6a5167 100644 --- a/src/main/java/com/lz/modules/performance/ResultScoreController.java +++ b/src/main/java/com/lz/modules/performance/controller/ResultScoreController.java @@ -1,4 +1,4 @@ -package com.lz.modules.performance; +package com.lz.modules.performance.controller; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/lz/modules/performance/TaskController.java b/src/main/java/com/lz/modules/performance/controller/TaskController.java similarity index 93% rename from src/main/java/com/lz/modules/performance/TaskController.java rename to src/main/java/com/lz/modules/performance/controller/TaskController.java index d1acd373..f4eda336 100644 --- a/src/main/java/com/lz/modules/performance/TaskController.java +++ b/src/main/java/com/lz/modules/performance/controller/TaskController.java @@ -1,10 +1,11 @@ -package com.lz.modules.performance; +package com.lz.modules.performance.controller; 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.FlowChangeService; import com.lz.modules.flow.service.FlowRecordService; import com.lz.modules.performance.res.TaskListRes; import com.lz.modules.sys.controller.AbstractController; @@ -33,6 +34,7 @@ public class TaskController extends AbstractController{ private FlowRecordService flowRecordService; private ResultRecordService resultRecordService; private StaffService staffService; + private FlowChangeService flowChangeService; @RequestMapping("task/list") public R list(){