Merge remote-tracking branch 'origin/master'

fuliqi

2024-10-29 8883d90ba7d60a61590b715d1a3be9e3ae2adb2d

 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,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;
@@ -54,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());
@@ -71,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("添加成功");
    }
@@ -89,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) {
@@ -104,13 +115,36 @@

//        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("修改成功");
    }

    @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);
    }

    /**
@@ -125,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);