From b6a92bcd70d2edfb8bf2a2e784b37e1fcd036c10 Mon Sep 17 00:00:00 2001
From: Administrator <2863138610@qq.com>
Date: 星期五, 18 十一月 2022 14:27:56 +0800
Subject: [PATCH] 课程管理学习端修改
---
src/main/java/com/qxueyou/scc/base/util/ClientUtils.java | 2 ++
src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClassLectureService.java | 10 +++++-----
src/main/java/com/qxueyou/scc/teach/subject/model/view/MyLectureV.java | 26 +++++++++++++-------------
src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java | 4 ++++
4 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java b/src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java
index 197e48d..f3ce5c1 100644
--- a/src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java
+++ b/src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java
@@ -1,9 +1,12 @@
package com.qxueyou.scc.admin.attendance.impl;
import com.qxueyou.scc.admin.attendance.AttendanceService;
+import com.qxueyou.scc.base.service.ICommonService;
import com.qxueyou.scc.base.service.impl.CommonAppService;
import com.qxueyou.scc.base.util.CollectionUtils;
import com.qxueyou.scc.teach.student.model.StuStudent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
@@ -12,6 +15,7 @@
@Service
public class AttendanceServiceImpl extends CommonAppService implements AttendanceService {
+
@Override
public String attendanceUpAndAdd(String studentId, String subjectId) {
String s="";
diff --git a/src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClassLectureService.java b/src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClassLectureService.java
index 136aa80..0e48283 100644
--- a/src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClassLectureService.java
+++ b/src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClassLectureService.java
@@ -95,12 +95,12 @@
@Override
public List<MyLectureV> listLectureV(String learnerId, String chapterId, String keyword, Integer pageSize,
Integer pageNum, String type) {
- StringBuffer hql = new StringBuffer("from MyLectureV where subjectId=? and id.userId=? order by lectureCreateTime desc");
-// StringBuffer hql = new StringBuffer("from MyLectureV where chapterId=? and id.userId=? and status=? order by lectureCreateTime desc");
+ StringBuffer hql1 = new StringBuffer("from MyLectureV where subjectId=? and id.userId=?");
+ List<Object> args1 = CollectionUtils.newList(chapterId, learnerId);
+ List<MyLectureV> myLectureVList = findList(hql1.toString(), new Pager(pageSize, pageNum), args1, MyLectureV.class);
-// List<Object> args = CollectionUtils.newList(chapterId, learnerId,ClsSubjectLecture.STATUS_DRAFT);
- List<Object> args = CollectionUtils.newList(chapterId, learnerId);
-
+ StringBuffer hql = new StringBuffer("from MyLectureV where chapterId=? and id.userId=? order by lectureCreateTime desc");
+ List<Object> args = CollectionUtils.newList(myLectureVList.get(0).getChapterId(), learnerId);
if (StringUtils.isNotEmpty(type)) {
hql.append(" and lectureType=?");
diff --git a/src/main/java/com/qxueyou/scc/base/util/ClientUtils.java b/src/main/java/com/qxueyou/scc/base/util/ClientUtils.java
index b113ad5..ca4ad36 100644
--- a/src/main/java/com/qxueyou/scc/base/util/ClientUtils.java
+++ b/src/main/java/com/qxueyou/scc/base/util/ClientUtils.java
@@ -62,6 +62,8 @@
String info = getUserInfo().getInfo(UserInfoWrapper.INF_USER_ID);
if(info.equals("visitor_001")){
info= (String) session.getAttribute(UserInfoWrapper.INF_USER_ID);
+ }else {
+ session.setAttribute(UserInfoWrapper.INF_USER_ID,info);
}
return info;
}
diff --git a/src/main/java/com/qxueyou/scc/teach/subject/model/view/MyLectureV.java b/src/main/java/com/qxueyou/scc/teach/subject/model/view/MyLectureV.java
index 5c4df35..095d320 100644
--- a/src/main/java/com/qxueyou/scc/teach/subject/model/view/MyLectureV.java
+++ b/src/main/java/com/qxueyou/scc/teach/subject/model/view/MyLectureV.java
@@ -39,7 +39,7 @@
private String subjectId;
private String classId;
private Date lectureCreateTime;
- private String status;
+// private String status;
public MyLectureV() {
}
@@ -160,17 +160,17 @@
public void setLectureCreateTime(Date lectureCreateTime) {
this.lectureCreateTime = lectureCreateTime;
}
-
- @Column(name = "STATUS")
- public String getStatus() {
- return status;
- }
- public void setStatus(String status) {
- this.status = status;
- }
-
-
-
-
+// @Column(name = "STATUS")
+// public String getStatus() {
+// return status;
+// }
+//
+// public void setStatus(String status) {
+// this.status = status;
+// }
+
+
+
+
}
--
Gitblit v1.8.0