From 35deed437e9119d681c36a11810f5581c23f88e9 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Wed, 9 Dec 2020 19:37:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/flow/FlowRecordMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mapper/flow/FlowRecordMapper.xml b/src/main/resources/mapper/flow/FlowRecordMapper.xml index cd947efb..2b883391 100644 --- a/src/main/resources/mapper/flow/FlowRecordMapper.xml +++ b/src/main/resources/mapper/flow/FlowRecordMapper.xml @@ -327,7 +327,7 @@ @@ -335,6 +335,7 @@ select * from lz_flow_record where is_delete = 0 and record_id = #{recordId} and flow_index #{flowIndex} + select * from lz_flow_record where is_delete = 0 and flow_index #{flowIndex} - and record_id = #{recordId} + and record_id = #{recordId} and flow_process !=2 and status in #{item} From 080900fe49b76fe0f5a9cce59dcc990d36a32061 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Thu, 10 Dec 2020 09:56:39 +0800 Subject: [PATCH 3/4] rjuq whnt --- .../com/lz/modules/app/controller/StaffRoleController.java | 3 +++ src/main/java/com/lz/modules/app/dto/TaskCommentDto.java | 1 + .../com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java | 3 +++ 3 files changed, 7 insertions(+) diff --git a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java index 2ecc3668..7815c27a 100644 --- a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java +++ b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java @@ -269,6 +269,9 @@ public class StaffRoleController extends AbstractController { //http://localhost:8080/lz_management/user/lzstaffrole/comment/list?detailId=4917&pageSize=2 @RequestMapping("/comment/list") public R commentList(TaskModel taskModel) { + if(taskModel.getStaffId() == null && getUser()!=null && getUserId() !=null){ + taskModel.setStaffId(getUserId()); + } return staffRoleService.commentList(taskModel); } diff --git a/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java b/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java index 8c35321f..f82b962a 100644 --- a/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java +++ b/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java @@ -5,4 +5,5 @@ import lombok.Data; @Data public class TaskCommentDto extends TaskComment { + private int isSelf; } diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java index 52a70d59..c3eb938f 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java @@ -655,6 +655,9 @@ public class StaffRoleServiceImpl extends ServiceImpl Date: Thu, 10 Dec 2020 10:05:29 +0800 Subject: [PATCH 4/4] fix --- .../dao/TaskProcessRecordMapper.java | 2 ++ .../performance/res/ResultTaskDetailRes.java | 9 ++++++++ .../service/impl/ResultTaskServiceImpl.java | 23 ++++++++++++++++++- .../performance/TaskProcessRecordMapper.xml | 3 +++ 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java b/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java index 4b149bdd..e955747f 100644 --- a/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java +++ b/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java @@ -38,4 +38,6 @@ public interface TaskProcessRecordMapper extends BaseMapper { int deleteTaskProcessRecordsByTaskId(@Param("taskId") Long taskId); + + TaskProcessRecordDto selectTaskProcessRecordLastByTaskId(@Param("taskId") Long taskId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/res/ResultTaskDetailRes.java b/src/main/java/com/lz/modules/performance/res/ResultTaskDetailRes.java index 0fb34a09..fdf0b1e2 100644 --- a/src/main/java/com/lz/modules/performance/res/ResultTaskDetailRes.java +++ b/src/main/java/com/lz/modules/performance/res/ResultTaskDetailRes.java @@ -28,4 +28,13 @@ public class ResultTaskDetailRes { //任务列表 @ApiModelProperty(value = "集体进度", name = "resultTasks") private List resultTasks; + //头像 + @ApiModelProperty(value = "头像", name = "avatar") + private String avatar; + //姓名 + @ApiModelProperty(value = "姓名", name = "staffName") + private String staffName; + //标签 + @ApiModelProperty(value = "标签", name = "label") + private String label; } diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java index 1abe031f..60eb347b 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java @@ -2,8 +2,12 @@ package com.lz.modules.performance.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lz.common.utils.BigDecimalUtil; +import com.lz.modules.app.entity.StaffEntity; +import com.lz.modules.app.service.StaffService; import com.lz.modules.performance.dao.ResultTaskMapper; +import com.lz.modules.performance.dao.TaskProcessRecordMapper; import com.lz.modules.performance.dto.ResultTaskDto; +import com.lz.modules.performance.dto.TaskProcessRecordDto; import com.lz.modules.performance.entity.ResultTask; import com.lz.modules.performance.entity.TaskProcessRecord; import com.lz.modules.performance.enums.ProcessRecordEnum; @@ -47,6 +51,10 @@ public class ResultTaskServiceImpl extends ServiceImpl { res.setProcessRate(resultDetail1.getProcessRate()); res.setTarget(resultDetail1.getTarget()); - }); + Long staffId = resultDetail.getStaffId(); + StaffEntity staffEntity = staffService.selectStaffById(staffId); + res.setAvatar(staffEntity.getAvatar()); + }); List resultTasks = resultTaskMapper.selectResultTaskDtosByDetailId(detailId); res.setResultTasks(resultTasks); + //获取最近更新记录 + if(CollectionUtils.isNotEmpty(resultTasks)){ + ResultTaskDto dto = resultTasks.get(resultTasks.size() - 1); + TaskProcessRecordDto taskProcessRecordDto = taskProcessRecordMapper.selectTaskProcessRecordLastByTaskId(dto.getId()); + if(taskProcessRecordDto != null){ + res.setStaffName(taskProcessRecordDto.getStaffName()); + res.setLabel(taskProcessRecordDto.getLabel()); + } + + } return res; } diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml index 85b3fe8f..c9cc4bf0 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -102,6 +102,9 @@ update lz_task_process_record set is_delete = 1 where task_id=#{taskId} +