From 96286178ee1c257c130cb2ad964a781f36c4eee5 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期三, 10 五月 2023 16:23:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/qxueyou/scc/stucontroller/StuSubjectController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/stucontroller/StuSubjectController.java b/src/main/java/com/qxueyou/scc/stucontroller/StuSubjectController.java
index 0e8fa69..3303d50 100644
--- a/src/main/java/com/qxueyou/scc/stucontroller/StuSubjectController.java
+++ b/src/main/java/com/qxueyou/scc/stucontroller/StuSubjectController.java
@@ -528,9 +528,14 @@
subjectUtils.setStudyTime(new BigDecimal(progressValue));
}
mySubjectV.setSubjectName(openSubjectV.getSubjectName());
+ mySubjectV.setCoverPageUrl(openSubjectV.getCoverPageUrl());
mySubjectV.getId().setSubjectId(openSubjectV.getSubjectId());
result.add(mySubjectV);
lecurelist.add(subjectUtils);
+ }
+ for (MySubjectV mySubjectV:
+ result) {
+ System.out.println(mySubjectV);
}
return new Result(true, "success",
CollectionUtils.newObjectMap("subjectList",
@@ -571,6 +576,7 @@
if (percentAvg.isNaN()) {
percentAvg = 0.0;
}
+ subject.setCoverPageUrl(subject1.getCoverPageUrl());
subject.setPercent(percentAvg);
subject.setProgressValue(new BigDecimal(progressValue));
progressLst.get(0).put("percent", subject.getPercent());
@@ -593,6 +599,7 @@
if (percentAvg.isNaN()) {
percentAvg = 0.0;
}
+ subject.setCoverPageUrl(subject1.getCoverPageUrl());
subject.setPercent(percentAvg);
subject.setProgressValue(new BigDecimal(progressValue));
subject.setSubjectName(subject1.getName());
--
Gitblit v1.8.0