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 a617644a..e8eb4703 100644 --- a/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java +++ b/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java @@ -57,6 +57,9 @@ public class ResultTaskController extends AbstractController{ @ApiOperation("任务变更记录") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = TaskProcessRecordDto.class)}) public R changeTaskList(@RequestBody ChangeTaskListReq req){ + if(req.getStaffId()==null){ + req.setStaffId(getUserId()); + } PageUtils pageUtils = taskProcessRecordService.selectTaskProcessRecordsByTaskId(req); return R.ok().put("data",pageUtils); } diff --git a/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java b/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java index f23f05a1..b22ee336 100644 --- a/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java +++ b/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java @@ -44,6 +44,17 @@ public class TaskProcessRecordDto { @ApiModelProperty(value = "职位", name = "position") private String position; + @ApiModelProperty(value = "@员工id", name = "atStaffIds") + private String atStaffIds; + + @ApiModelProperty(value = "@员工姓名", name = "atStaffNames") + private String atStaffNames; + + @ApiModelProperty(value = "是不是自己的评论", name = "isSelf") + private int isSelf; + + private Long staffId; + private Long taskId; private Long detailId; diff --git a/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java b/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java index af00aad4..d2b62ba7 100644 --- a/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java +++ b/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java @@ -23,4 +23,7 @@ public class ChangeTaskListReq extends BasePage { @ApiModelProperty(value="0:记录 不传全部",name = "useType") private Integer useType; + + @ApiModelProperty(value="员工id",name = "staffId") + private Long staffId; } diff --git a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java index 92236da7..23c9aae6 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java @@ -140,6 +140,9 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl dto.setPosition(staffOccupationEntity.getPosition())); + if (dto.getUseType()==1 && dto.getStaffId().equals(req.getStaffId())) { + dto.setIsSelf(1); + } } } diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml index d2ec9871..f73dd25e 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -131,7 +131,7 @@ - select gmt_create,remark,label,type,use_type,task_id,detail_id from lz_task_process_record where is_delete = 0 + select gmt_create,remark,label,type,use_type,task_id,detail_id,staff_id,at_staff_ids,at_staff_names from lz_task_process_record where is_delete = 0 and use_type = #{useType}