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 | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 2226669..c412c73 100644
--- a/src/main/java/com/qxueyou/scc/exercise/action/ExerciseGroupController.java
+++ b/src/main/java/com/qxueyou/scc/exercise/action/ExerciseGroupController.java
@@ -62,7 +62,7 @@
* 棰樺簱鍒楄〃
*/
@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();
@@ -85,6 +85,10 @@
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璧嬪��
@@ -101,6 +105,9 @@
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);
if(list!=null&& list.size()>0){
--
Gitblit v1.8.0