wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

Browse Source
This commit is contained in:
wulin 2020-12-10 13:53:38 +08:00
commit ba5cfa7277
5 changed files with 34 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/lz/modules/performance/controller/ResultTaskController.java
View File

@ -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);

48
src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java
View File

@ -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;
}

10
src/main/java/com/lz/modules/performance/res/ResultTaskDetailRes.java
View File

@ -28,13 +28,5 @@ public class ResultTaskDetailRes {
//任务列表
@ApiModelProperty(value = "集体进度", name = "resultTasks")
private List<ResultTaskDto> resultTasks;
//头像
@ApiModelProperty(value = "头像", name = "avatar")
private String avatar;
//姓名
@ApiModelProperty(value = "姓名", name = "staffName")
private String staffName;
//标签
@ApiModelProperty(value = "标签", name = "label")
private String label;
}

33
src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java
View File

@ -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;
/**
* <p>
@ -94,26 +95,32 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
@Override
public ResultTaskDetailRes taskDetail(Long detailId) {
ResultTaskDetailRes res = new ResultTaskDetailRes();
StaffEntity staffEntity = null;
ResultDetail resultDetail = resultDetailService.selectResultDetailById(detailId);
Optional.ofNullable(resultDetail).ifPresent(resultDetail1 -> {
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<ResultTaskDto> 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;
}

4
src/main/resources/mapper/performance/ResultTaskMapper.xml
View File

@ -85,7 +85,7 @@
</update>
<select id="selectResultTasksByDetailId" resultType="ResultTask" >
select * from lz_result_task where detail_id=#{detailId} and is_delete = 0 order by order_by asc
select * from lz_result_task where detail_id=#{detailId} and is_delete = 0
</select>
<update id="deleteResultTasksByDetailId" parameterType="java.lang.Long">
@ -93,7 +93,7 @@
</update>
<select id="selectResultTaskDtosByDetailId" resultType="com.lz.modules.performance.dto.ResultTaskDto" >
select id, is_delete, name,process_rate from lz_result_task where detail_id=#{detailId} and is_delete = 0 order by order_by asc
select id, is_delete, name,process_rate from lz_result_task where detail_id=#{detailId} and is_delete = 0
</select>
</mapper>