From d7963a84282c548fee3595b3343e6ae6ca49bb29 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期五, 24 十一月 2023 14:12:01 +0800
Subject: [PATCH] 学籍，考勤
---
src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClsClassService.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 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..056deb8 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
@@ -61,7 +61,7 @@
*/
@Override
public Result insertClass(String className, String classNumber, Date startTime, Date endTime, String subjectId,
- String teacherId) {
+ String teacherId,String chargeClassName) {
ClsClass cls = new ClsClass();
@@ -72,6 +72,7 @@
cls.setStartTime(startTime);
cls.setEndTime(endTime);
cls.setTeacherId(teacherId);
+ cls.setChargeClassName(chargeClassName);
cls.setOrgId(ClientUtils.getOrgId());
save(cls);
return new Result(true, "success",CollectionUtils.newStringMap("classId",cls.getClassId()));
@@ -109,7 +110,7 @@
@Override
public Result updateClass(String classId, String className, String classNumber, Date startTime, Date endTime,
String subjectId, boolean needJoinAudit, boolean needQuitAudit, boolean showAnalysisAfterExer,
- boolean canMultiExer, boolean needForum, String teacherId) {
+ boolean canMultiExer, boolean needForum, String teacherId, String chargeClassName) {
ClsClass cls = read(ClsClass.class, classId);
@@ -124,6 +125,7 @@
cls.setShowAnalysisAfterExer(showAnalysisAfterExer);
cls.setCanMultiExer(canMultiExer);
cls.setNeedForum(needForum);
+ cls.setChargeClassName(chargeClassName);
cls.setTeacherId(teacherId);
save(cls);
@@ -134,23 +136,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)");
@@ -317,11 +355,11 @@
@Override
public List<Map<String,Object>> queryAvailableClassIdAndName(String teacherId,String subjectId) {
StringBuffer hql = new StringBuffer(1000);
- // and c.endTime>=sysdate() 澧炲姞鏉′欢杩囨护鎺夊巻鍙茬彮绾�
- hql.append("select c.classId as classId ,c.name as className from ClsClass c where c.deleteFlag is false and c.orgId=:orgId and c.createId=:createId " );
+ // and c.endTime>=sysdate() 澧炲姞鏉′欢杩囨护鎺夊巻鍙茬彮绾� and c.createId=:createId
+ hql.append("select c.classId as classId ,c.name as className from ClsClass c where c.deleteFlag is false and c.orgId=:orgId " );
Map<String,Object> queryParam = new HashMap<String,Object>();
queryParam.put("orgId", ClientUtils.getOrgId());
- queryParam.put("createId", ClientUtils.getUserId());
+// queryParam.put("createId", ClientUtils.getUserId());
if(StringUtils.isNotEmpty(teacherId)||StringUtils.isNotEmpty(subjectId)){
hql.append(" and exists (select 1 from ClsClassReSubject r ,Subject s where r.subjectId=s.subjectId and r.classId =c.classId and r.deleteFlag is false ");
@@ -348,7 +386,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