报到调整

src/main/java/com/xjrsoft/module/banding/service/impl/BandingTaskServiceImpl.java

@@ -749,10 +749,7 @@ public class BandingTaskServiceImpl extends MPJBaseServiceImpl<BandingTaskMapper
         }
         BandingTask bandingTask = this.getById(dto.getId());
 
-        List<BaseNewStudent> list = newStudentService.list(
-                new QueryWrapper<BaseNewStudent>().lambda()
-                        .in(BaseNewStudent::getId, studentIds)
-        );
+        List<BaseNewStudent> list = newStudentService.listByIds(studentIds);
         List<BaseNewStudent> updateList = new ArrayList<>();
         for (BaseNewStudent student : list) {
             student.setStatus(1);

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

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.enums.*;
+import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.mapper.BaseClassMapper;
 import com.xjrsoft.module.organization.entity.User;
@@ -277,8 +279,11 @@ public class BaseStudentSchoolRollServiceImpl extends MPJBaseServiceImpl<BaseStu
         userMapper.updateById(user);
 
         //将学籍信息改为在读
-        BaseStudentSchoolRoll schoolRoll = this.getOne(
-                new QueryWrapper<BaseStudentSchoolRoll>().lambda()
+        BaseStudentSchoolRoll schoolRoll = this.baseMapper.selectOne(
+                new MPJLambdaWrapper<BaseStudentSchoolRoll>()
+                        .disableLogicDel()
+                        .select(BaseStudentSchoolRoll::getId)
+                        .select(BaseStudentSchoolRoll.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentSchoolRoll.class).contains(x.getProperty()))
                         .eq(BaseStudentSchoolRoll::getUserId, userId)
         );
         schoolRoll.setDeleteMark(DeleteMark.NODELETE.getCode());

src/test/java/com/xjrsoft/module/job/JianyuekbBaseDataTaskTest.java

@@ -388,7 +388,7 @@ class JianyuekbBaseDataTaskTest {
             if(baseClass.getClassroomId() != null){
                 paramJson.addProperty("classRoomSerialNo", classroomMap.get(baseClass.getClassroomId().toString()));
             }
-            paramJson.addProperty("serialNo", classMap3.get(baseClass.getId().toString()));
+            paramJson.addProperty("serialNo", jianyueId);
             paramJson.addProperty("teacherSerialNo", teacherMap.get(baseClass.getTeacherId().toString()));
 
             timestamp = System.currentTimeMillis();