小程序:理论考试

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.findByIds(ids);
+            List<QkjStudyRecordApp> recordApps = qkjStudyRecordAppDao.findByObjIdsAndType(ids, 2);
             if (CollectionUtil.isNotEmpty(recordApps)) {
                 for (QkjStudyRecordApp qkjStudyRecordApp : recordApps) {
                     if (Objects.equals(qkjStudyRecordApp.getStudyAccomplish(), 1)) {
@@ -355,8 +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.findByIds(ids);
-            log.info("joinSkillExamination recordApps:{} 2:{} ids:{}",recordApps, CollectionUtil.isNotEmpty(recordApps), ids);
+            List<QkjStudyRecordApp> recordApps = qkjStudyRecordAppDao.findByObjIdsAndType(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

@@ -1,7 +1,6 @@
 package com.cirle.scientific.dao;
 
 import com.cirle.scientific.po.QkjStudyRecordApp;
-import com.cirle.scientific.po.QkjTqcourseApp;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
@@ -24,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 id in ?1", nativeQuery = true)
-    List<QkjStudyRecordApp> findByIds(List<Long> ids);
+    @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);
 
 
 }