1、swagger接口文档

admin-core/src/main/resources/sql/core/coreUser.md

@@ -48,7 +48,8 @@ getStudentByNo
 	school_class.class_name AS className,
 	universities_colleges.universities_colleges_name AS schoolName,
 	university_faculty.university_faculty_id AS collegeId,
-	university_faculty.university_faculty_name AS collegeName 
+	university_faculty.university_faculty_name AS collegeName,
+    student.student_id AS studentId
     FROM
     core_user
     JOIN student ON core_user.CODE = student.student_sn
@@ -72,7 +73,8 @@ getTeacherByNo
 	university_system.university_system_name AS majorName,
 	universities_colleges.universities_colleges_name AS schoolName,
 	university_faculty.university_faculty_id AS collegeId,
-	university_faculty.university_faculty_name AS collegeName 
+	university_faculty.university_faculty_name AS collegeName,
+    teacher.teacher_id AS teacherId
     FROM
     core_user
     JOIN teacher ON core_user.CODE = teacher.teacher_job_number

web/src/main/java/com/ibeetl/jlw/service/TeacherService.java

@@ -871,4 +871,5 @@ public class TeacherService extends CoreBaseService<Teacher> {
         }
         return dataList;
     }
+
 }

web/src/main/java/com/ibeetl/jlw/web/AccountController.java

@@ -840,6 +840,7 @@ public class AccountController {
         List<CoreUser> coreUsers = userService.getCoreUserList(coreUser);
         int i = 0;
         for (CoreUser user : coreUsers) {
+            System.out.println("已完成：" + i++);
             if (user.getOldId() != null) {
                 continue;
             }
@@ -854,7 +855,7 @@ public class AccountController {
             }
             closeConn(conn);
             ps.close();
-            System.out.println("已完成：" + i++);
+//            System.out.println("已完成：" + i++);
         }
         return JsonResult.success();
     }
@@ -905,4 +906,5 @@ public class AccountController {
         return null;
     }
 
+
 }

web/src/main/resources/sql/jlw/teacher.md

@@ -567,4 +567,4 @@ universities_colleges.universities_colleges_id where old_school_id =#schoolId#
 
 getByTeacherJobNameAndOrgId
 ===
-select * from teacher where teacher_job_number = #teacherJobName# and org_id = #orgId#
+select * from teacher where teacher_job_number = #teacherJobName# and org_id = #orgId#