From f18c0b3336a10bc36a9e5ca34a03b6d19c34569b Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期二, 12 十一月 2024 22:43:01 +0800
Subject: [PATCH] 优化错题详情
---
src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java | 76 ++++++++++++++++++++++++--------------
1 files changed, 48 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java
index 8af2aad..481ed76 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java
@@ -3,15 +3,13 @@
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.base.SystemCode;
import com.ycl.jxkg.context.WebContext;
-import com.ycl.jxkg.domain.entity.Meet;
-import com.ycl.jxkg.domain.entity.MeetClasses;
-import com.ycl.jxkg.domain.entity.MeetStudent;
-import com.ycl.jxkg.domain.entity.StudyRecord;
+import com.ycl.jxkg.domain.entity.*;
import com.ycl.jxkg.domain.form.MeetForm;
import com.ycl.jxkg.domain.query.MeetQuery;
import com.ycl.jxkg.domain.vo.ClassesVO;
@@ -29,6 +27,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import java.util.Date;
@@ -61,6 +60,7 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result add(MeetForm form) {
Meet entity = MeetForm.getEntityByForm(form, null);
entity.setStatus(MeetStatusEnum.Wait.getCode());
@@ -71,10 +71,10 @@
this.sendMQ(entity, 0);
}
// 鍚戜細璁彮绾т腑闂磋〃涓彃鍏ユ暟鎹�
- form.getClassesIds().stream().forEach(classId -> {
+ form.getClassesIds().forEach(classId -> {
MeetClasses meetClasses = new MeetClasses();
meetClasses.setMeetId(entity.getId());
- meetClasses.setClassId(classId);
+ meetClasses.setClassesId(classId);
meetClassesMapper.insert(meetClasses);
});
return Result.ok("娣诲姞鎴愬姛");
@@ -91,6 +91,20 @@
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
BeanUtils.copyProperties(form, entity);
+
+ // 鍏堝垹闄ゅ啀鏂板
+ new LambdaUpdateChainWrapper<>(meetClassesMapper)
+ .eq(MeetClasses::getMeetId, entity.getId())
+ .remove();
+ // 鍚戜細璁彮绾т腑闂磋〃涓彃鍏ユ暟鎹�
+ form.getClassesIds().forEach(classId -> {
+ MeetClasses meetClasses = new MeetClasses();
+ meetClasses.setMeetId(entity.getId());
+ meetClasses.setClassesId(classId);
+ meetClassesMapper.insert(meetClasses);
+ });
+
+
// 濡傛灉淇敼鎴愬姛鍙戦�乵q娑堟伅
if (baseMapper.updateById(entity) > 0) {
this.sendMQ(entity, entity.getUpdateVersion());
@@ -127,12 +141,28 @@
*/
@Override
public Result page(MeetQuery query) {
- Integer id = webContext.getCurrentUser().getId();
- //鏌ヨ嚜宸卞垱寤虹殑鎴块棿
- query.setTeacherId(id);
+ Integer userId = webContext.getCurrentUser().getId();
+ //鏌ヨ嚜宸辩殑浼氳
+ List<ClassesUser> classes = new LambdaQueryChainWrapper<>(classesUserMapper)
+ .eq(ClassesUser::getUserId, userId)
+ .eq(ClassesUser::getTeacher, Boolean.TRUE)
+ .list();
+ List<Integer> classesIds = classes.stream().map(ClassesUser::getClassesId).collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(classesIds) && 3 != webContext.getCurrentUser().getRole()) {
+ throw new RuntimeException("鎮ㄦ殏鏃舵棤娉曡闂椤甸潰");
+ }
+ query.setClassesIds(classesIds);
IPage<MeetVO> page = PageUtil.getPage(query, MeetVO.class);
- baseMapper.getPage(page, query);
-
+ baseMapper.teacherPage(page, query);
+ page.getRecords().forEach(vo -> {
+ if (! CollectionUtils.isEmpty(vo.getClassesIds())) {
+ // 鏌ヤ富璁茶�佸笀
+ List<String> teacherNames = classesUserMapper.getTeachersByClassesIds(vo.getClassesIds());
+ if (! CollectionUtils.isEmpty(teacherNames)) {
+ vo.setTeacherNamesStr(teacherNames.stream().collect(Collectors.joining("銆�")));
+ }
+ }
+ });
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
@@ -153,10 +183,14 @@
query.setClassesIds(classes);
}
IPage<MeetVO> page = PageUtil.getPage(query, MeetVO.class);
- baseMapper.getPage(page, query);
+ baseMapper.studentPage(page, query);
for (MeetVO vo : page.getRecords()) {
- if (!CollectionUtils.isEmpty(vo.getTeacherNames())) {
- vo.setTeacherNamesStr(vo.getTeacherNames().stream().collect(Collectors.joining("銆�")));
+ if (! CollectionUtils.isEmpty(vo.getClassesIds())) {
+ // 鏌ヤ富璁茶�佸笀
+ List<String> teacherNames = classesUserMapper.getTeachersByClassesIds(vo.getClassesIds());
+ if (! CollectionUtils.isEmpty(teacherNames)) {
+ vo.setTeacherNamesStr(teacherNames.stream().collect(Collectors.joining("銆�")));
+ }
}
}
return Result.ok().data(page.getRecords()).total(page.getTotal());
@@ -248,20 +282,6 @@
Integer userId = webContext.getCurrentUser().getId();
List<ClassesVO> classes = classesUserMapper.getClassesByUserId1(userId);
return Result.ok().data(classes);
- }
-
- @Override
- public Result editMeetClasses(MeetClassesVo meetClassesVo) {
- // 鍒犻櫎璇ヤ細璁墍鏈夌彮绾�
- meetClassesMapper.deleteByMeetId(meetClassesVo.getMeetId());
- // 涓鸿浼氳鏂板鐝骇
- meetClassesVo.getChangeIds().forEach(id -> {
- MeetClasses meetClasses = new MeetClasses();
- meetClasses.setMeetId(meetClassesVo.getMeetId());
- meetClasses.setClassId(id);
- meetClassesMapper.insert(meetClasses);
- });
- return Result.ok("淇敼鎴愬姛");
}
/**
--
Gitblit v1.8.0