小程序:理论考试

src/main/java/com/cirle/scientific/controller/miniapp/CourseStudyController.java

@@ -323,7 +323,7 @@ public class CourseStudyController {
         if (CollectionUtil.isNotEmpty(courseList)) {
             int finishSize = 0;
             List<Long> ids = courseList.stream().map(CourseAppListDTO::getId).collect(Collectors.toList());
-            List<QkjStudyRecordApp> recordApps = qkjStudyRecordAppDao.findByObjIdsAndType(ids, 2);
+            List<QkjStudyRecordApp> recordApps = qkjStudyRecordAppDao.findByMemCardAndObjIdsAndType(memCard, ids, 2);
             if (CollectionUtil.isNotEmpty(recordApps)) {
                 for (QkjStudyRecordApp qkjStudyRecordApp : recordApps) {
                     if (Objects.equals(qkjStudyRecordApp.getStudyAccomplish(), 1)) {
@@ -332,7 +332,7 @@ public class CourseStudyController {
                 }
             }
             log.info("joinTheoryExamination courseList:{} finishSize:{}", courseList.size(), finishSize);
-            finishCourse = courseList.size() == finishSize;
+            finishCourse = finishSize == courseList.size();
         }
         QkjExamineRecordApp recordApp = qkjExamineRecordAppDao.getByMemCard(memCard, 2);
         JoinExaminationDTO build = JoinExaminationDTO.builder()
@@ -355,7 +355,7 @@ public class CourseStudyController {
         if (CollectionUtil.isNotEmpty(courseList)) {
             int finishSize = 0;
             List<Long> ids = courseList.stream().map(CourseAppListDTO::getId).collect(Collectors.toList());
-            List<QkjStudyRecordApp> recordApps = qkjStudyRecordAppDao.findByObjIdsAndType(ids, 2);
+            List<QkjStudyRecordApp> recordApps = qkjStudyRecordAppDao.findByMemCardAndObjIdsAndType(memCard, ids, 2);
             if (CollectionUtil.isNotEmpty(recordApps)) {
                 for (QkjStudyRecordApp qkjStudyRecordApp : recordApps) {
                     if (Objects.equals(qkjStudyRecordApp.getStudyAccomplish(), 1)) {

src/main/java/com/cirle/scientific/dao/QkjStudyRecordAppDao.java

@@ -23,8 +23,8 @@ public interface QkjStudyRecordAppDao extends PagingAndSortingRepository<QkjStud
     @Query(value = "SELECT * FROM qkj_study_record_app WHERE mem_card = ?1 and obj_type = ?2 and obj_id = ?3", nativeQuery = true)
     QkjStudyRecordApp findByMemCardAndTypeAndObjId(String memCard, Integer objType, Long objId);
 
-    @Query(value = "SELECT * FROM qkj_study_record_app WHERE obj_id in ?1 and obj_type = ?2", nativeQuery = true)
-    List<QkjStudyRecordApp> findByObjIdsAndType(List<Long> ids, Integer objType);
+    @Query(value = "SELECT * FROM qkj_study_record_app WHERE mem_card = ?1 and  obj_id in ?2 and obj_type = ?3", nativeQuery = true)
+    List<QkjStudyRecordApp> findByMemCardAndObjIdsAndType(String memCard , List<Long> ids, Integer objType);
 
 
 }