From 72d05b8e16251febaed988191fb33de31d79bdf9 Mon Sep 17 00:00:00 2001
From: none <none>
Date: Mon, 8 May 2023 11:19:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E5=91=98=E7=BA=BF=E4=B8=8A=E8=AF=BE?=
 =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E8=AE=B0=E5=BD=95api=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=B7=B2=E5=AD=A6=E7=BA=BF=E4=B8=8A=E8=AF=BE=E8=AF=BE=E6=97=B6?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../playedu/api/controller/backend/UserController.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/java/xyz/playedu/api/controller/backend/UserController.java b/src/main/java/xyz/playedu/api/controller/backend/UserController.java
index 6ad3556..ee37175 100644
--- a/src/main/java/xyz/playedu/api/controller/backend/UserController.java
+++ b/src/main/java/xyz/playedu/api/controller/backend/UserController.java
@@ -43,6 +43,7 @@ import xyz.playedu.api.request.backend.UserRequest;
 import xyz.playedu.api.service.*;
 import xyz.playedu.api.service.internal.UserDepartmentService;
 import xyz.playedu.api.types.JsonResponse;
+import xyz.playedu.api.types.mapper.UserCourseHourRecordCountMapper;
 import xyz.playedu.api.types.paginate.PaginationResult;
 import xyz.playedu.api.types.paginate.UserCourseHourRecordPaginateFilter;
 import xyz.playedu.api.types.paginate.UserCourseRecordPaginateFilter;
@@ -482,6 +483,14 @@ public class UserController {
             userCourseRecords = userCourseRecordService.chunk(id, courseIds);
         }
 
+        // 获取学员线上课的课时学习数量(只要学习了就算，不一定需要已完成)
+        Map<Integer, Integer> userCourseHourCount =
+                userCourseHourRecordService.getUserCourseHourCount(id, courseIds, null).stream()
+                        .collect(
+                                Collectors.toMap(
+                                        UserCourseHourRecordCountMapper::getCourseId,
+                                        UserCourseHourRecordCountMapper::getTotal));
+
         HashMap<String, Object> data = new HashMap<>();
         data.put("open_courses", openCourses);
         data.put("departments", departments);
@@ -490,6 +499,7 @@ public class UserController {
                 "user_course_records",
                 userCourseRecords.stream()
                         .collect(Collectors.toMap(UserCourseRecord::getCourseId, e -> e)));
+        data.put("user_course_hour_count", userCourseHourCount);
 
         return JsonResponse.data(data);
     }