From 1f913de54ca3db5acd1ec671db8d25b7f67a353b Mon Sep 17 00:00:00 2001
From: none <none>
Date: Tue, 28 Mar 2023 14:13:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AF=BE=E7=A8=8B=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=B7=B2=E5=AE=8C=E6=88=90=E8=AF=BE=E6=97=B6=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/frontend/UserController.java    | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/xyz/playedu/api/controller/frontend/UserController.java b/src/main/java/xyz/playedu/api/controller/frontend/UserController.java
index e3f8c68..07c5a81 100644
--- a/src/main/java/xyz/playedu/api/controller/frontend/UserController.java
+++ b/src/main/java/xyz/playedu/api/controller/frontend/UserController.java
@@ -128,10 +128,12 @@ public class UserController {
         }
         data.put("learn_course_records", learnCourseRecords);
 
-        int requiredHourCount = 0;//必修课时
-        int nunRequiredHourCount = 0;//选修课时
+        int requiredCourseCount = 0;
+        int nunRequiredCourseCount = 0;
         int requiredFinishedCourseCount = 0;//已完成必修课
         int nunRequiredFinishedCourseCount = 0;//已完成选修课
+        int requiredHourCount = 0;//必修课时
+        int nunRequiredHourCount = 0;//选修课时
         int requiredFinishedHourCount = 0;//已完成必修课时
         int nunRequiredFinishedHourCount = 0;//已完成选修课时
         int todayLearnDuration = userLearnDurationStatsService.todayUserDuration(FCtx.getId());//今日学习时长
@@ -142,8 +144,10 @@ public class UserController {
             for (Course courseItem : courses) {
                 if (courseItem.getIsRequired() == 1) {
                     requiredHourCount += courseItem.getClassHour();
+                    requiredCourseCount += 1;
                 } else {
                     nunRequiredHourCount += courseItem.getClassHour();
+                    nunRequiredCourseCount += 1;
                 }
                 UserCourseRecord learnRecord = learnCourseRecords.get(courseItem.getId());
                 if (learnRecord == null) {
@@ -163,10 +167,12 @@ public class UserController {
             }
         }
         HashMap<String, Integer> stats = new HashMap<>();
-        stats.put("required_hour_count", requiredHourCount);
-        stats.put("nun_required_hour_count", nunRequiredHourCount);
+        stats.put("required_course_count", requiredCourseCount);
+        stats.put("nun_required_course_count", nunRequiredCourseCount);
         stats.put("required_finished_course_count", requiredFinishedCourseCount);
         stats.put("nun_required_finished_course_count", nunRequiredFinishedCourseCount);
+        stats.put("required_hour_count", requiredHourCount);
+        stats.put("nun_required_hour_count", nunRequiredHourCount);
         stats.put("required_finished_hour_count", requiredFinishedHourCount);
         stats.put("nun_required_finished_hour_count", nunRequiredFinishedHourCount);
         stats.put("today_learn_duration", todayLearnDuration);