分班调整

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

@@ -96,22 +96,23 @@ public class StudentDropOutNode extends NodeComponent {
                                         .eq(BaseStudentSchoolRoll::getUserId, studentDropOut.getStudentUserId())
                                         .eq(BaseStudentSchoolRoll::getDeleteMark, DeleteMark.NODELETE.getCode())
                         );
+                        if(schoolRoll != null){
+                            //记录异动
+                            changeRecordService.insertData(
+                                    ArchivesStatusEnum.fromCode(schoolRoll.getArchivesStatus()),
+                                    schoolRoll.getArchivesStatus(),
+                                    ArchivesStatusEnum.FB2904.getValue(),
+                                    ArchivesStatusEnum.FB2904.getCode(),
+                                    studentDropOut.getStudentUserId(),
+                                    studentDropOut.getCreateUserId(),
+                                    StudentChangeTypeEnum.ArchivesStatus.getCode(),
+                                    2
+                            );
 
-                        //记录异动
-                        changeRecordService.insertData(
-                                ArchivesStatusEnum.fromCode(schoolRoll.getArchivesStatus()),
-                                schoolRoll.getArchivesStatus(),
-                                ArchivesStatusEnum.FB2904.getValue(),
-                                ArchivesStatusEnum.FB2904.getCode(),
-                                studentDropOut.getStudentUserId(),
-                                studentDropOut.getCreateUserId(),
-                                StudentChangeTypeEnum.ArchivesStatus.getCode(),
-                                2
-                        );
-
-                        schoolRoll.setArchivesStatus(ArchivesStatusEnum.FB2904.getCode());
-                        studentSchoolRollService.updateById(schoolRoll);
-//                        studentSchoolRollService.disableStudent(schoolRoll.getUserId(), studentDropOut.getCreateUserId());
+                            schoolRoll.setArchivesStatus(ArchivesStatusEnum.FB2904.getCode());
+                            studentSchoolRollService.updateById(schoolRoll);
+                            studentSchoolRollService.disableStudent(schoolRoll.getUserId(), studentDropOut.getCreateUserId());
+                        }
                     });
                 }
             });

src/main/resources/mapper/student/StudentReportRecordMapper.xml

@@ -274,6 +274,9 @@
         <if test="dto.archivesStatus != null and dto.archivesStatus != ''">
             and t3.archives_status = #{dto.archivesStatus}
         </if>
+        <if test="dto.gender != null and dto.gender != ''">
+            and t3.gender = #{dto.gender}
+        </if>
         <if test="dto.stduyStatus != null and dto.stduyStatus != ''">
             and t3.stduy_status = #{dto.stduyStatus}
         </if>
@@ -340,6 +343,9 @@
         <if test="dto.className != null and dto.className != ''">
             and t5.name like concat('%', #{dto.className}, '%')
         </if>
+        <if test="dto.gender != null and dto.gender != ''">
+            and t3.gender = #{dto.gender}
+        </if>
         <if test="dto.credentialNumber != null and dto.credentialNumber != ''">
             and t3.credential_number like concat('%', #{dto.credentialNumber}, '%')
         </if>