From 61d9b9237cde718e6963ffcc8a6c624661468ffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 10 Dec 2020 11:01:09 +0800 Subject: [PATCH 1/3] fix --- .../performance/dto/ResultTaskDto.java | 48 ++++--------------- .../performance/res/ResultTaskDetailRes.java | 10 +--- .../service/impl/ResultTaskServiceImpl.java | 33 ++++++++----- 3 files changed, 30 insertions(+), 61 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java b/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java index 636e619f..d0bff310 100644 --- a/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java +++ b/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java @@ -29,43 +29,13 @@ public class ResultTaskDto { //任务的当前进度 @ApiModelProperty(value = "任务的当前进度", name = "processRate") private BigDecimal processRate; - /** - * 任务名称 - * @return - */ - public String getName() { - return name; - } - /** - * 任务名称 - * @param name - */ - public void setName(String name) { - this.name = name; - } - - - - /** - * 任务的当前进度 - * @return - */ - public BigDecimal getProcessRate() { - return processRate; - } - /** - * 任务的当前进度 - * @param processRate - */ - public void setProcessRate(BigDecimal processRate) { - this.processRate = processRate; - } - - @Override - public String toString() { - return "ResultTaskDto{" + - "name='" + name + '\'' + - ", processRate=" + processRate + - '}'; - } + //头像 + @ApiModelProperty(value = "头像", name = "avatar") + private String avatar; + //姓名 + @ApiModelProperty(value = "姓名", name = "staffName") + private String staffName; + //标签 + @ApiModelProperty(value = "标签", name = "label") + private String label; } \ 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 fdf0b1e2..5e9feef0 100644 --- a/src/main/java/com/lz/modules/performance/res/ResultTaskDetailRes.java +++ b/src/main/java/com/lz/modules/performance/res/ResultTaskDetailRes.java @@ -28,13 +28,5 @@ 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 e0e4a0cf..274eae7e 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 @@ -28,6 +28,7 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.util.List; import java.util.Optional; +import java.util.function.Consumer; /** *

@@ -94,26 +95,32 @@ public class ResultTaskServiceImpl extends ServiceImpl { - res.setProcessRate(resultDetail1.getProcessRate()); - res.setTarget(resultDetail1.getTarget()); + if(resultDetail != null){ + res.setProcessRate(resultDetail.getProcessRate()); + res.setTarget(resultDetail.getTarget()); Long staffId = resultDetail.getStaffId(); - StaffEntity staffEntity = staffService.selectStaffById(staffId); - res.setAvatar(staffEntity.getAvatar()); - }); + staffEntity = staffService.selectStaffById(staffId); + } 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()); - } + StaffEntity finalStaffEntity = staffEntity; + resultTasks.forEach(resultTaskDto -> { + TaskProcessRecordDto taskProcessRecordDto = taskProcessRecordMapper.selectTaskProcessRecordLastByTaskId(resultTaskDto.getId()); + if(taskProcessRecordDto != null){ + resultTaskDto.setStaffName(taskProcessRecordDto.getStaffName()); + resultTaskDto.setLabel(taskProcessRecordDto.getLabel()); + if(finalStaffEntity !=null){ + resultTaskDto.setAvatar(finalStaffEntity.getAvatar()); + } + } + }); } + res.setResultTasks(resultTasks); return res; } From dd9409b3de66a4389e0f61d1c94003ba4a9dfa54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 10 Dec 2020 11:09:20 +0800 Subject: [PATCH 2/3] fix --- .../modules/performance/controller/ResultTaskController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java b/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java index b0f3cb53..1fbadedc 100644 --- a/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java +++ b/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java @@ -2,6 +2,7 @@ package com.lz.modules.performance.controller; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; +import com.lz.modules.performance.dto.TaskProcessRecordDto; import com.lz.modules.performance.entity.TaskProcessRecord; import com.lz.modules.performance.req.ChangeTaskListReq; import com.lz.modules.performance.req.ResultUpdateTaskReq; @@ -56,7 +57,7 @@ public class ResultTaskController { @PostMapping("/result/changeTaskList") @ApiOperation("任务变更记录") - @ApiResponses({@ApiResponse(code = 200,message = "成功")}) + @ApiResponses({@ApiResponse(code = 200,message = "成功",response = TaskProcessRecordDto.class)}) public R changeTaskList(ChangeTaskListReq req){ PageUtils pageUtils = taskProcessRecordService.selectTaskProcessRecordsByTaskId(req); return R.ok().put("data",pageUtils); From 518031ea132874fe613addde693ad618b7ba76a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 10 Dec 2020 13:45:34 +0800 Subject: [PATCH 3/3] fix --- src/main/resources/mapper/performance/ResultTaskMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/performance/ResultTaskMapper.xml b/src/main/resources/mapper/performance/ResultTaskMapper.xml index 5b94ecd5..95ebb1e9 100644 --- a/src/main/resources/mapper/performance/ResultTaskMapper.xml +++ b/src/main/resources/mapper/performance/ResultTaskMapper.xml @@ -85,7 +85,7 @@ @@ -93,7 +93,7 @@