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/admin/classes/service/impl/ClsClassService.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 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 4138bff..429f9d3 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()));
@@ -107,9 +108,28 @@
}
@Override
+ public List<ClsClass> getTeacherClassLst(String teacherId) {
+ String sql = "select c.* " +
+ "from cls_class as c " +
+ "where c.DELETE_FLAG is false and c.CLASS_ID in " +
+ "(select cs.CLASS_ID " +
+ "from cls_class_re_subject as cs " +
+ "LEFT JOIN subject as s on s.SUBJECT_ID =cs.SUBJECT_ID " +
+ "where cs.DELETE_FLAG is false and s.DELETE_FLAG is false and s.TEACHER_ID=:teacherId )";
+ List<Object[]> list = findByComplexSql(sql, CollectionUtils.newObjectMap("teacherId", teacherId), Object[].class);
+ List<ClsClass> clsClassList=new ArrayList<>();
+ for (Object[] objects : list) {
+ ClsClass clsClass = new ClsClass();
+ clsClass.setClassId(objects[0].toString());
+ clsClassList.add(clsClass);
+ }
+ return clsClassList;
+ }
+
+ @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 +144,7 @@
cls.setShowAnalysisAfterExer(showAnalysisAfterExer);
cls.setCanMultiExer(canMultiExer);
cls.setNeedForum(needForum);
+ cls.setChargeClassName(chargeClassName);
cls.setTeacherId(teacherId);
save(cls);
@@ -317,7 +338,8 @@
public Map<String, Object> getClassActivityInfo(String classId) {
Map<String, Object> result = scoreService.queryClassHomeworkScoreInfo(classId);
- result.putAll(scoreService.queryClassExamScoreInfo(classId));
+ Map<String, Object> stringObjectMap = scoreService.queryClassExamScoreInfo(classId);
+ result.putAll(stringObjectMap);
ClsClass cls = read(classId);
@@ -353,11 +375,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