From dafc9d5142b5836a4e95c837c7ce153dab794b8b Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Mon, 24 Oct 2022 14:36:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xboe/school/study/api/StudyCourseApi.java | 20 +++++-----
 .../service/impl/StudyCourseServiceImpl.java  | 38 ++++++++++++-------
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
index 4419122a..e5d1d88f 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
@@ -542,16 +542,16 @@ public class StudyCourseApi extends ApiBaseController{
 			studyCourseQuery.setAid(this.getCurrent().getAccountId());
 		}
 		List<StudyCourse> studyCouseDtos = service.ids(studyCourseQuery);
-		List<String> ids=new ArrayList<String>();
-		for(StudyCourse scourse:studyCouseDtos) {
-			ids.add(scourse.getCourseId());
-		}
-		Map<String,Object> maps = courseService.findImages(ids);
-		for(StudyCourse scourse:studyCouseDtos) {
-			if(maps.containsKey(scourse.getCourseId())) {
-				scourse.setCourseImage((String)maps.get(scourse.getCourseId()));
-			}
-		}
+//		List<String> ids=new ArrayList<String>();
+//		for(StudyCourse scourse:studyCouseDtos) {
+//			ids.add(scourse.getCourseId());
+//		}
+//		Map<String,Object> maps = courseService.findImages(ids);
+//		for(StudyCourse scourse:studyCouseDtos) {
+//			if(maps.containsKey(scourse.getCourseId())) {
+//				scourse.setCourseImage((String)maps.get(scourse.getCourseId()));
+//			}
+//		}
 
 		return success(studyCouseDtos);
 	}
diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java
index 078b24e8..b84f1d49 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java
@@ -283,19 +283,29 @@ public class StudyCourseServiceImpl implements IStudyCourseService{
 		builder.addFilter(FieldFilters.in("sc.courseId",studyCourseQuery.getIds()));
 		builder.addOrder(OrderCondition.desc("sc.lastTime"));
 		builder.addFields("sc");
-//		try {
-////			List<Object[]> listFields = studyCourseDao.(builder.builder());
-////			for (Object[] o:listFields) {
-////				StudyCouseDto studyCouseDto = new StudyCouseDto();
-////				studyCouseDto.setCourseId((String) o[0]);
-////				studyCouseDto.setProgress((Float) o[1]);
-////				studyCouseDto.setLastTime((LocalDateTime) o[2]);
-////				studyCouseDtos.add(studyCouseDto);
-////			}
-			List<StudyCourse> list = studyCourseDao.findList(builder.builder());
-
-
-		return list;
+		builder.addFields("c.score");
+		builder.addFields("c.coverImg");
+		//List<StudyCourse> list = studyCourseDao.findList(builder.builder());
+		List<StudyCourse> rs=new ArrayList<StudyCourse>();
+		Set<String> checkSet=new HashSet<String>();
+		try {
+			List<Object[]> list= studyCourseDao.findListFields(builder.builder());
+			for(Object[] objs:list) {
+				StudyCourse sc=(StudyCourse)objs[0];
+				if(!checkSet.contains(sc.getCourseId())) {
+					Float score=(Float)objs[1];
+					String img=(String)objs[2];
+					sc.setLastScore(score);
+					sc.setCourseImage(img);
+					rs.add(sc);
+					checkSet.add(sc.getCourseId());
+				}
+			}
+			return rs;
+		}catch(Exception e){
+			log.error("",e);
+		}
+		return rs;
 	}
 
 	@Override
@@ -335,7 +345,7 @@ public class StudyCourseServiceImpl implements IStudyCourseService{
 			}
 			return rs;
 		}catch(Exception e){
-			
+			log.error("",e);
 		}
 		return rs;
 	}