复读流程调整

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

@@ -53,7 +53,7 @@ public interface BaseStudentSchoolRollMapper extends MPJBaseMapper<BaseStudentSc
     @Update("UPDATE base_student_school_roll SET class_id = #{classId} where user_id = #{userId}")
     Boolean updateStudentClass(Long classId, Long userId);
 
-    @Update("UPDATE base_student_school_roll SET class_id = #{classId},major_set_id=#{majorSetId},gradeId=#{gradeId},stduy_status=#{stduyStatus} where user_id = #{userId}")
+    @Update("UPDATE base_student_school_roll SET class_id = #{classId},major_set_id=#{majorSetId},grade_id=#{gradeId},stduy_status=#{stduyStatus} where user_id = #{userId}")
     Boolean updateStudentClassGradeMajorStduyStatus(Long classId, Long gradeId, Long majorSetId, String stduyStatus, Long userId);
 
 

src/main/resources/application-dev.yml

@@ -116,12 +116,6 @@ xjrsoft:
       - /system/findUserByCode
       - /system/imgcaptcha-answer
       - /student/basestudentinfo/studentinfoByKeyWord
-      - /workflow/execute/new-launch
-      - /system/dictionary-detail
-      - /workflow/execute/start-process-info
-      - /baseGrade/list
-      - /baseSystemConfig/list
-      - /baseMajorSet/list
     approval-time: 300 # 审核超时时间 目前设为5分钟
   email:
     host:  #邮件服务器的SMTP地址，可选，默认为smtp.<发件人邮箱后缀>

src/test/java/com/xjrsoft/module/liteflow/node/WfStudentRepeatStudyNodeTest.java

@@ -54,7 +54,7 @@ class WfStudentRepeatStudyNodeTest {
 
     @Test
     void test(){
-        Long formId = 1906987877859340288L;
+        Long formId = 1907360900683227136L;
 
         String tableName = "wf_student_repeat_study";
         Entity where = Entity.create(tableName);
@@ -116,7 +116,7 @@ class WfStudentRepeatStudyNodeTest {
 
             studentService.add(baseStudentUser);
         }else{
-            schoolRollService.activateStudent(user.getId());
+            schoolRollService.activateStudent(user.getId(), null);
             schoolRollService.updateStudentClassGradeMajorStduyStatus(
                     Long.parseLong(objectMap.get("class_id").toString()),
                     Long.parseLong(objectMap.get("grade_id").toString()),