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..d0a33b7b 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 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 9e5c519d..b4cc0c42 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 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 57dd8f77..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 @@ -138,5 +138,8 @@ public class FlowRecordServiceImpl extends ServiceImpl 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 deleted file mode 100644 index 635f6805..00000000 --- a/src/main/java/com/lz/modules/performance/TaskController.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.lz.modules.performance; - -import com.lz.common.utils.R; -import com.lz.modules.sys.controller.AbstractController; -import com.lz.modules.third.service.ThirdMsgSendRecordService; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @Author: djc - * @Desc: - * @Date: 2020/10/13 11:27 - */ -@RestController -@RequestMapping("/performance") -public class TaskController extends AbstractController{ - private ThirdMsgSendRecordService thirdMsgSendRecordService; - - @RequestMapping("task/list") - public R list(){ - Long userId = getUserId(); - thirdMsgSendRecordService.list(); - - return R.ok(); - } -} 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/controller/TaskController.java b/src/main/java/com/lz/modules/performance/controller/TaskController.java new file mode 100644 index 00000000..f4eda336 --- /dev/null +++ b/src/main/java/com/lz/modules/performance/controller/TaskController.java @@ -0,0 +1,59 @@ +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; +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.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 + * @Desc: + * @Date: 2020/10/13 11:27 + */ +@RestController +@RequestMapping("/performance") +public class TaskController extends AbstractController{ + private FlowRecordService flowRecordService; + private ResultRecordService resultRecordService; + private StaffService staffService; + private FlowChangeService flowChangeService; + + @RequestMapping("task/list") + public R list(){ + List list = new ArrayList<>(); + Long userId = getUserId(); + List flowRecordIds = flowRecordService.selectFlowRecordIdsByApprovalStaffId(userId); + if(CollectionUtils.isEmpty(flowRecordIds)){ + return R.ok(); + } + 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); + }); + 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 f715e1a4..6bf94bed 100644 --- a/src/main/resources/mapper/flow/FlowRecordMapper.xml +++ b/src/main/resources/mapper/flow/FlowRecordMapper.xml @@ -200,6 +200,9 @@ select * from lz_flow_record where is_delete = 0 and record_id = #{recordResultId} and type = #{type} and status = #{status} +