From ea3bcc24543202a55b22623cad8dd8900d550242 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期二, 29 十月 2024 14:05:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/service/impl/ClassesUserServiceImpl.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ClassesUserServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ClassesUserServiceImpl.java
index 85c6fd1..909cc65 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ClassesUserServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ClassesUserServiceImpl.java
@@ -26,6 +26,9 @@
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -55,15 +58,15 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public Result add(EditClassesUserForm form) {
+ public Result add(EditClassesUserForm form) {
Long count = new LambdaQueryChainWrapper<>(userMapper)
- .eq(User::getUserName, form.getAccount())
+ .eq(User::getUserName, form.getUserName())
.count();
if (count > 0) {
throw new RuntimeException("璇ョ櫥褰曡处鍙峰凡琚娇鐢�");
}
User user = new User();
- user.setUserName(form.getPhone());
+ user.setUserName(form.getUserName());
String password = StringUtils.hasText(form.getPassword()) ? form.getPassword() : DEFAULT_PASSWORD;
user.setPassword(authenticationService.pwdEncode(password));
user.setStatus(UserStatusEnum.Enable.getCode());
@@ -72,12 +75,19 @@
user.setPhone(form.getPhone());
user.setRealName(form.getRealName());
user.setSex(form.getSex());
+ DateFormat fmt =new SimpleDateFormat("yyyy-MM-dd");
+ try {
+ user.setBirthDay(fmt.parse(form.getBirthDay()));
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
user.setLastUpdatePasswordTime(new Date());
userMapper.insert(user);
ClassesUser classesUser = new ClassesUser();
classesUser.setClassesId(form.getClassesId());
classesUser.setUserId(user.getId());
+ classesUser.setTeacher(Boolean.FALSE);
baseMapper.insert(classesUser);
return Result.ok("娣诲姞鎴愬姛");
}
@@ -90,7 +100,7 @@
throw new RuntimeException("瀛﹀憳鏁版嵁涓嶅瓨鍦�");
}
Long count = new LambdaQueryChainWrapper<>(userMapper)
- .eq(User::getUserName, form.getAccount())
+ .eq(User::getUserName, form.getUserName())
.ne(User::getId, classesUser.getUserId())
.count();
if (count > 0) {
@@ -105,11 +115,18 @@
// BeanUtils.copyProperties(classesUser, user);
// userMapper.updateById(user);
- user.setUserName(form.getAccount());
+ user.setUserName(form.getUserName());
user.setPassword(form.getPassword());
user.setPhone(form.getPhone());
user.setRealName(form.getRealName());
user.setSex(form.getSex());
+ user.setAge(form.getAge());
+ DateFormat fmt =new SimpleDateFormat("yyyy-MM-dd");
+ try {
+ user.setBirthDay(fmt.parse(form.getBirthDay()));
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
userMapper.updateById(user);
return Result.ok("淇敼鎴愬姛");
}
@@ -142,12 +159,14 @@
// 鍏堝垹闄や箣鍓嶇殑
new LambdaUpdateChainWrapper<>(baseMapper)
.eq(ClassesUser::getClassesId, form.getId())
+ .eq(ClassesUser::getTeacher, Boolean.FALSE)
.remove();
// 鍐嶆柊澧�
List<ClassesUser> classesUserList = form.getStudentList().stream().map(item -> {
ClassesUser classesUser = new ClassesUser();
classesUser.setClassesId(form.getId());
classesUser.setUserId(item);
+ classesUser.setTeacher(Boolean.FALSE);
return classesUser;
}).collect(Collectors.toList());
this.saveBatch(classesUserList);
--
Gitblit v1.8.0