插班规则调整

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

@@ -71,6 +71,7 @@ public class StudentTransferNode extends NodeComponent {
                     }}
             );
             LocalDate birthDate = LocalDateUtil.getBirthDate(newStudent.getCredentialNumber());
+            BaseClass baseClass = baseClassMapper.selectById(studentTransfer.getClassId());
             if(user == null){
                 User xjrUser = new User() {{
                     setCreateDate(LocalDateTime.now());
@@ -80,14 +81,13 @@ public class StudentTransferNode extends NodeComponent {
                     setCredentialNumber(newStudent.getCredentialNumber());
                     setCredentialType("ZZLS10007");
                     setMobile(newStudent.getMobile());
-                    setEnabledMark(EnabledMark.DISABLED.getCode());
+                    setEnabledMark(EnabledMark.ENABLED.getCode());
                     setGender(newStudent.getGender());
                     setIsChangePassword(1);
                     setBirthDate(birthDate.atStartOfDay());
                 }};
                 userService.save(xjrUser);
 
-                BaseClass baseClass = baseClassMapper.selectById(studentTransfer.getClassId());
                 BaseClassMajorSet majorSet = baseClassMajorSetMapper.selectOne(
                         new QueryWrapper<BaseClassMajorSet>().lambda()
                                 .eq(BaseClassMajorSet::getClassId, studentTransfer.getClassId())
@@ -102,12 +102,19 @@ public class StudentTransferNode extends NodeComponent {
                 roll.setMajorSetId(majorSet.getMajorSetId());
                 roll.setCreateUserId(studentTransfer.getCreateUserId());
                 roll.setArchivesStatus(ArchivesStatusEnum.FB2901.getCode());
-                roll.setUserId(studentTransfer.getStudentUserId());
+                roll.setUserId(xjrUser.getId());
+                roll.setDeleteMark(DeleteMark.NODELETE.getCode());
+                roll.setEnabledMark(EnabledMark.ENABLED.getCode());
                 //新增学籍信息
                 studentSchoolRollService.save(roll);
             }else{
                 studentSchoolRollService.updateStudentClass(studentTransfer.getClassId(), user.getId());
             }
+
+            newStudent.setRemarks("通过插班进入" + baseClass.getName());
+            newStudent.setStatus(1);
+            newStudent.setOperateMode(2);
+            newStudentService.updateById(newStudent);
         }
     }
 }