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

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-12-11 11:58:25 +08:00
commit 9dc26facae
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java
View File

@ -34,4 +34,10 @@ public class TaskProcessRecordDto {
//标签
@ApiModelProperty(value = "类型", name = "描述")
private String typeDesc;
//操作标签
@ApiModelProperty(value = "任务名称", name = "name")
private String name;
//1，修改名称，2修改进度 ，3名称和进度都修改
@ApiModelProperty(value = "0表示记录，1 表示评论", name = "useType")
private Integer useType;
}

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

@ -191,10 +191,12 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
//新增操作
if(before == null){
taskProcessRecord.setType(ProcessRecordEnum.ADD.getType());
taskProcessRecord.setDetailId(after.getDetailId());
taskProcessRecord.setLabel("新增key Results名称：" + after.getName() + "进度：" + BigDecimalUtil.mul(after.getProcessRate(),BigDecimal.valueOf(100)).setScale(2) + "%");
return taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord).intValue();
}
taskProcessRecord.setTaskId(before.getId());
taskProcessRecord.setDetailId(before.getDetailId());
//判断修改了名称或进度
if(!before.getName().equals(after.getName())){
if(!before.getProcessRate().equals(after.getProcessRate())){

3
src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java
View File

@ -11,6 +11,7 @@ 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;
import com.lz.modules.performance.req.ChangeTaskListReq;
import com.lz.modules.performance.service.ResultTaskService;
import com.lz.modules.performance.service.TaskProcessRecordService;
@ -118,12 +119,14 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
StaffEntity staffEntity = staffService.selectStaffById(resultDetail.getStaffId());
List<TaskProcessRecordDto> dtos = list;
for(TaskProcessRecordDto dto:dtos){
dto.setTypeDesc(ProcessRecordEnum.findByType(dto.getType()).getDesc());
Optional.ofNullable(staffEntity).ifPresent(staffEntity1 -> {
dto.setAvatar(staffEntity1.getAvatar());
dto.setStaffName(staffEntity1.getName());
});
}
}
return pageUtils;
}

2
src/main/resources/mapper/performance/TaskProcessRecordMapper.xml
View File

@ -131,7 +131,7 @@
<select id="selectTaskProcessRecordsByTaskId" resultType="com.lz.modules.performance.dto.TaskProcessRecordDto">
select gmt_create,remark,label,type from lz_task_process_record where task_id=#{taskId} and use_type = #{useType} and is_delete = 0 order by gmt_create desc
select gmt_create,remark,label,type,name,use_type from lz_task_process_record where task_id=#{taskId} and use_type = #{useType} and is_delete = 0 order by gmt_create desc
</select>
<update id="deleteTaskProcessRecordsByTaskId" parameterType="java.lang.Long">