diff --git a/src/main/java/xyz/playedu/api/controller/backend/CourseUserController.java b/src/main/java/xyz/playedu/api/controller/backend/CourseUserController.java index 112032f..600eaee 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/CourseUserController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/CourseUserController.java @@ -34,7 +34,7 @@ import xyz.playedu.api.service.UserCourseHourRecordService; import xyz.playedu.api.service.UserCourseRecordService; import xyz.playedu.api.service.UserService; import xyz.playedu.api.types.JsonResponse; -import xyz.playedu.api.types.mapper.UserCourseHourRecordUserCountMapper; +import xyz.playedu.api.types.mapper.UserCourseHourRecordUserFirstCreatedAtMapper; import xyz.playedu.api.types.paginate.PaginationResult; import xyz.playedu.api.types.paginate.UserPaginateFilter; @@ -110,14 +110,15 @@ public class CourseUserController { .stream() .collect(Collectors.toMap(UserCourseRecord::getUserId, e -> e))); data.put( - "user_course_hour_user_count", + "user_course_hour_user_first_at", userCourseHourRecordService - .getUserCourseHourUserCount(courseId, userIds, null) + .getUserCourseHourUserFirstCreatedAt(courseId, userIds) .stream() .collect( Collectors.toMap( - UserCourseHourRecordUserCountMapper::getUserId, - UserCourseHourRecordUserCountMapper::getTotal))); + UserCourseHourRecordUserFirstCreatedAtMapper::getUserId, + UserCourseHourRecordUserFirstCreatedAtMapper + ::getCreatedAt))); data.put("course", courseService.findOrFail(courseId)); return JsonResponse.data(data); diff --git a/src/main/java/xyz/playedu/api/mapper/UserCourseHourRecordMapper.java b/src/main/java/xyz/playedu/api/mapper/UserCourseHourRecordMapper.java index e0258a2..b15d3a9 100644 --- a/src/main/java/xyz/playedu/api/mapper/UserCourseHourRecordMapper.java +++ b/src/main/java/xyz/playedu/api/mapper/UserCourseHourRecordMapper.java @@ -22,6 +22,7 @@ import org.apache.ibatis.annotations.Mapper; import xyz.playedu.api.domain.UserCourseHourRecord; import xyz.playedu.api.types.mapper.UserCourseHourRecordCourseCountMapper; import xyz.playedu.api.types.mapper.UserCourseHourRecordUserCountMapper; +import xyz.playedu.api.types.mapper.UserCourseHourRecordUserFirstCreatedAtMapper; import xyz.playedu.api.types.paginate.UserCourseHourRecordPaginateFilter; import java.util.List; @@ -41,6 +42,9 @@ public interface UserCourseHourRecordMapper extends BaseMapper getUserCourseHourUserCount( Integer courseId, List userIds, Integer isFinished); + List getUserCourseHourUserFirstCreatedAt( + Integer courseId, List userIds); + List paginate(UserCourseHourRecordPaginateFilter filter); Long paginateCount(UserCourseHourRecordPaginateFilter filter); diff --git a/src/main/java/xyz/playedu/api/service/UserCourseHourRecordService.java b/src/main/java/xyz/playedu/api/service/UserCourseHourRecordService.java index 406459b..cf84b71 100644 --- a/src/main/java/xyz/playedu/api/service/UserCourseHourRecordService.java +++ b/src/main/java/xyz/playedu/api/service/UserCourseHourRecordService.java @@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import xyz.playedu.api.domain.UserCourseHourRecord; import xyz.playedu.api.types.mapper.UserCourseHourRecordCourseCountMapper; import xyz.playedu.api.types.mapper.UserCourseHourRecordUserCountMapper; +import xyz.playedu.api.types.mapper.UserCourseHourRecordUserFirstCreatedAtMapper; import xyz.playedu.api.types.paginate.PaginationResult; import xyz.playedu.api.types.paginate.UserCourseHourRecordPaginateFilter; @@ -58,6 +59,9 @@ public interface UserCourseHourRecordService extends IService getUserCourseHourUserCount( Integer courseId, List userIds, Integer isFinished); + List getUserCourseHourUserFirstCreatedAt( + Integer courseId, List userIds); + PaginationResult paginate( int page, int size, UserCourseHourRecordPaginateFilter filter); } diff --git a/src/main/java/xyz/playedu/api/service/impl/UserCourseHourRecordServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/UserCourseHourRecordServiceImpl.java index 19f18ef..112953f 100644 --- a/src/main/java/xyz/playedu/api/service/impl/UserCourseHourRecordServiceImpl.java +++ b/src/main/java/xyz/playedu/api/service/impl/UserCourseHourRecordServiceImpl.java @@ -27,6 +27,7 @@ import xyz.playedu.api.mapper.UserCourseHourRecordMapper; import xyz.playedu.api.service.UserCourseHourRecordService; import xyz.playedu.api.types.mapper.UserCourseHourRecordCourseCountMapper; import xyz.playedu.api.types.mapper.UserCourseHourRecordUserCountMapper; +import xyz.playedu.api.types.mapper.UserCourseHourRecordUserFirstCreatedAtMapper; import xyz.playedu.api.types.paginate.PaginationResult; import xyz.playedu.api.types.paginate.UserCourseHourRecordPaginateFilter; @@ -172,4 +173,13 @@ public class UserCourseHourRecordServiceImpl .eq("course_id", courseId) .eq("hour_id", hourId)); } + + @Override + public List getUserCourseHourUserFirstCreatedAt( + Integer courseId, List userIds) { + if (userIds == null || userIds.size() == 0) { + return new ArrayList<>(); + } + return getBaseMapper().getUserCourseHourUserFirstCreatedAt(courseId, userIds); + } } diff --git a/src/main/java/xyz/playedu/api/types/mapper/UserCourseHourRecordUserFirstCreatedAtMapper.java b/src/main/java/xyz/playedu/api/types/mapper/UserCourseHourRecordUserFirstCreatedAtMapper.java new file mode 100644 index 0000000..ef7c4cc --- /dev/null +++ b/src/main/java/xyz/playedu/api/types/mapper/UserCourseHourRecordUserFirstCreatedAtMapper.java @@ -0,0 +1,36 @@ +/* + * Copyright 2023 杭州白书科技有限公司 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package xyz.playedu.api.types.mapper; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import lombok.Data; + +import java.util.Date; + +/** + * @Author 杭州白书科技有限公司 + * + * @create 2023/5/8 14:42 + */ +@Data +public class UserCourseHourRecordUserFirstCreatedAtMapper { + @JsonProperty("user_id") + private Integer userId; + + @JsonProperty("created_at") + private Date createdAt; +} diff --git a/src/main/resources/mapper/UserCourseHourRecordMapper.xml b/src/main/resources/mapper/UserCourseHourRecordMapper.xml index 6d04cc9..2331146 100644 --- a/src/main/resources/mapper/UserCourseHourRecordMapper.xml +++ b/src/main/resources/mapper/UserCourseHourRecordMapper.xml @@ -128,4 +128,22 @@ GROUP BY `user_id`; +