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/exam/action/ExamPaperController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/exam/action/ExamPaperController.java b/src/main/java/com/qxueyou/scc/exam/action/ExamPaperController.java
index 7e68cb0..1f0f236 100644
--- a/src/main/java/com/qxueyou/scc/exam/action/ExamPaperController.java
+++ b/src/main/java/com/qxueyou/scc/exam/action/ExamPaperController.java
@@ -61,16 +61,23 @@
@RequestMapping(value = "/list", method = RequestMethod.GET)
public @ResponseBody Result pageList(String keyword,Short status, Integer pageSize,Integer pageNum){
Result result = new Result(Boolean.TRUE);
+ //鍒ゆ柇鏄惁鏄暀甯�
+ String teacherId = ClientUtils.isAdmin() ? null : ClientUtils.getUserId();
Pager pager = new Pager();
List<Object> queryParamLst = null;
// 鏌ヨ璁板綍鏁�
- String hqlCount="from ExamPaperInfo where createId=? and examPaperName like ? and deleteFlag is false";
+ String hqlCount="from ExamPaperInfo where examPaperName like ? and deleteFlag is false";
if(status!=null){
hqlCount = hqlCount.concat(" and paperStatus = ?");
- queryParamLst = CollectionUtils.newList(ClientUtils.getUserId(),'%'+(keyword==null?"":keyword.trim())+'%',status);
+ queryParamLst = CollectionUtils.newList('%'+(keyword==null?"":keyword.trim())+'%',status);
}else{
- queryParamLst = CollectionUtils.newList(ClientUtils.getUserId(),'%'+(keyword==null?"":keyword.trim())+'%');
+ queryParamLst = CollectionUtils.newList('%'+(keyword==null?"":keyword.trim())+'%');
}
+ if (StringUtils.isNotBlank(teacherId)) {
+ hqlCount = hqlCount.concat(" and createId=?");
+ queryParamLst.add(teacherId);
+ }
+
int totalCount = commonDAO.findCount(hqlCount,queryParamLst);
// page璧嬪��
@@ -79,10 +86,13 @@
pager.setPageNum (pageNum!=null&&pageNum>0?pageNum:DEFAULT_PAGE_NUM);
StringBuffer hqlBuffer = new StringBuffer(500);
- hqlBuffer.append("from ExamPaperInfo where createId=? and examPaperName like ? and deleteFlag is false ");
+ hqlBuffer.append("from ExamPaperInfo where examPaperName like ? and deleteFlag is false ");
if(status!=null){
hqlBuffer.append(" and paperStatus = ? ");
}
+ if (StringUtils.isNotBlank(teacherId)) {
+ hqlBuffer.append(" and createId=?");
+ }
hqlBuffer.append(" order by createTime DESC");
List<ExamPaperInfo> list = commonDAO.findList(hqlBuffer.toString(), pager,queryParamLst, ExamPaperInfo.class);
--
Gitblit v1.8.0