From df4898d55d3aa97f2cf455b4c351c37f2b84e257 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期三, 30 十月 2024 17:59:25 +0800
Subject: [PATCH] bug
---
src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 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..408a884 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java
@@ -29,6 +29,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 +62,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 +73,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 +93,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());
@@ -132,7 +148,11 @@
query.setTeacherId(id);
IPage<MeetVO> page = PageUtil.getPage(query, MeetVO.class);
baseMapper.getPage(page, query);
-
+ page.getRecords().forEach(vo -> {
+ if (!CollectionUtils.isEmpty(vo.getTeacherNames())) {
+ vo.setTeacherNamesStr(vo.getTeacherNames().stream().collect(Collectors.joining("銆�")));
+ }
+ });
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
@@ -248,20 +268,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