From 453fbe84048ba994cfb017c6b26d631334820f9c Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期三, 12 四月 2023 18:02:44 +0800
Subject: [PATCH] 删除subjectId
---
src/main/java/com/qxueyou/scc/portal/homepage/serivce/imp/HomepageService.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/portal/homepage/serivce/imp/HomepageService.java b/src/main/java/com/qxueyou/scc/portal/homepage/serivce/imp/HomepageService.java
index 03fc162..6f52ea3 100644
--- a/src/main/java/com/qxueyou/scc/portal/homepage/serivce/imp/HomepageService.java
+++ b/src/main/java/com/qxueyou/scc/portal/homepage/serivce/imp/HomepageService.java
@@ -181,8 +181,8 @@
// "culturalClassroomRes", chineseLanguageClassRes,
// "culturalChinaRes", culturalChinaRes);
return CollectionUtils.newObjectMap(
- "culturalClassroomRes",CollectionUtils.newObjectMap("subjectId",culturalChinaId.get(0),"data",chineseLanguageClassRes),
- "culturalChinaRes",CollectionUtils.newObjectMap("subjectId",chineseLanguageClassId.get(0),"data",culturalChinaRes)
+ "culturalClassroomRes",CollectionUtils.newObjectMap("data",chineseLanguageClassRes),
+ "culturalChinaRes",CollectionUtils.newObjectMap("data",culturalChinaRes)
);
}
@@ -221,15 +221,15 @@
.reversed()).map(SubjectLecture::getResItemId).limit(8).collect(toList());
StringBuffer hqlRes = new StringBuffer("from Res p where deleteFlag is false and status=?");
List<Res> resList = find(hqlRes.toString(), args, Res.class);
- ArrayList<Res> culturalChinaRes = new ArrayList<>();
- ArrayList<Res> culturalClassroomRes = new ArrayList<>();
+ ArrayList<Res> chineseCourseRes = new ArrayList<>();
+ ArrayList<Res> culturalClassroomRes = new ArrayList<>();//鏂囧寲璇惧爞
ArrayList<Res> realClassRes = new ArrayList<>();
if (culturalClassroomResId != null) {
for (String resItemId : culturalClassroomResId) {
for (Res res : resList) {
if (res.getResId().equals(resItemId)) {
- culturalChinaRes.add(res);
+ culturalClassroomRes.add(res);
}
}
}
@@ -238,7 +238,7 @@
for (String resItemId : realClassResId) {
for (Res res : resList) {
if (res.getResId().equals(resItemId)) {
- culturalClassroomRes.add(res);
+ realClassRes.add(res);
}
}
}
@@ -247,17 +247,16 @@
for (String resItemId : chineseCourseResId) {
for (Res res : resList) {
if (res.getResId().equals(resItemId)) {
- realClassRes.add(res);
+ chineseCourseRes.add(res);
}
}
}
}
return CollectionUtils.newObjectMap(
- "culturalChinaRes",CollectionUtils.newObjectMap("subjectId",culturalClassroomId.size() == 0 ? null : culturalClassroomId.get(0),"data",culturalChinaRes),
+ "chineseCourseRes",CollectionUtils.newObjectMap("subjectId",culturalClassroomId.size() == 0 ? null : culturalClassroomId.get(0),"data",chineseCourseRes),
"culturalClassroomRes",CollectionUtils.newObjectMap("subjectId",realClassId.size() == 0 ? null : realClassId.get(0),"data",culturalClassroomRes),
"realClassRes", CollectionUtils.newObjectMap("subjectId",chineseCourseId.size() == 0 ? null :chineseCourseId.get(0),"data",realClassRes));
}
-
/**
* 鑾峰彇棣栭〉鏍囩
--
Gitblit v1.8.0