From bef4f6d51bff03c0512a75f43e79699b7296f1fa Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期四, 23 十一月 2023 18:00:53 +0800
Subject: [PATCH] 修改系统角色逻辑、和老师身份逻辑
---
src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClsClassService.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClsClassService.java b/src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClsClassService.java
index dbf0cb3..4138bff 100644
--- a/src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClsClassService.java
+++ b/src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClsClassService.java
@@ -134,23 +134,59 @@
public ClsClass read(String classId) {
return read(ClsClass.class, classId);
}
+//
+// /**
+// * 鍘熷锛氳幏鍙栫彮绾у垪琛�
+// */
+// @Override
+// public List<ClsClass> getClassLst(String keyword, String teacherId, Integer pageSize, Integer pageNum, Integer pageType) {
+// String keyword_ = StringUtils.isBlank(keyword) ? "" : keyword;
+//// System.out.println(keyword_);
+// StringBuffer hql = new StringBuffer("from ClsClass c where c.deleteFlag is false and c.orgId=? and c.name like ? and c.createId=?");
+//
+// if (pageType == 1) {
+// hql.append(" and c.endTime >= sysdate() ");
+// }else if(pageType == 2) {
+// hql.append(" and c.endTime < sysdate() ");
+// }
+//// System.out.println("vvvvv"+ClientUtils.getOrgId()+"333333333"+ClientUtils.getUserId());
+// List<Object> args = CollectionUtils.newList(ClientUtils.getOrgId(),keyword_ + "%",ClientUtils.getUserId());
+//// System.out.println(args);
+// if (!StringUtils.isEmpty(teacherId)) {
+// hql.append(" and exists( select 1 from ClsClassReSubject r,Subject t where r.subjectId=t.subjectId and c.classId= r.classId and t.teacherId=? and r.deleteFlag is false and t.deleteFlag is false)");
+// args.add(teacherId);
+// }
+//
+// hql.append(" order by c.createTime desc");
+//// System.out.println(hql.toString());
+//// System.out.println(findList(hql.toString(), new Pager(pageSize, pageNum), args, ClsClass.class));
+// return findList(hql.toString(), new Pager(pageSize, pageNum), args, ClsClass.class);
+// }
/**
- * 鑾峰彇鐝骇鍒楄〃
+ * 浼樺寲鑾峰彇鐝骇鍒楄〃
+ * @param keyword
+ * @param teacherId
+ * @param pageSize
+ * @param pageNum
+ * @param pageType
+ * @return
*/
- @Override
public List<ClsClass> getClassLst(String keyword, String teacherId, Integer pageSize, Integer pageNum, Integer pageType) {
String keyword_ = StringUtils.isBlank(keyword) ? "" : keyword;
// System.out.println(keyword_);
- StringBuffer hql = new StringBuffer("from ClsClass c where c.deleteFlag is false and c.orgId=? and c.name like ? and c.createId=?");
+ StringBuffer hql = new StringBuffer("from ClsClass c where c.deleteFlag is false and c.orgId=? and c.name like ? ");
if (pageType == 1) {
hql.append(" and c.endTime >= sysdate() ");
}else if(pageType == 2) {
hql.append(" and c.endTime < sysdate() ");
}
-// System.out.println("vvvvv"+ClientUtils.getOrgId()+"333333333"+ClientUtils.getUserId());
- List<Object> args = CollectionUtils.newList(ClientUtils.getOrgId(),keyword_ + "%",ClientUtils.getUserId());
+// if (!StringUtils.isEmpty(teacherId)) {
+// hql.append("and c.createId=?)");
+// }
+// System.out.println("vvvvv"+ClientUtils.getOrgId()+"333333333"+ClientUtils.getUserId()); ,ClientUtils.getUserId()
+ List<Object> args = CollectionUtils.newList(ClientUtils.getOrgId(),keyword_ + "%");
// System.out.println(args);
if (!StringUtils.isEmpty(teacherId)) {
hql.append(" and exists( select 1 from ClsClassReSubject r,Subject t where r.subjectId=t.subjectId and c.classId= r.classId and t.teacherId=? and r.deleteFlag is false and t.deleteFlag is false)");
@@ -348,7 +384,7 @@
public List<Map<String,Object>> queryAllClassIdAndName() {
StringBuffer hql = new StringBuffer(500);
// c.deleteFlag is false and
- hql.append("select c.classId as classId ,c.name as className from ClsClass c where c.endTime>=:endTime and c.orgId=:orgId " );
+ hql.append("select c.classId as classId ,c.name as className from ClsClass c where c.endTime>=:endTime and deleteFlag is false and c.orgId=:orgId " );
return this.findListWithMapByHql(hql.toString(), CollectionUtils.newObjectMap("endTime",new Date(),"orgId",ClientUtils.getOrgId()));
}
--
Gitblit v1.8.0