1、分班调整

2、学生异动记录调整

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

@@ -337,7 +337,8 @@ public class BandingTaskClassServiceImpl extends MPJBaseServiceImpl<BandingTaskC
                         .eq(BandingTaskClass::getDeleteMark, DeleteMark.NODELETE.getCode())
                         .eq(BandingTaskClass::getName, baseClass.getName())
                         .eq(BandingTask::getGradeId, baseClass.getGradeId())
-                        .eq(BandingTask::getStatus, 1)
+                        .eq(BandingTask::getEnrollType, baseClass.getEnrollType())
+                        .eq(BandingTask::getStatus, 0)
         );
         if(one == null){
             BandingTask task = bandingTasks.get(0);

src/main/java/com/xjrsoft/module/liteflow/node/StudentDropOutNode.java

@@ -99,10 +99,10 @@ public class StudentDropOutNode extends NodeComponent {
 
                         //记录异动
                         changeRecordService.insertData(
-                                schoolRoll.getArchivesStatus(),
                                 ArchivesStatusEnum.fromCode(schoolRoll.getArchivesStatus()),
-                                ArchivesStatusEnum.FB2904.getCode(),
+                                schoolRoll.getArchivesStatus(),
                                 ArchivesStatusEnum.FB2904.getValue(),
+                                ArchivesStatusEnum.FB2904.getCode(),
                                 studentDropOut.getStudentUserId(),
                                 studentDropOut.getCreateUserId(),
                                 StudentChangeTypeEnum.ArchivesStatus.getCode(),

src/main/java/com/xjrsoft/module/liteflow/node/StudentResumeSchoolingNode.java

@@ -101,10 +101,10 @@ public class StudentResumeSchoolingNode extends NodeComponent {
 
                         //记录异动
                         changeRecordService.insertData(
-                                schoolRoll.getArchivesStatus(),
                                 ArchivesStatusEnum.fromCode(schoolRoll.getArchivesStatus()),
-                                ArchivesStatusEnum.FB2904.getCode(),
+                                schoolRoll.getArchivesStatus(),
                                 ArchivesStatusEnum.FB2904.getValue(),
+                                ArchivesStatusEnum.FB2904.getCode(),
                                 studentUserId,
                                 Long.parseLong(objectMap.get("create_user_id").toString()),
                                 StudentChangeTypeEnum.ArchivesStatus.getCode(),

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

@@ -87,10 +87,10 @@ public class SchoolRollStudentServiceImpl extends MPJBaseServiceImpl<SchoolRollS
 
             //记录异动
             changeRecordService.insertData(
-                    studentSchoolRoll.getArchivesStatus(),
                     ArchivesStatusEnum.fromCode(studentSchoolRoll.getArchivesStatus()),
-                    ArchivesStatusEnum.FB2902.getCode(),
+                    studentSchoolRoll.getArchivesStatus(),
                     ArchivesStatusEnum.FB2902.getValue(),
+                    ArchivesStatusEnum.FB2902.getCode(),
                     studentSchoolRoll.getUserId(),
                     StpUtil.getLoginIdAsLong(),
                     StudentChangeTypeEnum.ArchivesStatus.getCode(),