|
@@ -323,7 +323,7 @@ public class CourseStudyController {
|
323
|
323
|
if (CollectionUtil.isNotEmpty(courseList)) {
|
324
|
324
|
int finishSize = 0;
|
325
|
325
|
List<Long> ids = courseList.stream().map(CourseAppListDTO::getId).collect(Collectors.toList());
|
326
|
|
- List<QkjStudyRecordApp> recordApps = qkjStudyRecordAppDao.findByIds(ids);
|
|
326
|
+ List<QkjStudyRecordApp> recordApps = qkjStudyRecordAppDao.findByObjIdsAndType(ids, 2);
|
327
|
327
|
if (CollectionUtil.isNotEmpty(recordApps)) {
|
328
|
328
|
for (QkjStudyRecordApp qkjStudyRecordApp : recordApps) {
|
329
|
329
|
if (Objects.equals(qkjStudyRecordApp.getStudyAccomplish(), 1)) {
|
|
@@ -355,8 +355,7 @@ public class CourseStudyController {
|
355
|
355
|
if (CollectionUtil.isNotEmpty(courseList)) {
|
356
|
356
|
int finishSize = 0;
|
357
|
357
|
List<Long> ids = courseList.stream().map(CourseAppListDTO::getId).collect(Collectors.toList());
|
358
|
|
- List<QkjStudyRecordApp> recordApps = qkjStudyRecordAppDao.findByIds(ids);
|
359
|
|
- log.info("joinSkillExamination recordApps:{} 2:{} ids:{}",recordApps, CollectionUtil.isNotEmpty(recordApps), ids);
|
|
358
|
+ List<QkjStudyRecordApp> recordApps = qkjStudyRecordAppDao.findByObjIdsAndType(ids, 2);
|
360
|
359
|
if (CollectionUtil.isNotEmpty(recordApps)) {
|
361
|
360
|
for (QkjStudyRecordApp qkjStudyRecordApp : recordApps) {
|
362
|
361
|
if (Objects.equals(qkjStudyRecordApp.getStudyAccomplish(), 1)) {
|