diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java index 12e54f065..c44d119f5 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java @@ -157,6 +157,8 @@ public class SupvPlanVO { private String createBy; + private String updateBy; + /** * 实施状态 */ @@ -164,4 +166,6 @@ public class SupvPlanVO { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; + + } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java index be59634c2..6112724a8 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java @@ -184,7 +184,7 @@ public class SupvPlanServiceImpl extends ServiceImpl i Page page = this.page(new Page<>(PageFactory.getPageNum(supvPlanParam), PageFactory.getPageSize(supvPlanParam)), lambdaQueryWrapper); List supvPlanVOList = BeanUtil.copyToList(page.getRecords(), SupvPlanVO.class); - List userIds = supvPlanVOList.stream().map(SupvPlanVO::getCreateBy).distinct().collect(Collectors.toList()); + List userIds = supvPlanVOList.stream().map(SupvPlanVO::getUpdateBy).distinct().collect(Collectors.toList()); supvPlanVOList.forEach(item -> { PvTerminalTreeVO pvTerminalTreeVO = null; if (mapCode.containsKey(item.getSupvOrgId())) { @@ -231,8 +231,8 @@ public class SupvPlanServiceImpl extends ServiceImpl i List userList = userFeignClient.getUserByIdList(userIds).getData(); Map map = userList.stream().collect(Collectors.toMap(User::getId, Function.identity())); - if (map.containsKey(item.getCreateBy())) { - item.setCreateBy(map.get(item.getCreateBy()).getName()); + if (map.containsKey(item.getUpdateBy())) { + item.setCreateBy(map.get(item.getUpdateBy()).getName()); }