Browse Source

提交人数

liujc 2 years ago
parent
commit
bb54ff759e

+ 33 - 30
.idea/httpRequests/http-requests-log.http

@@ -1,3 +1,36 @@
+GET http://127.0.0.1:9002/courseHomework/findCourseHomeworkDetail?courseScheduleId=1474&type=HOMEWORK
+authorization: bearer 9a2a087f-98e6-4556-80c3-bd1871fd417e
+Content-Type: application/json
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-06-16T194147.200.json
+
+###
+
+GET http://127.0.0.1:9002/courseHomework/findCourseHomeworkDetail?courseScheduleId=1474&type=HOMEWORK
+authorization: bearer 9a2a087f-98e6-4556-80c3-bd1871fd417e
+Content-Type: application/json
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-06-16T193843.200.json
+
+###
+
+GET http://127.0.0.1:9002/courseHomework/findCourseHomeworkDetail?courseScheduleId=1474&type=HOMEWORK
+authorization: bearer 9a2a087f-98e6-4556-80c3-bd1871fd417e
+Content-Type: application/json
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-06-16T193744.200.json
+
+###
+
 GET http://127.0.0.1:9002/extracurricularExercises/queryTeacherServeHomeworkDetail/v2?startTime=2023-06-10&endTime=2023-06-16&type=HOMEWORK&classType=&homeWorkStatus=&page=1&rows=20&musicGroupId=
 Authorization: bearer 72033b9d-e8b7-461f-8dd9-ba35312a351d
 Connection: Keep-Alive
@@ -839,33 +872,3 @@ Accept-Encoding: br,deflate,gzip,x-gzip
 
 ###
 
-GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
-Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-06-12T163044.200.json
-
-###
-
-GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
-Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-06-12T095605.200.json
-
-###
-
-GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
-Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-06-12T095427.200.json
-
-###
-

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentLessonTrainingDetailServiceImpl.java

@@ -286,7 +286,7 @@ public class StudentLessonTrainingDetailServiceImpl extends ServiceImpl<StudentL
             for (Map.Entry<Long, List<StudentLessonTrainingDetail>> entry : userMap.entrySet()) {
                 List<StudentLessonTrainingDetail> v1 = entry.getValue();
                 Set<StandardEnum> standardEnumSet = v1.stream().map(o -> o.getTrainingStatus()).filter(Objects::nonNull).collect(Collectors.toSet());
-                if (standardEnumSet.size() > 1) {
+                if (standardEnumSet.size() > 1 || standardEnumSet.contains(StandardEnum.NOT_STANDARD)) {
                     submitNum++;
                 }  else {
                     if (standardEnumSet.contains(StandardEnum.STANDARD)) {