试读报到报错调整

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

@@ -36,4 +36,7 @@ public interface UserMapper extends MPJBaseMapper<User> {
 
     @Update("update xjr_user set delete_mark = 0, enabled_mark = 1, modify_user_id = #{modifyUserId}, modify_date = now() where id = #{userId}")
     Boolean activateUser(@Param("userId") Long userId, @Param("modifyUserId") Long modifyUserId);
+
+    @Update("update xjr_user set delete_mark = 1, enabled_mark = 0, modify_user_id = #{modifyUserId}, modify_date = now() where id = #{userId}")
+    Boolean disableUser(@Param("userId") Long userId, @Param("modifyUserId") Long modifyUserId);
 }

src/main/java/com/xjrsoft/module/student/mapper/BaseStudentSchoolRollMapper.java

@@ -71,5 +71,8 @@ public interface BaseStudentSchoolRollMapper extends MPJBaseMapper<BaseStudentSc
     @Update("UPDATE base_student_school_roll SET archives_status = 'FB2901', delete_mark = 0, enabled_mark = 1, modify_user_id = #{modifyUserId}, modify_date = now() where id = #{id}")
     Boolean activateStudentSchoolRoll(@Param("id") Long id, @Param("modifyUserId") Long modifyUserId);
 
+    @Update("UPDATE base_student_school_roll SET delete_mark = 1, enabled_mark = 0, modify_user_id = #{modifyUserId}, modify_date = now() where id = #{id}")
+    Boolean disableStudentSchoolRoll(@Param("id") Long id, @Param("modifyUserId") Long modifyUserId);
+
 }
 

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

@@ -343,29 +343,10 @@ public class BaseStudentSchoolRollServiceImpl extends MPJBaseServiceImpl<BaseStu
     @Transactional(rollbackFor = Exception.class)
     public Boolean disableStudent(Long userId, Long modifyUserId) {
         //激活用户信息
-        User user = userMapper.selectById(userId);
-        user.setDeleteMark(DeleteMark.DELETED.getCode());
-        user.setEnabledMark(EnabledMark.DISABLED.getCode());
-        user.setModifyUserId(modifyUserId);
-        user.setModifyDate(LocalDateTime.now());
-        userMapper.updateById(user);
+        userMapper.disableUser(userId, modifyUserId);
 
         //将学籍信息改为在读
-        BaseStudentSchoolRoll schoolRoll = this.getOne(
-                new MPJLambdaWrapper<BaseStudentSchoolRoll>()
-                        .disableLogicDel()
-                        .select(BaseStudentSchoolRoll::getId)
-                        .select(BaseStudentSchoolRoll.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentSchoolRoll.class).contains(x.getProperty()))
-                        .eq(BaseStudentSchoolRoll::getUserId, userId)
-        );
-        UpdateWrapper<BaseStudentSchoolRoll> updateRoll = new UpdateWrapper<>();
-        updateRoll.eq("id", schoolRoll.getId());
-        updateRoll.setSql("delete_mark = 1");
-        updateRoll.setSql("enabled_mark = 0");
-//        updateRoll.setSql("class_id = null");
-        updateRoll.setSql("modify_user_id = " + modifyUserId);
-        updateRoll.setSql("modify_date = now()");
-        this.update(schoolRoll, updateRoll);
+        this.baseMapper.disableStudentSchoolRoll(userId, modifyUserId);
 
         //将学生基本信息中状态改为正常
         BaseStudent baseStudent = baseStudentMapper.selectOne(