试读报到激活调整

src/main/java/com/xjrsoft/module/organization/mapper/UserMapper.java

@@ -12,6 +12,7 @@ import com.xjrsoft.module.student.dto.BaseStudentSimpleInfoDto;
 import com.xjrsoft.module.student.vo.BaseStudentSompleInfoVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -32,4 +33,7 @@ public interface UserMapper extends MPJBaseMapper<User> {
     Page<PersonPageVo> personPage(Page<PersonPageVo> page, @Param("dto") PersonPageDto dto);
 
     List<UserIdDeptNameVo> getTeacherDeptName();
+
+    @Update("update xjr_user where delete_mark = 0, enabled_mark = 1, modify_user_id = #{modifyUserId}, modify_date = now() where user_id = #{userId}")
+    Boolean activateUser(@Param("userId") Long userId, @Param("modifyUserId") Long modifyUserId);
 }

src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentSchoolRollServiceImpl.java

@@ -302,19 +302,7 @@ public class BaseStudentSchoolRollServiceImpl extends MPJBaseServiceImpl<BaseStu
 
     @Override
     public Boolean activateStudent(Long userId, Long modifyUserId) {
-        //激活用户信息
-        User user = userMapper.selectOne(
-                new MPJLambdaWrapper<User>()
-                        .disableLogicDel()
-                        .select(User::getId)
-                        .select(User.class, x -> VoToColumnUtil.fieldsToColumns(User.class).contains(x.getProperty()))
-                        .eq(User::getId, userId)
-        );
-        user.setDeleteMark(DeleteMark.NODELETE.getCode());
-        user.setEnabledMark(EnabledMark.ENABLED.getCode());
-        user.setModifyUserId(modifyUserId);
-        user.setModifyDate(LocalDateTime.now());
-        userMapper.updateById(user);
+        userMapper.activateUser(userId, modifyUserId);
 
         //将学籍信息改为在读
         BaseStudentSchoolRoll schoolRoll = this.baseMapper.selectOne(