From 8ff78938faeb36f6dfed7fd3575167d774e780d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Wed, 14 Oct 2020 11:40:24 +0800 Subject: [PATCH] fix --- .../lz/modules/flow/dao/FlowRecordMapper.java | 3 +- .../flow/service/FlowRecordService.java | 5 ++- .../service/impl/FlowRecordServiceImpl.java | 11 ++++- .../controller/TaskController.java | 40 +++++++++++++++---- .../performance/req/AssessTaskReq.java | 14 +++++++ ...ticalRes.java => ChartStatisticalRes.java} | 2 +- 6 files changed, 63 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/lz/modules/performance/req/AssessTaskReq.java rename src/main/java/com/lz/modules/performance/res/{chartStatisticalRes.java => ChartStatisticalRes.java} (87%) 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 d0a33b7b..4c89e486 100644 --- a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java @@ -8,6 +8,7 @@ package com.lz.modules.flow.dao; * @since 2020-08-18 */ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.lz.modules.flow.entity.FlowRecord; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -52,6 +53,6 @@ public interface FlowRecordMapper extends BaseMapper { Long copyFlowRecord(FlowRecord flowRecord); //查看自己要审批的记录 status为1代表流程走到了这里 - List selectFlowRecordIdsByApprovalStaffId(@Param("approvalStaffId") Long approvalStaffId); + List selectFlowRecordIdsByApprovalStaffId(@Param("status") int status,@Param("approvalStaffId") Long approvalStaffId, @Param("page") IPage page); } \ 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 b4cc0c42..358a4ba1 100644 --- a/src/main/java/com/lz/modules/flow/service/FlowRecordService.java +++ b/src/main/java/com/lz/modules/flow/service/FlowRecordService.java @@ -1,7 +1,10 @@ package com.lz.modules.flow.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.lz.common.utils.PageUtils; +import com.lz.modules.equipment.entity.model.BasePage; import com.lz.modules.flow.entity.FlowRecord; +import com.lz.modules.performance.req.AssessTaskReq; import com.lz.modules.sys.entity.app.ResultRecord; import java.util.List; @@ -53,5 +56,5 @@ public interface FlowRecordService extends IService { Long copyFlowRecord(FlowRecord flowRecord); - List selectFlowRecordIdsByApprovalStaffId(Long approvalStaffId); + PageUtils selectFlowRecordIdsByApprovalStaffId(AssessTaskReq req, 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 3eed82ec..0faadb81 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 @@ -1,15 +1,19 @@ package com.lz.modules.flow.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lz.common.utils.Constant; +import com.lz.common.utils.PageUtils; import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.service.StaffService; import com.lz.modules.app.utils.t.OneTuple; +import com.lz.modules.equipment.entity.model.BasePage; import com.lz.modules.flow.dao.FlowRecordMapper; import com.lz.modules.flow.entity.FlowRecord; import com.lz.modules.flow.enums.FlowRecordEnum; import com.lz.modules.flow.model.StaffRoleDto; import com.lz.modules.flow.service.FlowRecordService; +import com.lz.modules.performance.req.AssessTaskReq; import com.lz.modules.sys.entity.app.ResultRecord; import com.lz.modules.sys.service.app.ResultRecordService; import org.springframework.beans.factory.annotation.Autowired; @@ -139,7 +143,10 @@ public class FlowRecordServiceImpl extends ServiceImpl selectFlowRecordIdsByApprovalStaffId(Long approvalStaffId) { - return flowRecordMapper.selectFlowRecordIdsByApprovalStaffId(approvalStaffId); + public PageUtils selectFlowRecordIdsByApprovalStaffId(AssessTaskReq req, Long approvalStaffId) { + PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(), req.getPageSize()).doSelect( + page -> flowRecordMapper.selectFlowRecordIdsByApprovalStaffId(req.getStatus(),approvalStaffId,page) + ); + return pageUtils; } } diff --git a/src/main/java/com/lz/modules/performance/controller/TaskController.java b/src/main/java/com/lz/modules/performance/controller/TaskController.java index 2de967ab..a4884329 100644 --- a/src/main/java/com/lz/modules/performance/controller/TaskController.java +++ b/src/main/java/com/lz/modules/performance/controller/TaskController.java @@ -1,17 +1,23 @@ package com.lz.modules.performance.controller; +import com.lz.common.utils.DateUtils; +import com.lz.common.utils.PageUtils; 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.equipment.entity.model.BasePage; import com.lz.modules.flow.service.FlowChangeService; import com.lz.modules.flow.service.FlowRecordService; import com.lz.modules.performance.req.AssessDetailReq; import com.lz.modules.performance.req.AssessListReq; +import com.lz.modules.performance.req.AssessTaskReq; +import com.lz.modules.performance.res.ChartStatisticalRes; 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 io.swagger.annotations.Api; import org.apache.commons.collections.CollectionUtils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -28,41 +34,61 @@ import java.util.Optional; */ @RestController @RequestMapping("/performance") +@Api(value="任务事项", tags={"任务相关接口"}) public class TaskController extends AbstractController{ + private FlowRecordService flowRecordService; + private ResultRecordService resultRecordService; + private StaffService staffService; + private FlowChangeService flowChangeService; @RequestMapping("task/list") - public R list(int status){ + public R list(AssessTaskReq req){ List list = new ArrayList<>(); Long userId = getUserId(); - List flowRecordIds = flowRecordService.selectFlowRecordIdsByApprovalStaffId(userId); - if(CollectionUtils.isEmpty(flowRecordIds)){ + PageUtils pageUtils = flowRecordService.selectFlowRecordIdsByApprovalStaffId(req,userId); + if(pageUtils.getTotalCount() == 0){ return R.ok(); } + List flowRecordIds = pageUtils.getList(); 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(); + String name = staffEntity.getName(); + if(resultRecord.getStaffId().equals(resultRecord.getCurrentApprovalStaffId())){ + name = "您"; + } + //根据状态拼接文案 + res.setTitle(name + "的" + resultRecord.getMonthTime() + ""); + res.setTime(DateUtils.format(resultRecord.getGmtModified(),DateUtils.DATE_TIME_PATTERN)); + //跳转绩效详情页 + res.setUrl("?" + recordId); list.add(res); }); - return R.ok(); + PageUtils data = new PageUtils(); + data.setList(list); + data.setPageSize(req.getPageSize()); + data.setCurrPage(req.getCurrPage()); + data.setTotalCount(pageUtils.getTotalCount()); + data.setTotalPage(pageUtils.getTotalPage()); + return R.ok().put("page",data); } @RequestMapping("assess/group/list") public R groupList(@RequestBody AssessListReq req){ + ChartStatisticalRes res = new ChartStatisticalRes(); return R.ok(); } @RequestMapping("assess/group/detail") public R groupDetail(@RequestBody AssessDetailReq req){ + ChartStatisticalRes res = new ChartStatisticalRes(); return R.ok(); } diff --git a/src/main/java/com/lz/modules/performance/req/AssessTaskReq.java b/src/main/java/com/lz/modules/performance/req/AssessTaskReq.java new file mode 100644 index 00000000..41bfd27c --- /dev/null +++ b/src/main/java/com/lz/modules/performance/req/AssessTaskReq.java @@ -0,0 +1,14 @@ +package com.lz.modules.performance.req; + +import com.lz.modules.equipment.entity.model.BasePage; +import lombok.Data; + +/** + * @Author: djc + * @Desc: + * @Date: 2020/10/14 11:38 + */ +@Data +public class AssessTaskReq extends BasePage{ + private int status; +} diff --git a/src/main/java/com/lz/modules/performance/res/chartStatisticalRes.java b/src/main/java/com/lz/modules/performance/res/ChartStatisticalRes.java similarity index 87% rename from src/main/java/com/lz/modules/performance/res/chartStatisticalRes.java rename to src/main/java/com/lz/modules/performance/res/ChartStatisticalRes.java index 8eb3ac05..3bb6e1dc 100644 --- a/src/main/java/com/lz/modules/performance/res/chartStatisticalRes.java +++ b/src/main/java/com/lz/modules/performance/res/ChartStatisticalRes.java @@ -8,7 +8,7 @@ import lombok.Data; * @Date: 2020/10/13 18:25 */ @Data -public class chartStatisticalRes { +public class ChartStatisticalRes { private String desc; //人数