From f6c19ce9e8ec6ccbcc9f6eaa3d168b27bba214eb Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期二, 06 六月 2023 15:17:31 +0800
Subject: [PATCH] 资源，直播，考试
---
src/main/java/com/qxueyou/scc/controller/CoursewareController.java | 2 +-
src/main/java/com/qxueyou/scc/exam/service/impl/ExamService.java | 10 +++++-----
src/main/java/com/qxueyou/scc/controller/VideoLiveController.java | 7 +++++++
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/controller/CoursewareController.java b/src/main/java/com/qxueyou/scc/controller/CoursewareController.java
index 98af63b..e2ad52f 100644
--- a/src/main/java/com/qxueyou/scc/controller/CoursewareController.java
+++ b/src/main/java/com/qxueyou/scc/controller/CoursewareController.java
@@ -93,7 +93,7 @@
return new Result(true, "success",
CollectionUtils.newObjectMap("coursewareLst",
QBeanUtils.listBean2ListMap(lectures,
- CollectionUtils.newStringMap("name", "name", "resItemId", "id", "lectureType", "type",
+ CollectionUtils.newStringMap("lectureId","lectureId","name", "name", "resItemId", "id", "lectureType", "type",
"chapterId", "chapterId", "status", "status", "updateTime", "updateTime")),
"count", lectureCount));
diff --git a/src/main/java/com/qxueyou/scc/controller/VideoLiveController.java b/src/main/java/com/qxueyou/scc/controller/VideoLiveController.java
index 34870b1..02ed5f2 100644
--- a/src/main/java/com/qxueyou/scc/controller/VideoLiveController.java
+++ b/src/main/java/com/qxueyou/scc/controller/VideoLiveController.java
@@ -186,6 +186,13 @@
String res = client.courseVisitorList(courseId,page,size,options);
return new Result(true,"寮�鍚垚鍔�",res);
}
+
+// @ApiOperation(value = "鏌ョ湅璇︽儏")
+// @GetMapping(value = "detailLive")
+// public Result detailLive(String liveId) {
+// commonDAO.find
+// return new Result(true,"寮�鍚垚鍔�",res);
+// }
/**
* 鏌ヨ鐩存挱璇︽儏
*
diff --git a/src/main/java/com/qxueyou/scc/exam/service/impl/ExamService.java b/src/main/java/com/qxueyou/scc/exam/service/impl/ExamService.java
index df4dcb0..19cbfda 100644
--- a/src/main/java/com/qxueyou/scc/exam/service/impl/ExamService.java
+++ b/src/main/java/com/qxueyou/scc/exam/service/impl/ExamService.java
@@ -567,11 +567,11 @@
// 濡傛灉宸叉彁浜ゅ氨鏌ヨ鐢ㄦ埛绛旀淇℃伅
//TODO 鏆傛椂涓嶅彲浠ユ煡鐪嬭�冭瘯绛旀锛屽凡鎻愪氦灏变笉鍙互杩涘叆
- if (Integer.valueOf(record.getStatus())> 0) {
- resultData.put("studentScore", record.getScore());
- resultData.put("objStudentScore", record.getObjScore()==null?BigDecimal.ZERO:record.getObjScore());
- return new Result(false,"鑰冭瘯宸叉彁浜�");
- }
+// if (Integer.valueOf(record.getStatus())> 0) {
+// resultData.put("studentScore", record.getScore());
+// resultData.put("objStudentScore", record.getObjScore()==null?BigDecimal.ZERO:record.getObjScore());
+// return new Result(false,"鑰冭瘯宸叉彁浜�");
+// }
//鑾峰彇鑰冭瘯
String ql="select i from ExamInfo i , ExamBatchClassRe r where i.deleteFlag is false and r.examBatchId=? and r.examId=i.examId";
ExamInfo exam = this.findUnique(ql, CollectionUtils.newList(examBatchId), ExamInfo.class);
--
Gitblit v1.8.0