From cd59ededbf05a0ae73b8f4944fbf40a1fb01d28a Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期一, 11 十一月 2024 18:03:43 +0800
Subject: [PATCH] 错题详情
---
src/main/java/com/ycl/jxkg/service/impl/ClassesUserServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 51 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 c13dc99..c2f488b 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ClassesUserServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ClassesUserServiceImpl.java
@@ -6,6 +6,7 @@
import com.ycl.jxkg.domain.entity.ClassesUser;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.domain.form.EditClassesUserForm;
+import com.ycl.jxkg.domain.vo.StudentVO;
import com.ycl.jxkg.enums.RoleEnum;
import com.ycl.jxkg.enums.UserStatusEnum;
import com.ycl.jxkg.mapper.ClassesUserMapper;
@@ -25,6 +26,10 @@
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;
import java.util.stream.Collectors;
@@ -53,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());
@@ -70,11 +75,21 @@
user.setPhone(form.getPhone());
user.setRealName(form.getRealName());
user.setSex(form.getSex());
+ if (StringUtils.hasText(form.getBirthDay())) {
+ 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("娣诲姞鎴愬姛");
}
@@ -87,7 +102,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) {
@@ -100,9 +115,38 @@
BeanUtils.copyProperties(form, classesUser);
baseMapper.updateById(classesUser);
- BeanUtils.copyProperties(classesUser, user);
+// BeanUtils.copyProperties(classesUser, user);
+// userMapper.updateById(user);
+ 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("淇敼鎴愬姛");
+ }
+
+ @Override
+ public List<StudentVO> getTeacherListByClassesId(Integer id) {
+ return baseMapper.getTeacherListByClassesId(id);
+ }
+
+ /**
+ * 鏍规嵁鐢ㄦ埛id鑾峰彇鐢ㄦ埛鐝骇淇℃伅
+ *
+ * @param userId
+ * @return
+ */
+ @Override
+ public List<Integer> getByUserId(Integer userId) {
+ return classesUserMapper.getClassesByUserId(userId);
}
/**
@@ -117,12 +161,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