From 3d22b21d29a3936baa32193e5381699c77c4c8db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B2=85?= <907037276@qq.com> Date: Tue, 7 Nov 2023 17:14:07 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81swagger=E6=8E=A5=E5=8F=A3=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ibeetl/admin/core/service/CoreUserService.java | 1 + .../com/ibeetl/jlw/service/UniversitiesCollegesService.java | 2 +- web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java | 2 +- web/src/main/resources/sql/jlw/schoolClass.md | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java index 4a922a8c..6c988bf5 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java @@ -106,6 +106,7 @@ public class CoreUserService extends CoreBaseService<CoreUser> { user.setJobType0(jobType0.name()); user.setJobType1(jobType1.name()); user.setOrgId(orgId); + user.setOldId(50000+user.getId()); coreUserDao.insert(user); return user.getId(); } diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java index b77e7bb1..81a0b5bb 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java @@ -100,7 +100,7 @@ public class UniversitiesCollegesService extends CoreBaseService<UniversitiesCol } public boolean add(UniversitiesColleges universitiesColleges){ - + universitiesColleges.setOldSchoolId(universitiesColleges.getUniversitiesCollegesId()+500); universitiesCollegesDao.insert(universitiesColleges); CoreOrg coreOrg = new CoreOrg(); diff --git a/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java b/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java index f054bb67..2a13a0a9 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java @@ -222,7 +222,7 @@ public class SchoolClassController extends BaseController { } } - + schoolClass.setOldClassId(1500+schoolClass.getClassId()); schoolClassService.save(schoolClass); corePlatformService.clearDictCache(); return JsonResult.success(); diff --git a/web/src/main/resources/sql/jlw/schoolClass.md b/web/src/main/resources/sql/jlw/schoolClass.md index 9f28fee3..3056324f 100644 --- a/web/src/main/resources/sql/jlw/schoolClass.md +++ b/web/src/main/resources/sql/jlw/schoolClass.md @@ -196,4 +196,4 @@ select class_id as id,class_name as name from school_class where university_syst getClassesBySchoolId === -select class_id as id,class_name as name from school_class join universities_colleges on school_class.universities_colleges_id=universities_colleges.universities_colleges_id where universities_colleges.old_school_id = #schoolId# \ No newline at end of file +select old_class_id as id,class_name as name from school_class join universities_colleges on school_class.universities_colleges_id=universities_colleges.universities_colleges_id where universities_colleges.old_school_id = #schoolId# \ No newline at end of file