From 63c8bc319fd02d9f39b729f136fb3af01c773de1 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期六, 25 十一月 2023 14:27:14 +0800
Subject: [PATCH] 学籍导入、班级
---
src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClsClassService.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 4138bff..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);
@@ -353,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 ");
--
Gitblit v1.8.0