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

fix

Browse Source
This commit is contained in:
杜建超 2020-12-14 18:22:41 +08:00
parent 78e4d96ef8
commit 8ec1508700
5 changed files with 22 additions and 2 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

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

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

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

3
src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java
View File

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

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

@ -140,6 +140,9 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
});
Optional.ofNullable(staffOccupationByStaffId).ifPresent(staffOccupationEntity -> dto.setPosition(staffOccupationEntity.getPosition()));
if (dto.getUseType()==1 && dto.getStaffId().equals(req.getStaffId())) {
dto.setIsSelf(1);
}
}
}

4
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,name,use_type,detail_id,task_id from lz_task_process_record where task_id=#{taskId}
select gmt_create,remark,label,type,name,use_type,detail_id,task_id,staff_id,at_staff_ids,at_staff_names from lz_task_process_record where task_id=#{taskId}
<if test="useType !=null">
and use_type = #{useType}
</if>
@ -149,7 +149,7 @@
<select id="selectTaskProcessRecordsByTaskIdsAndType" resultType="com.lz.modules.performance.dto.TaskProcessRecordDto">
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
<if test="useType !=null">
and use_type = #{useType}
</if>