From 0e62c15e4b010ffa2d5cff9474f3fd389e369338 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期五, 24 十一月 2023 14:31:46 +0800
Subject: [PATCH] 优化作业、考试、试卷、题库
---
src/main/java/com/qxueyou/scc/admin/classroom/service/impl/ClassRoomService.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/admin/classroom/service/impl/ClassRoomService.java b/src/main/java/com/qxueyou/scc/admin/classroom/service/impl/ClassRoomService.java
index 7e9a5d1..05193af 100644
--- a/src/main/java/com/qxueyou/scc/admin/classroom/service/impl/ClassRoomService.java
+++ b/src/main/java/com/qxueyou/scc/admin/classroom/service/impl/ClassRoomService.java
@@ -3,6 +3,7 @@
import java.util.List;
import java.util.Map;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.qxueyou.scc.admin.classroom.model.ClassRoom;
@@ -31,7 +32,7 @@
ClassRoom newClassRoom = read(ClassRoom.class, classRoom.getRoomId());
if (newClassRoom == null) {
- return new Result(false, "教室不存在");
+ return new Result(false, "鏁欏涓嶅瓨鍦�");
}
TraceUtils.setUpdateTrace(newClassRoom);
@@ -53,7 +54,7 @@
@Override
public Result doRelease(String[] roomIds) {
if(roomIds==null || roomIds.length==0){
- return new Result(false, "没有选择要发布的教室");
+ return new Result(false, "娌℃湁閫夋嫨瑕佸彂甯冪殑鏁欏");
}
List<ClassRoom> lstClsRoom = this.findByComplexHql("from ClassRoom where roomId in (:roomIds)",
@@ -61,7 +62,7 @@
for (ClassRoom room : lstClsRoom) {
if (ExamInfo.STATUS_DRAFT != room.getStatus()) {
- return new Result(false, "只有草稿状态的教室,才能发布。");
+ return new Result(false, "鍙湁鑽夌鐘舵�佺殑鏁欏,鎵嶈兘鍙戝竷銆�");
}
room.setStatus(ClassRoom.STATUS_PUBLISH);
TraceUtils.setUpdateTrace(room);
@@ -74,7 +75,7 @@
@Override
public Result doCancel(String[] roomIds) {
if(roomIds==null || roomIds.length==0){
- return new Result(false, "没有选择要撤回的教室");
+ return new Result(false, "娌℃湁閫夋嫨瑕佹挙鍥炵殑鏁欏");
}
List<ClassRoom> lstClsRoom = this.findByComplexHql("from ClassRoom where roomId in (:roomIds)",
@@ -82,7 +83,7 @@
for (ClassRoom room : lstClsRoom) {
if (ExamInfo.STATUS_PUBLISH != room.getStatus()) {
- return new Result(false, "只有发布状态的 教室,才能撤回");
+ return new Result(false, "鍙湁鍙戝竷鐘舵�佺殑 鏁欏,鎵嶈兘鎾ゅ洖");
}
room.setStatus(ExamInfo.STATUS_DRAFT);
TraceUtils.setUpdateTrace(room);
@@ -93,13 +94,19 @@
@Override
public List<ClassRoom> list(String keyword, Short status, Integer pageSize, Integer pageNum) {
+ //鍒ゆ柇鏄惁鏄暀甯�
+ String teacherId = ClientUtils.isAdmin() ? null : ClientUtils.getUserId();
StringBuffer hql = new StringBuffer(500);
- hql.append(" from ClassRoom where name like ? and createId=? ");
- List<Object> params = CollectionUtils.newList('%' + keyword.trim() + '%',ClientUtils.getUserId());
+ hql.append(" from ClassRoom where name like ? ");
+ List<Object> params = CollectionUtils.newList('%' + keyword.trim() + '%');
if(status!=null){
hql.append(" and status = ? ");
params.add(status);
+ }
+ if (StringUtils.isNotBlank(teacherId)) {
+ hql.append(" and createId=?");
+ params.add(teacherId);
}
hql.append(" and deleteFlag is false order by createTime desc");
@@ -109,14 +116,20 @@
@Override
public int listCount(String keyword, Short status) {
+ //鍒ゆ柇鏄惁鏄暀甯�
+ String teacherId = ClientUtils.isAdmin() ? null : ClientUtils.getUserId();
StringBuffer hql = new StringBuffer(500);
- hql.append(" from ClassRoom where name like ? and createId=? ");
- List<Object> params = CollectionUtils.newList('%' + keyword.trim() + '%',ClientUtils.getUserId());
+ hql.append(" from ClassRoom where name like ? ");
+ List<Object> params = CollectionUtils.newList('%' + keyword.trim() + '%');
if(status!=null){
hql.append(" and status = ? ");
params.add(status);
}
+ if (StringUtils.isNotBlank(teacherId)) {
+ hql.append(" and createId=?");
+ params.add(teacherId);
+ }
hql.append(" and deleteFlag is false ");
--
Gitblit v1.8.0