From bf13676673e9f0f090a68bd8cfbaefbf0d696d32 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期日, 26 十一月 2023 13:03:00 +0800
Subject: [PATCH] 讨论区关键字过滤、首页班级显示班级信息
---
src/main/java/com/qxueyou/scc/exercise/action/ExerciseGroupController.java | 71 +++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/exercise/action/ExerciseGroupController.java b/src/main/java/com/qxueyou/scc/exercise/action/ExerciseGroupController.java
index 13cf07f..c412c73 100644
--- a/src/main/java/com/qxueyou/scc/exercise/action/ExerciseGroupController.java
+++ b/src/main/java/com/qxueyou/scc/exercise/action/ExerciseGroupController.java
@@ -28,18 +28,18 @@
import io.swagger.annotations.Api;
/**
- * 练习题目控制
+ * 缁冧範棰樼洰鎺у埗
*
* @author kevin
* @history 2018-03-11 create kevin
*/
-@Api(tags = "题库管理接口")
+@Api(tags = "棰樺簱绠＄悊鎺ュ彛")
@Controller
@RequestMapping(value = "/exercise/group")
public class ExerciseGroupController {
- // 分页查询中，默认记录条数和页数
+ // 鍒嗛〉鏌ヨ涓紝榛樿璁板綍鏉℃暟鍜岄〉鏁�
private static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE;
private static final int DEFAULT_PAGE_NUM = 1;
@@ -59,33 +59,54 @@
ISubjectService subjectService;
/**
- * 题库列表
+ * 棰樺簱鍒楄〃
*/
@RequestMapping(value = "/list", method = RequestMethod.GET)
- public @ResponseBody Result pageList(String keyword,Short status, Integer pageSize, Integer pageNum) {
+ public @ResponseBody Result pageList(String keyword,Short status, Integer pageSize, Integer pageNum,String typeStatus) {
+ //鍒ゆ柇鏄惁鏄暀甯�
+// String teacherId = ClientUtils.isAdmin() ? null : teacherService.getTeacherIdByUserId(ClientUtils.getUserId());
+ String teacherId = ClientUtils.isAdmin() ? null : ClientUtils.getUserId();
+
Result result = new Result(Boolean.TRUE);
Pager page = new Pager();
List<ExerciseGroup> listResult = null;
List<Object> queryParam = null;
- // 查询记录数
- String hqlCount = "from ExerciseGroup where createId=? and type=? and name like ? and deleteFlag is false ";
+ // 鏌ヨ璁板綍鏁�
+ String hqlCount = "from ExerciseGroup where type=? and name like ? and deleteFlag is false ";
+
+
if(status!=null){
hqlCount = hqlCount.concat(" and status = ?");
- queryParam = CollectionUtils.newList(ClientUtils.getUserId(), ExerciseGroup.TYPE_EXERCISE_GROUP_LIB,'%'+(keyword==null?"":keyword.trim())+'%',status);
+ queryParam = CollectionUtils.newList(ExerciseGroup.TYPE_EXERCISE_GROUP_LIB,'%'+(keyword==null?"":keyword.trim())+'%',status);
}else{
- queryParam = CollectionUtils.newList(ClientUtils.getUserId(), ExerciseGroup.TYPE_EXERCISE_GROUP_LIB,'%'+(keyword==null?"":keyword.trim())+'%');
+ queryParam = CollectionUtils.newList( ExerciseGroup.TYPE_EXERCISE_GROUP_LIB,'%'+(keyword==null?"":keyword.trim())+'%');
+ }
+ if (StringUtils.isNotBlank(teacherId)) {
+ hqlCount = hqlCount.concat(" and createId=?");
+ queryParam.add(teacherId);
+ }
+ if (StringUtils.isNotBlank(typeStatus)) {
+ hqlCount = hqlCount.concat(" and typeStatus=?");
+ queryParam.add(typeStatus);
}
int totalCount = commonDAO.findCount(hqlCount,queryParam);
- // page赋值
+ // page璧嬪��
page.setTotalCount(totalCount);
page.setPageSize(pageSize != null && pageSize > 0 ? pageSize : DEFAULT_PAGE_SIZE);
page.setPageNum(pageNum != null && pageNum > 0 ? pageNum : DEFAULT_PAGE_NUM);
StringBuffer hqlBuffer = new StringBuffer(500);
- hqlBuffer.append("select g,s.name from ExerciseGroup g,Subject s where g.subjectId=s.subjectId and g.createId=? and g.type=? and g.name like ? and g.deleteFlag is false ");
+ hqlBuffer.append("select g,s.name from ExerciseGroup g,Subject s where g.subjectId=s.subjectId and g.type=? and g.name like ? and g.deleteFlag is false ");
if(status!=null){
hqlBuffer.append(" and g.status = ? ");
+ }
+ if (StringUtils.isNotBlank(teacherId)) {
+ hqlBuffer.append(" and g.createId=?");
+ }
+
+ if (StringUtils.isNotBlank(typeStatus)) {
+ hqlBuffer.append(" and g.typeStatus=?");
}
hqlBuffer.append(" order by g.createTime DESC");
List<Object[]> list = commonDAO.findList(hqlBuffer.toString(), page,queryParam,Object[].class);
@@ -104,7 +125,7 @@
}
/**
- * 详情页面数据
+ * 璇︽儏椤甸潰鏁版嵁
*
* @param exerciseGroupId
* @return
@@ -117,7 +138,7 @@
}
/**
- * 保存题库基本信息
+ * 淇濆瓨棰樺簱鍩烘湰淇℃伅
*
* @param exerciseGroup
* @return
@@ -126,7 +147,7 @@
public @ResponseBody Result save(@RequestBody ExerciseGroup exerciseGroup) {
Result result = null;
String exerciseGroupId = exerciseGroup.getGroupId();
- // 暂时题库类型配置为题库类型
+ // 鏆傛椂棰樺簱绫诲瀷閰嶇疆涓洪搴撶被鍨�
if(StringUtils.isEmpty(exerciseGroupId)){
result = new Result(true);
exerciseGroup.setType(ExerciseGroup.TYPE_EXERCISE_GROUP_LIB);
@@ -139,7 +160,7 @@
}
/**
- * 删除
+ * 鍒犻櫎
*
* @param exerciseGroupIds
* @return
@@ -155,14 +176,14 @@
/**
- * 作业布置班级列表
+ * 浣滀笟甯冪疆鐝骇鍒楄〃
*
* @param examId
* @return
*/
@RequestMapping(value = "/subject/list", method = RequestMethod.GET)
public @ResponseBody List<Map<String,Object>> subjectList(Integer subjectType) {
- //判断是否是教师
+ //鍒ゆ柇鏄惁鏄暀甯�
String teacherId = ClientUtils.isAdmin() ? null : teacherService.getTeacherIdByUserId(ClientUtils.getUserId());
if(subjectType==null){
@@ -173,21 +194,21 @@
}
/**
- * 作业布置班级列表
+ * 浣滀笟甯冪疆鐝骇鍒楄〃
*
* @param examId
* @return
*/
@RequestMapping(value = "/class/list", method = RequestMethod.GET)
public @ResponseBody List<Map<String,Object>> classList(String subjectId) {
- //判断是否是教师
+ //鍒ゆ柇鏄惁鏄暀甯�
String teacherId = ClientUtils.isAdmin() ? null : teacherService.getTeacherIdByUserId(ClientUtils.getUserId());
return classService.queryAvailableClassIdAndName(teacherId,subjectId);
}
/**
- * 发布题库
+ * 鍙戝竷棰樺簱
*
* @param exerciseIds
* @return
@@ -195,13 +216,13 @@
@RequestMapping(value = "/exerciselib/publish", method = RequestMethod.GET)
public @ResponseBody Result publishExerciseLib(String groupIds) {
if (StringUtils.isEmpty(groupIds)) {
- return new Result(false, "参数错误");
+ return new Result(false, "鍙傛暟閿欒");
}
return this.exerciseGroupService.doPublishExerciseLib(groupIds.split(","));
}
/**
- * 撤回题库
+ * 鎾ゅ洖棰樺簱
*
* @param exerciseIds
* @return
@@ -209,20 +230,20 @@
@RequestMapping(value = "/exerciselib/revoke", method = RequestMethod.GET)
public @ResponseBody Result revokeExerciseLib(String groupIds) {
if (StringUtils.isEmpty(groupIds)) {
- return new Result(false, "参数错误");
+ return new Result(false, "鍙傛暟閿欒");
}
return this.exerciseGroupService.doRevokeExerciseLib(groupIds.split(","));
}
/**
- * 题目统计
+ * 棰樼洰缁熻
* @param examPaperIds
* @return
*/
@RequestMapping(value = "/item/statistics", method = RequestMethod.GET)
public @ResponseBody Result statisticsItem (String groupIds) {
if (StringUtils.isEmpty(groupIds)) {
- return new Result(false, "参数错误");
+ return new Result(false, "鍙傛暟閿欒");
}
List<ExerciseGroup> lstGroupStatistics = this.exerciseGroupService.queryExerciseGroupItemsStatistic(groupIds.split(","));
--
Gitblit v1.8.0