diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/statisticsrecord/LogStatisticsGroupByUserVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/statisticsrecord/LogStatisticsGroupByUserVO.java index c209e320..0c15940d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/statisticsrecord/LogStatisticsGroupByUserVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/statisticsrecord/LogStatisticsGroupByUserVO.java @@ -7,10 +7,4 @@ import lombok.Data; @Data public class LogStatisticsGroupByUserVO extends LogStatisticsDetailsVO { - @Schema(description = "姓名") - private String nickName; - - @Schema(description = "部门名称") - private String deptName; - } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogStatisticsMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogStatisticsMapper.java index a932c4e5..264b56de 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogStatisticsMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogStatisticsMapper.java @@ -91,5 +91,5 @@ public interface LogStatisticsMapper extends BaseMapperX { * @param dto * @return */ - List getStatisticsGroupByUser(@Param("dto") LogStatisticsDetailsListGroupByUserDTO dto); + List getStatisticsGroupByUser(@Param("dto") LogStatisticsDetailsListGroupByUserDTO dto); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogStatisticsServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogStatisticsServiceImpl.java index 9e3df9d4..4a9f4124 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogStatisticsServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogStatisticsServiceImpl.java @@ -407,12 +407,12 @@ public class LogStatisticsServiceImpl implements LogStatisticsService { } dto.setDateList(dateList); // 获取到所有数据 然后在java代码中分组 - List vos = logStatisticsMapper.getStatisticsGroupByUser(dto); + List vos = logStatisticsMapper.getStatisticsGroupByUser(dto); // 根据用户id/部门id分组 - Map> map = vos.stream().collect(Collectors.groupingBy(a -> a.getUserId() + "_" + a.getDeptId() + "_" + a.getType())); - for (Map.Entry> entry : map.entrySet()) { + Map> map = vos.stream().collect(Collectors.groupingBy(a -> a.getUserId() + "_" + a.getDeptId() + "_" + a.getType())); + for (Map.Entry> entry : map.entrySet()) { LogStatisticsDetailsListGroupByUserVO vo = new LogStatisticsDetailsListGroupByUserVO(); - vo.setNickName(entry.getValue().get(0).getNickName()); + vo.setNickName(entry.getValue().get(0).getNickname()); vo.setDeptName(entry.getValue().get(0).getDeptName()); vo.setType(entry.getValue().get(0).getType()); vo.setShould(entry.getValue().size()); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogStatisticsMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogStatisticsMapper.xml index 812e2ef4..6e4c9d3d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogStatisticsMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogStatisticsMapper.xml @@ -152,7 +152,7 @@