From 8ec15087005ad1d32c6d8388ef19d11f381c25a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Mon, 14 Dec 2020 18:22:41 +0800 Subject: [PATCH 1/5] fix --- .../performance/controller/ResultTaskController.java | 3 +++ .../modules/performance/dto/TaskProcessRecordDto.java | 11 +++++++++++ .../lz/modules/performance/req/ChangeTaskListReq.java | 3 +++ .../service/impl/TaskProcessRecordServiceImpl.java | 3 +++ .../mapper/performance/TaskProcessRecordMapper.xml | 4 ++-- 5 files changed, 22 insertions(+), 2 deletions(-) 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} From 91fe46fdcc920c85f1a7cdd16620c8c050957176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Mon, 14 Dec 2020 18:38:48 +0800 Subject: [PATCH 2/5] fix --- .../service/impl/ResultTaskServiceImpl.java | 23 +++++++++++++++---- .../impl/TaskProcessRecordServiceImpl.java | 11 +++++++-- 2 files changed, 27 insertions(+), 7 deletions(-) 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 277421e0..d2ea4ebd 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 @@ -110,12 +110,25 @@ public class ResultTaskServiceImpl extends ServiceImpl resultTaskDto.setTypeDesc(byType.getDesc())); - if(finalStaffEntity !=null){ - resultTaskDto.setAvatar(finalStaffEntity.getAvatar()); - resultTaskDto.setStaffName(finalStaffEntity.getName()); + if(taskProcessRecordDto.getUseType()==0){ + ProcessRecordEnum byType = ProcessRecordEnum.findByType(taskProcessRecordDto.getType()); + Optional.ofNullable(byType).ifPresent(processRecordEnum -> resultTaskDto.setTypeDesc(byType.getDesc())); + if(finalStaffEntity !=null){ + resultTaskDto.setAvatar(finalStaffEntity.getAvatar()); + resultTaskDto.setStaffName(finalStaffEntity.getName()); + } } + if(taskProcessRecordDto.getUseType()==1){ + resultTaskDto.setTypeDesc(taskProcessRecordDto.getLabel()); + StaffEntity staffEntity1 = staffService.selectStaffById(taskProcessRecordDto.getStaffId()); + if(staffEntity1 !=null){ + resultTaskDto.setAvatar(staffEntity1.getAvatar()); + resultTaskDto.setStaffName(staffEntity1.getName()); + } + + } + + } }); 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 23c9aae6..f07449bd 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,8 +140,15 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl dto.setPosition(staffOccupationEntity.getPosition())); - if (dto.getUseType()==1 && dto.getStaffId().equals(req.getStaffId())) { - dto.setIsSelf(1); + if (dto.getUseType()==1 ) { + if(dto.getStaffId().equals(req.getStaffId())){ + dto.setIsSelf(1); + } + staffEntity = staffService.selectStaffById(dto.getStaffId()); + Optional.ofNullable(staffEntity).ifPresent(staffEntity12 -> { + dto.setAvatar(staffEntity12.getAvatar()); + dto.setStaffName(staffEntity12.getName()); + }); } } From 1563b63aa875f202aad3fe0afd56820df64d51a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Mon, 14 Dec 2020 18:48:18 +0800 Subject: [PATCH 3/5] fix --- .../resources/mapper/performance/TaskProcessRecordMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml index f73dd25e..81cc78de 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -143,7 +143,7 @@ From 9b8c07648e957ff6c78091bb89c046243f9fb755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Tue, 15 Dec 2020 10:42:21 +0800 Subject: [PATCH 4/5] fix --- .../performance/service/impl/ResultTaskServiceImpl.java | 1 + .../performance/service/impl/TaskProcessRecordServiceImpl.java | 3 +++ 2 files changed, 4 insertions(+) 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 d2ea4ebd..27fccbc4 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 @@ -124,6 +124,7 @@ public class ResultTaskServiceImpl extends ServiceImpl { dto.setAvatar(staffEntity12.getAvatar()); dto.setStaffName(staffEntity12.getName()); + StaffOccupationEntity staffOccupation= staffOccupationService.getStaffOccupationByStaffId(staffEntity12.getId()); + Optional.ofNullable(staffOccupation).ifPresent(staffOccupationEntity -> dto.setPosition(staffOccupationEntity.getPosition())); }); + } } From 92520e8bd8f0ceec6bd0088017c35087b8154f9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Tue, 15 Dec 2020 11:55:46 +0800 Subject: [PATCH 5/5] fix --- .../controller/ResultRecordController.java | 35 +++++++++++++++++++ .../flow/model/ResultRecordDetailDto.java | 14 ++++++++ 2 files changed, 49 insertions(+) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 7304d3f5..26fe63ac 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -48,6 +48,7 @@ import com.lz.modules.sys.service.app.ResultRecordService; import io.swagger.annotations.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; import org.apache.ibatis.annotations.Param; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; @@ -134,6 +135,8 @@ public class ResultRecordController extends AbstractController { private ResourceService resourceService; @Autowired private ChartResultService chartResultService; + @Autowired + private FlowStartService flowStartService; @Autowired private ResultTaskService resultTaskService; @@ -632,6 +635,38 @@ public class ResultRecordController extends AbstractController { resultRecordDetailDto.setWeight(weight); resultRecordDetailDto.setRecortModelDtos(resultRecortModelDtos); + //增加导出所需数据 + List depIds = Lists.newArrayList(resultRecord.getDepartmentId()); + Map> map = departmentsService.selectDepartmentTreeByDepIds(depIds); + + List names = map.get(Long.valueOf(resultRecord.getDepartmentId())); + if(CollectionUtils.isNotEmpty(names)){ + Collections.reverse(names); + int size = names.size(); + if(size>0 && StringUtils.isNotBlank(names.get(0))){ + resultRecordDetailDto.setDepartmentOne(names.get(0)); + } + if(size>1 && StringUtils.isNotBlank(names.get(1))){ + resultRecordDetailDto.setDepartmentTwo(names.get(1)); + } + if(size>2 && StringUtils.isNotBlank(names.get(2))){ + resultRecordDetailDto.setDepartmentThree(names.get(2)); + } + } + + FlowStart flowStart = flowStartService.selectFlowStartById(resultRecord.getStartId()); + if(flowStart != null){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); + String startDate = sdf.format(flowStart.getStartTime()); + if(flowStart.getCycleType().intValue() != 0){ + String endDate = sdf.format(flowStart.getEndTime()); + resultRecordDetailDto.setAssessCycle(startDate + "至" + endDate ); + }else{ + resultRecordDetailDto.setAssessCycle(startDate); + } + } + + return R.ok().put("data", resultRecordDetailDto); } diff --git a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java index fa661127..d36f1a29 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java +++ b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java @@ -85,6 +85,20 @@ public class ResultRecordDetailDto { List recortModelDtos; @ApiModelProperty(value = "当前指标权重之和", name = "weight") BigDecimal weight; + + //新增导出所需数据 + @ApiModelProperty(value = "考核周期", name = "assessCycle") + private String assessCycle; + //一级部门 + @ApiModelProperty(value = "一级部门", name = "departmentOne") + private String departmentOne; + //二级部门 + @ApiModelProperty(value = "二级部门", name = "departmentTwo") + private String departmentTwo; + //三级部门 + @ApiModelProperty(value = "三级部门", name = "departmentThree") + private String departmentThree; + /** * * @return