From 03f2e43e4d50a87f7940985b8268827793fe8a6d Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Sat, 17 Sep 2022 17:20:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E8=AF=BE=E5=85=B3=E8=81=94=E5=AD=A6?= =?UTF-8?q?=E7=94=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/core/service/CoreBaseService.java | 2 +- data_base_design/天泽数据大平台.pdb | 475 +++++++++--------- data_base_design/天泽数据大平台.pdm | 457 +++++++++-------- .../TeacherOpenCourseScheduleSession.http | 6 +- httpTest/http-client.private.env.json | 2 +- .../dao/TeacherOpenCourseMergeStudentDao.java | 25 + .../entity/TeacherOpenCourseMergeStudent.java | 128 +++++ .../TeacherOpenCourseScheduleSession.java | 38 +- ...acherOpenCourseScheduleSessionOptions.java | 31 +- .../TeacherOpenCourseScheduleSessionTag.java | 23 +- .../TeacherOpenCourseMergeStudentService.java | 147 ++++++ ...acherOpenCourseScheduleSessionService.java | 3 +- ...acherOpenCourseMergeStudentController.java | 193 +++++++ .../TeacherOpenCourseMergeStudentQuery.java | 129 +++++ .../sql/jlw/teacherOpenCourseMergeStudent.md | 228 +++++++++ .../jlw/teacherOpenCourseScheduleSession.md | 13 +- .../jlw/teacherOpenCourseMergeStudent/add.js | 38 ++ .../jlw/teacherOpenCourseMergeStudent/del.js | 23 + .../jlw/teacherOpenCourseMergeStudent/edit.js | 28 ++ .../teacherOpenCourseMergeStudent/index.js | 164 ++++++ .../teacherOpenCourseMergeStudentApi.js | 18 + .../teacherOpenCourseMergeStudent/add.html | 58 +++ .../teacherOpenCourseMergeStudent/edit.html | 58 +++ .../teacherOpenCourseMergeStudent/index.html | 29 ++ 24 files changed, 1842 insertions(+), 474 deletions(-) create mode 100644 web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeStudentDao.java create mode 100644 web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeStudent.java create mode 100644 web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java create mode 100644 web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentController.java create mode 100644 web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeStudentQuery.java create mode 100644 web/src/main/resources/sql/jlw/teacherOpenCourseMergeStudent.md create mode 100644 web/src/main/resources/static/js/jlw/teacherOpenCourseMergeStudent/add.js create mode 100644 web/src/main/resources/static/js/jlw/teacherOpenCourseMergeStudent/del.js create mode 100644 web/src/main/resources/static/js/jlw/teacherOpenCourseMergeStudent/edit.js create mode 100644 web/src/main/resources/static/js/jlw/teacherOpenCourseMergeStudent/index.js create mode 100644 web/src/main/resources/static/js/jlw/teacherOpenCourseMergeStudent/teacherOpenCourseMergeStudentApi.js create mode 100644 web/src/main/resources/templates/jlw/teacherOpenCourseMergeStudent/add.html create mode 100644 web/src/main/resources/templates/jlw/teacherOpenCourseMergeStudent/edit.html create mode 100644 web/src/main/resources/templates/jlw/teacherOpenCourseMergeStudent/index.html diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreBaseService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreBaseService.java index 2ce4c266..4ef82530 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreBaseService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreBaseService.java @@ -120,7 +120,7 @@ public class CoreBaseService { * @return */ public boolean insert(T model) { - return sqlManager.insert(model.getClass())> 0; + return sqlManager.insert(model)> 0; } /** diff --git a/data_base_design/天泽数据大平台.pdb b/data_base_design/天泽数据大平台.pdb index 4d8eb096..c4dd19ab 100644 --- a/data_base_design/天泽数据大平台.pdb +++ b/data_base_design/天泽数据大平台.pdb @@ -1,5 +1,5 @@ - + @@ -4512,8 +4512,8 @@ Shadow=0 1661961019 1662810685 -((338453,26990), (339053,43395)) -((338719,43395),(338719,36777),(338753,36777),(338753,26990)) +((338453,26602), (339053,43395)) +((338719,43395),(338719,36777),(338753,36777),(338753,26602)) 1 8 16744576 @@ -4718,9 +4718,9 @@ Shadow=0 1662810688 -1662995498 -((296402,26648), (338650,29922)) -((338650,26648),(319044,26648),(319044,29622),(296402,29622)) +1663400051 +((296402,26244), (338650,29922)) +((338650,26244),(319044,26244),(319044,29622),(296402,29622)) 1 8 16744576 @@ -6516,9 +6516,9 @@ LABL 0 新宋体,8,N 1662809607 -1662995498 +1663400051 -1 -((329150,18150), (348150,35146)) +((329150,17342), (348150,35146)) 0 12615680 16570034 @@ -15209,7 +15209,7 @@ COLLATE = utf8_general_ci teacher_open_course_merge_student 1661850632 lx -1662648329 +1663402294 lx 课程开课-关联-学生 auto_increment = 1 @@ -15231,6 +15231,17 @@ COLLATE = utf8_general_ci 1 +4DEDD3F6-3919-4602-B549-7CC54021AC30 +teacher_open_course_id +teacher_open_course_id +1663402166 +lx +1663402289 +lx +课程开课ID +bigint + + 2BB34D52-A2A7-44F1-8A98-FC8B5C0A955A student_id student_id @@ -15241,7 +15252,7 @@ COLLATE = utf8_general_ci 学生ID bigint - + EC319A55-6852-40CB-88C0-DE1F41F9D7DF org_id org_id @@ -15252,7 +15263,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + A54FFF36-56CC-427C-BFA0-6376D3B6EEE3 user_id user_id @@ -15263,20 +15274,20 @@ COLLATE = utf8_general_ci 用户ID bigint - + EA0BF245-9346-4119-915C-F4ED28BC545B -create_time -create_time +teacher_open_course_school_class_merge_student_add_time +teacher_open_course_school_class_merge_student_add_time 1661957411 lx -1661957458 +1663402307 lx 创建时间 datetime - + 33D305FE-8588-4D40-B7D4-E228D91FD068 Key_1 Key_1 @@ -15290,7 +15301,7 @@ COLLATE = utf8_general_ci - + @@ -15308,7 +15319,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + AF3D06D0-8046-407D-8D01-0EB4F7C4430B teacher_open_course_schedule_session_tag_id teacher_open_course_schedule_session_tag_id @@ -15320,7 +15331,7 @@ COLLATE = utf8_general_ci bigint 1 - + 63C7BC3C-E3F7-4260-836A-0B2D076E27C8 teacher_open_course_schedule_session_tag_name teacher_open_course_schedule_session_tag_name @@ -15332,7 +15343,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + FCC2ACE6-2A14-4428-A607-72EE9B21B5E6 teacher_open_course_schedule_session_tag_duration teacher_open_course_schedule_session_tag_duration @@ -15343,7 +15354,7 @@ COLLATE = utf8_general_ci 课程时长（分钟） int - + 8851F4F5-A578-41C8-9DAF-B7A2F7796E7D teacher_open_course_schedule_session_tag_add_time teacher_open_course_schedule_session_tag_add_time @@ -15354,7 +15365,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + BE3DB6FF-142D-4A29-A9A3-B10FF0C5759B teacher_open_course_schedule_session_tag_start_time teacher_open_course_schedule_session_tag_start_time @@ -15366,7 +15377,7 @@ COLLATE = utf8_general_ci varchar(10) 10 - + 48411774-FB89-4143-9D62-59DEF8EE1E32 teacher_open_course_schedule_session_tag_end_time teacher_open_course_schedule_session_tag_end_time @@ -15378,7 +15389,7 @@ COLLATE = utf8_general_ci varchar(10) 10 - + C346B065-C2ED-4D45-A0D7-F357EFD8839A org_id org_id @@ -15389,7 +15400,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + F58C2E06-124C-4A14-B564-A92BCE8B2AB6 user_id user_id @@ -15402,7 +15413,7 @@ COLLATE = utf8_general_ci - + 6A318D25-C9C4-44C9-9C79-18E725965208 Key_1 Key_1 @@ -15411,12 +15422,12 @@ COLLATE = utf8_general_ci 1662810962 lx - + - + @@ -15434,7 +15445,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 5F40DE55-D689-437C-AA5A-D68EE5177EBA teacher_open_course_student_signin_setting_id teacher_open_course_student_signin_setting_id @@ -15446,7 +15457,7 @@ COLLATE = utf8_general_ci bigint 1 - + 45A0C89F-9D2D-42C1-8666-997CE6D29EB1 open_course_id open_course_id @@ -15457,7 +15468,7 @@ COLLATE = utf8_general_ci 开课ID bigint - + 3A7ED4E2-6702-471D-BB8C-97028D55FCD0 school_class_id school_class_id @@ -15468,7 +15479,7 @@ COLLATE = utf8_general_ci 班级ID bigint - + D5476993-DD9A-4B96-9C4B-183D5FB88447 type type @@ -15480,7 +15491,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + 3A0547DC-282A-4E24-AB04-6F8D270E3422 value value @@ -15492,7 +15503,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + F844F21D-B808-46C3-8B99-FF63B1DD6F60 org_id org_id @@ -15503,7 +15514,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 5E7E66D8-A3B5-4355-9A11-5942AEE4D028 user_id user_id @@ -15514,7 +15525,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + C953231B-E473-4F11-9DDB-57C25077D504 create_time create_time @@ -15527,7 +15538,7 @@ COLLATE = utf8_general_ci - + EB349942-35A7-44DC-A505-B80E66CA1F63 Key_1 Key_1 @@ -15536,12 +15547,12 @@ COLLATE = utf8_general_ci 1661960474 lx - + - + @@ -15559,7 +15570,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + C9A3B75C-FBF8-4D85-BE76-72E3FC2C2B1F teacher_open_course_chat_log_id teacher_open_course_chat_log_id @@ -15571,7 +15582,7 @@ COLLATE = utf8_general_ci bigint 1 - + 4A6E2BA8-7896-4993-8CC0-CFD616E08BBB teacher_open_course_chat_log_parent_id teacher_open_course_chat_log_parent_id @@ -15582,7 +15593,7 @@ COLLATE = utf8_general_ci 上级ID bigint - + 9FB26692-4080-41CD-AE24-7FD5A53526C6 teacher_open_course_id teacher_open_course_id @@ -15593,7 +15604,7 @@ COLLATE = utf8_general_ci 课程开课ID bigint - + D7BD01D2-4D7E-4228-B94F-711BB78D809D school_class_id school_class_id @@ -15604,7 +15615,7 @@ COLLATE = utf8_general_ci 班级ID bigint - + 18589108-4394-4335-8B90-7E3795F82B8A teacher_id teacher_id @@ -15615,7 +15626,7 @@ COLLATE = utf8_general_ci 教师ID bigint - + 2EDC1791-6AB4-47F1-8A97-4E8B2EE17830 student_id student_id @@ -15626,7 +15637,7 @@ COLLATE = utf8_general_ci 学生ID bigint - + 320B068F-2EFF-4C93-9044-C188C5E1BD85 chat_content chat_content @@ -15638,7 +15649,7 @@ COLLATE = utf8_general_ci varchar(2000) 2000 - + D2108D51-47D4-4398-942C-4DA987E91A52 keywords keywords @@ -15650,7 +15661,7 @@ COLLATE = utf8_general_ci varchar(500) 500 - + 087CD32F-4937-42CD-BD4C-474406B07466 score student_score @@ -15661,7 +15672,7 @@ COLLATE = utf8_general_ci 学生得分 float - + CAF2D8D3-F5A5-4FDF-B876-2EDBFE0FAC7D chat_files chat_files @@ -15673,7 +15684,7 @@ COLLATE = utf8_general_ci varchar(4000) 4000 - + 73146904-4C03-4C3F-A10C-34E2F07E3F5A teacher_open_course_chat_log_status teacher_open_course_chat_log_status @@ -15684,7 +15695,7 @@ COLLATE = utf8_general_ci 状态 （1正常 2删除） int - + 915B6210-D43D-4773-A051-C208B1123038 org_id org_id @@ -15695,7 +15706,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 052B1726-9F05-49F3-9AE1-E73D36F22ED1 user_id user_id @@ -15706,7 +15717,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + F4E24A74-7879-4FA7-A31A-1DF43C87CCA9 create_time create_time @@ -15719,7 +15730,7 @@ COLLATE = utf8_general_ci - + A2E2569E-143D-40A6-AFFD-4B17369021C3 Key_1 Key_1 @@ -15728,12 +15739,12 @@ COLLATE = utf8_general_ci 1662020297 87966 - + - + @@ -15751,7 +15762,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 009A23DE-07AF-4EA6-BBDD-26850AABC8AC teacher_open_course_homework_question_log_id teacher_open_course_homework_question_log_id @@ -15763,7 +15774,7 @@ COLLATE = utf8_general_ci bigint 1 - + E732E580-555A-47D5-864B-E868302C4391 teacher_open_course_question_homework_id teacher_open_course_question_homework_id @@ -15774,7 +15785,7 @@ COLLATE = utf8_general_ci 题库作业ID bigint - + 7492312E-B2F8-4A26-A165-E1D31D254D90 student_upload_file student_upload_file @@ -15786,7 +15797,7 @@ COLLATE = utf8_general_ci varchar(200) 200 - + 908C4B9C-AFDD-46B4-9E2F-BC84BEB3395B student_score student_score @@ -15797,7 +15808,7 @@ COLLATE = utf8_general_ci 学生得分 float - + 10DDF717-440B-465D-A18F-E9935C9BA8E4 reply_content reply_content @@ -15809,7 +15820,7 @@ COLLATE = utf8_general_ci varchar(500) 500 - + C06A272B-5147-40B7-8E49-1E6B509123F6 create_time create_time @@ -15820,7 +15831,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + F8795A3A-9DD9-4F5A-906A-E6964444570C org_id org_id @@ -15831,7 +15842,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 1993A879-EC68-450A-B775-D7C2671BDA96 user_id user_id @@ -15844,7 +15855,7 @@ COLLATE = utf8_general_ci - + FF4A3064-63A4-4FAD-A71D-F66FD27F3A94 Key_1 Key_1 @@ -15853,12 +15864,12 @@ COLLATE = utf8_general_ci 1662044179 lx - + - + @@ -15882,7 +15893,7 @@ COLLATE = utf8_general_ci } - + 03C2172E-8A06-48E0-8C25-4102C8253653 core_setting_id core_setting_id @@ -15894,7 +15905,7 @@ COLLATE = utf8_general_ci bigint 1 - + 5090D458-E136-4D46-9D89-930A55ED9A2C setting_key setting_key @@ -15906,7 +15917,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 0D922C4C-8420-482B-87B6-B0E99FBA62E0 setting_value setting_value @@ -15917,7 +15928,7 @@ COLLATE = utf8_general_ci 配置项 text - + A89D7A99-CD44-4F4E-8337-14A5D4BEE13E core_setting_stauts core_setting_stauts @@ -15928,7 +15939,7 @@ COLLATE = utf8_general_ci 状态 （1正常 2删除） int - + D4790CD3-3634-4FB5-B1F8-DDCA61E7AC11 create_time create_time @@ -15939,7 +15950,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + A9346C05-5EA0-4D30-A522-9DD5B13FCE7E org_id org_id @@ -15950,7 +15961,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + D46E4A36-6D0D-4F64-9C58-CAC3D1285F24 user_id user_id @@ -15963,7 +15974,7 @@ COLLATE = utf8_general_ci - + 8E777505-B813-4D1D-8C5F-B6F9747BA0F4 Key_1 Key_1 @@ -15972,12 +15983,12 @@ COLLATE = utf8_general_ci 1662045362 lx - + - + @@ -15995,7 +16006,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 18F050CC-F084-477F-8759-28E1D015FE0B teacher_open_course_score_dashboard_id teacher_open_course_score_dashboard_id @@ -16007,7 +16018,7 @@ COLLATE = utf8_general_ci bigint 1 - + C33241B0-D288-44ED-8554-C7086F839648 student_id student_id @@ -16018,7 +16029,7 @@ COLLATE = utf8_general_ci 学生ID bigint - + 155275C4-795A-4763-9C39-3FDF35ECECCA signin_score signin_score @@ -16029,7 +16040,7 @@ COLLATE = utf8_general_ci 签到成绩 float - + 26A9701D-C572-427D-8AD8-4D4D9DDC105D course_score course_score @@ -16040,7 +16051,7 @@ COLLATE = utf8_general_ci 章节练习成绩 float - + B1C7AFAC-3115-4EEF-855F-7578BE5C5555 real_operation_score real_operation_score @@ -16051,7 +16062,7 @@ COLLATE = utf8_general_ci 课程实操成绩 float - + AC3C7572-A095-42DE-99A5-3E8D2B9D3602 question_homework_score question_homework_score @@ -16062,7 +16073,7 @@ COLLATE = utf8_general_ci 作业成绩 float - + CB0FDAE5-DDBD-42D1-8E59-3B91E44A45C8 exam_score exam_score @@ -16073,7 +16084,7 @@ COLLATE = utf8_general_ci 考试成绩 float - + A37D010B-5B7E-4815-AC10-65C79F878234 chat_score chat_score @@ -16084,7 +16095,7 @@ COLLATE = utf8_general_ci 互动成绩 float - + D91526BC-31BA-4121-9416-7DB95281202C total_score total_score @@ -16095,7 +16106,7 @@ COLLATE = utf8_general_ci 总成绩 float - + 95464B6A-6611-4674-BBA4-EF869A472F84 manual_score manual_score @@ -16106,7 +16117,7 @@ COLLATE = utf8_general_ci 手动调整的分数 float - + 8E062DAC-DA29-4940-AEC3-1B8EFB468904 last_score last_score @@ -16117,7 +16128,7 @@ COLLATE = utf8_general_ci 最终成绩 float - + 696B62F5-6BCE-4377-8F04-F452C9FE5368 last_status last_status @@ -16129,7 +16140,7 @@ COLLATE = utf8_general_ci varchar(10) 10 - + D2334132-07CC-40C5-8A37-6F95CC12A041 org_id org_id @@ -16140,7 +16151,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 7BBBDC7F-C5E3-424A-AC3C-00E94E564F45 user_id user_id @@ -16151,7 +16162,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + CE5A2441-64A4-4C2A-8646-8D6CFE6C2A73 create_time create_time @@ -16164,7 +16175,7 @@ COLLATE = utf8_general_ci - + 6B3359F7-B844-4B95-9C3B-A4AAFBA27617 Key_1 Key_1 @@ -16173,12 +16184,12 @@ COLLATE = utf8_general_ci 1662045706 lx - + - + @@ -16201,7 +16212,7 @@ COLLATE = utf8_general_ci } - + 318651DC-E71A-449A-96A8-19F27C71F4AC teacher_open_course_notice_id teacher_open_course_notice_id @@ -16213,7 +16224,7 @@ COLLATE = utf8_general_ci bigint 1 - + F972E98C-839A-4F8E-B2B7-A92F064483DB school_class_ids school_class_ids @@ -16225,7 +16236,7 @@ COLLATE = utf8_general_ci varchar(2000) 2000 - + E3F89C48-E4A1-4B9B-AE85-66EE2378EC58 teacher_open_course_ids teacher_open_course_ids @@ -16237,7 +16248,7 @@ COLLATE = utf8_general_ci varchar(2000) 2000 - + 9072D638-91A2-45E3-B01A-56FD07AC2DBC notice_title notice_title @@ -16249,7 +16260,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 2AED03DE-64F7-47AF-810B-CC78F23EEF22 notice_content notice_content @@ -16261,7 +16272,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 08862E80-7DDC-40DF-8E1B-DCFED6B33AC8 create_time create_time @@ -16272,7 +16283,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + A04525A6-FB16-4CCC-9753-4907D73BA676 create_by_teacher_id create_by_teacher_id @@ -16283,7 +16294,7 @@ COLLATE = utf8_general_ci 消息创建--老师ID bigint - + 3B6BA47A-A3E1-41B3-B8E8-B877AF7DFB5B org_id org_id @@ -16294,7 +16305,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + E49B7F20-513A-4E10-BEE8-D5B768200303 user_id user_id @@ -16305,7 +16316,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + C28FF8AA-D0BD-4EFE-8BEE-802D56989498 del_flag del_flag @@ -16318,7 +16329,7 @@ COLLATE = utf8_general_ci - + 3D2650BD-129F-48EC-B75C-872417A4E822 Key_1 Key_1 @@ -16327,12 +16338,12 @@ COLLATE = utf8_general_ci 1662046440 lx - + - + @@ -16355,7 +16366,7 @@ COLLATE = utf8_general_ci } - + 3DB701D7-DA2C-4296-853B-38D2E719CCA6 teacher_open_course_knowledge_point_id teacher_open_course_knowledge_point_id @@ -16367,7 +16378,7 @@ COLLATE = utf8_general_ci bigint 1 - + 171BF047-E676-4C5B-89B3-8B25136416A7 teacher_open_course_id teacher_open_course_id @@ -16378,7 +16389,7 @@ COLLATE = utf8_general_ci 课程开课ID bigint - + 0B7D7F9A-015D-42DD-8116-30CEC65236D8 chapter_id chapter_id @@ -16389,7 +16400,7 @@ COLLATE = utf8_general_ci 章节ID bigint - + E622D525-8AFB-4926-AE32-117E18C429E0 teacher_open_course_knowledge_point_title teacher_open_course_knowledge_point_title @@ -16401,7 +16412,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + B1BD789A-9684-4E7A-AD8A-BE79C7B6C7C8 teacher_open_course_knowledge_point_content teacher_open_course_knowledge_point_content @@ -16413,7 +16424,7 @@ COLLATE = utf8_general_ci varchar(4000) 4000 - + C44A8ACF-B4BC-4140-9003-1ADAC230C1DA teacher_open_course_knowledge_point_status teacher_open_course_knowledge_point_status @@ -16424,7 +16435,7 @@ COLLATE = utf8_general_ci 状态 （1正常 2删除） int - + 35B92FEF-A383-4FD2-AAC3-10355BCA6896 create_time create_time @@ -16435,7 +16446,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 2745088B-3993-46E7-9035-2EF382FEC082 org_id org_id @@ -16446,7 +16457,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 9699889E-0268-4565-971A-41D449A2A5F2 user_id user_id @@ -16459,7 +16470,7 @@ COLLATE = utf8_general_ci - + 75299271-38A3-44A7-824D-00792734CF12 Key_1 Key_1 @@ -16468,12 +16479,12 @@ COLLATE = utf8_general_ci 1662047767 lx - + - + @@ -16491,7 +16502,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 326FA1E3-0BA3-420E-8242-ED8A4A4F0617 student_client_link_id student_client_link_id @@ -16503,7 +16514,7 @@ COLLATE = utf8_general_ci bigint 1 - + E2FC1BD3-0EBA-4330-A432-204E68A01861 student_client_link_order student_client_link_order @@ -16514,7 +16525,7 @@ COLLATE = utf8_general_ci 导航栏排序 int - + A897CD71-A97A-450E-92FA-72474727C640 student_client_link_title student_client_link_title @@ -16526,7 +16537,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + B988F3BD-EEE2-40FB-9E5E-73ABC59935D9 student_client_link_content student_client_link_content @@ -16538,7 +16549,7 @@ COLLATE = utf8_general_ci varchar(2000) 2000 - + C9FBBBB6-7477-4B29-8A15-08222FB01DE8 student_client_link_type student_client_link_type @@ -16550,7 +16561,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + B5987B41-6AE9-469F-A36F-48C3C9674252 student_client_link_img student_client_link_img @@ -16561,7 +16572,7 @@ COLLATE = utf8_general_ci 链接图片（可用于轮播大图，icon小图等功能） text - + DD99CF28-4303-4935-8168-CE022C8C31CD student_client_link_status student_client_link_status @@ -16572,7 +16583,7 @@ COLLATE = utf8_general_ci 状态（ 1 正常 2删除） int - + 963FA155-9A25-41BA-8B52-209536B76758 student_client_link_open_type student_client_link_open_type @@ -16584,7 +16595,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + 05CE988B-2AF5-4A63-9451-25A9EF95C5DB create_time create_time @@ -16595,7 +16606,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 1E5FBB70-DADA-4251-9BDA-85E132223109 user_id user_id @@ -16606,7 +16617,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + F1483087-727F-4BFE-97BA-9692FD8D1AB2 org_id org_id @@ -16619,7 +16630,7 @@ COLLATE = utf8_general_ci - + B095A5B3-D6C4-40C4-B986-497B3849ED54 Key_1 Key_1 @@ -16628,12 +16639,12 @@ COLLATE = utf8_general_ci 1662554252 lx - + - + @@ -16651,7 +16662,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + CCCB7690-1E0F-4355-AC7A-ABB58CC8632B university_system_id university_system_id @@ -16663,7 +16674,7 @@ COLLATE = utf8_general_ci bigint 1 - + B0D08F82-9D1C-42E8-B332-4422FC72BF67 university_system_name university_system_name @@ -16675,7 +16686,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 8A8F809D-A11E-4F1E-AB4B-C8B02D1DA3AB university_system_contact university_system_contact @@ -16687,7 +16698,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + 1F10D7BD-3F66-4E4E-AA41-06A06D9D00D1 university_system_contact_tel university_system_contact_tel @@ -16699,7 +16710,7 @@ COLLATE = utf8_general_ci varchar(20) 20 - + 139361B7-C257-4094-9BCE-1F8A44668480 university_system_add_time university_system_add_time @@ -16710,7 +16721,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 7BA84D60-66CD-47EA-8DCB-025AEFC85CFF university_system_status university_system_status @@ -16721,7 +16732,7 @@ COLLATE = utf8_general_ci 状态 （1正常 2删除） int - + EE6D1A35-06C2-4560-B40B-D1E87CA5F291 university_faculty_id university_faculty_id @@ -16732,7 +16743,7 @@ COLLATE = utf8_general_ci 院系ID（学院ID） int - + 87AEE496-5BD2-4A50-ACC8-980A708FC4DB user_id user_id @@ -16743,7 +16754,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + 6D140299-48E6-4630-99C8-D96E361AB3B1 org_id org_id @@ -16756,7 +16767,7 @@ COLLATE = utf8_general_ci - + F02FEAFC-6CDC-461B-BCD4-A60CB97164BA Key_1 Key_1 @@ -16765,12 +16776,12 @@ COLLATE = utf8_general_ci 1662648377 lx - + - + @@ -16788,7 +16799,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 884F2204-DCE1-485E-A4B2-D4378BEE2044 university_faculty_id university_faculty_id @@ -16800,7 +16811,7 @@ COLLATE = utf8_general_ci bigint 1 - + 2AB481C3-D261-4ADD-B9F9-146124372F4B university_faculty_name university_faculty_name @@ -16812,7 +16823,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 04BE427C-8D5A-48B8-808F-80D87158F9E4 university_faculty_contact university_faculty_contact @@ -16824,7 +16835,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + A6EF43AB-F19B-4BE5-B34E-D4AE59D57B17 university_faculty_contact_tel university_faculty_contact_tel @@ -16836,7 +16847,7 @@ COLLATE = utf8_general_ci varchar(20) 20 - + C8BE2BF4-F676-43CB-A1CE-369836C8D540 university_faculty_contact_address university_faculty_contact_address @@ -16848,7 +16859,7 @@ COLLATE = utf8_general_ci varchar(200) 200 - + 68386B1B-1359-4E14-80BB-D40EB3E6D05E universities_colleges_id universities_colleges_id @@ -16859,7 +16870,7 @@ COLLATE = utf8_general_ci 院校ID （院系的上一级） bigint - + 34891715-8E26-4F10-A789-93454383373B university_faculty_status university_faculty_status @@ -16870,7 +16881,7 @@ COLLATE = utf8_general_ci 状态（ 1 正常 2删除） int - + 7EA4E9C0-C919-4B3F-8300-66888606CDFE university_faculty_add_time university_faculty_add_time @@ -16881,7 +16892,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 860EA0A3-DB84-4B76-BB61-CD32C4838D5E user_id user_id @@ -16892,7 +16903,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + 6D5D545B-7423-4471-B969-D5AD4F7D6459 org_id org_id @@ -16905,7 +16916,7 @@ COLLATE = utf8_general_ci - + 8827D654-DDB8-4D1E-A500-362CE79333F8 Key_1 Key_1 @@ -16914,12 +16925,12 @@ COLLATE = utf8_general_ci 1662648708 lx - + - + @@ -16937,7 +16948,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 5288224C-53C1-4C24-B9E9-054F89E3408E teacher_open_course_schedule_session_class_id teacher_open_course_schedule_session_class_id @@ -16949,7 +16960,7 @@ COLLATE = utf8_general_ci bigint 1 - + 9F4A9A8A-17A5-4DDE-B4C8-5B1CAB398160 teacher_open_course_schedule_session_class_name teacher_open_course_schedule_session_class_name @@ -16961,7 +16972,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 9BC97CEE-44E7-4253-BD67-61CE17D5A991 teacher_open_course_schedule_session_class_parent_id teacher_open_course_schedule_session_class_parent_id @@ -16973,7 +16984,7 @@ COLLATE = utf8_general_ci bigint 1 - + B86F6DCB-0565-4214-A6DA-1A973CE66EA1 org_id org_id @@ -16984,7 +16995,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 056FDBB3-D0F8-4845-BD40-72B5A4B1932F user_id user_id @@ -16995,7 +17006,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + 095D37B8-4403-4981-AFB2-8D79C7F04A9A teacher_open_course_schedule_session_class_add_time teacher_open_course_schedule_session_class_add_time @@ -17008,7 +17019,7 @@ COLLATE = utf8_general_ci - + 8F5B1BAF-BE16-44DE-8DF5-9A1EAD731C04 Key_1 Key_1 @@ -17017,12 +17028,12 @@ COLLATE = utf8_general_ci 1662808852 lx - + - + @@ -17031,8 +17042,8 @@ COLLATE = utf8_general_ci teacher_open_course_schedule_session 1661850632 lx -1662971416 -87966 +1663400049 +lx 课程开课-排课管理-课表 auto_increment = 1 ENGINE = InnoDB @@ -17040,7 +17051,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 6392E614-144C-4A81-B339-C428F15B45D9 teacher_open_course_schedule_session_id teacher_open_course_schedule_session_id @@ -17052,7 +17063,7 @@ COLLATE = utf8_general_ci bigint 1 - + D6281D02-4BB6-4C60-AC33-6DE084397A78 teacher_open_course_schedule_session_day_time teacher_open_course_schedule_session_day_time @@ -17064,7 +17075,7 @@ COLLATE = utf8_general_ci varchar(20) 20 - + 84F8C272-4766-4209-9667-728323948B7D teacher_open_course_schedule_session_add_time teacher_open_course_schedule_session_add_time @@ -17075,7 +17086,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 379DA977-579C-4E07-B57C-A112F3DDE178 teacher_open_course_schedule_session_status teacher_open_course_schedule_session_status @@ -17086,7 +17097,7 @@ COLLATE = utf8_general_ci 状态（1正常 2删除） int - + D506683D-A194-4D05-ADB9-BB50C1250024 teacher_open_course_id teacher_open_course_id @@ -17097,7 +17108,7 @@ COLLATE = utf8_general_ci 课程开课ID bigint - + 3C52ADED-57C3-4912-BE68-3F75ADDB2382 teacher_id teacher_id @@ -17108,7 +17119,7 @@ COLLATE = utf8_general_ci 教师ID bigint - + 8CD1F62C-46A8-4CF0-B2BD-294B7516B104 school_class_Ids school_class_Ids @@ -17120,7 +17131,7 @@ COLLATE = utf8_general_ci varchar(4000) 4000 - + 7A7E2C88-8FF1-48BA-A8DF-4A9A96368B9B teacher_open_course_schedule_session_start_date teacher_open_course_schedule_session_start_date @@ -17132,7 +17143,7 @@ COLLATE = utf8_general_ci varchar(20) 20 - + 9BEAE88E-4EA1-4171-8315-D61CE82BCADD teacher_open_course_schedule_session_end_date teacher_open_course_schedule_session_end_date @@ -17144,7 +17155,7 @@ COLLATE = utf8_general_ci varchar(20) 20 - + 01EA483A-4478-44D1-8032-98E2EB7DCB79 teacher_open_course_schedule_session_week_num teacher_open_course_schedule_session_week_num @@ -17155,7 +17166,7 @@ COLLATE = utf8_general_ci 周次 int - + A6D7EF46-7437-4280-B26D-396E02AF3FBD org_id org_id @@ -17166,7 +17177,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 4DCDE709-2B62-4BCE-B430-60038263BD7B user_id user_id @@ -17177,7 +17188,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + 304C72F1-293D-44CC-9572-3372A477FA70 teacher_open_course_schedule_session_tag_name teacher_open_course_schedule_session_tag_name @@ -17189,7 +17200,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 7FD0EA25-23EA-4A8F-8D6E-D32BBD1CED3A teacher_open_course_schedule_session_tag_duration teacher_open_course_schedule_session_tag_duration @@ -17200,7 +17211,7 @@ COLLATE = utf8_general_ci 课程时长（分钟） int - + EB95D7C9-2B62-4BF6-A8BA-6CD48F29A389 teacher_open_course_schedule_session_tag_start_time teacher_open_course_schedule_session_tag_start_time @@ -17212,7 +17223,7 @@ COLLATE = utf8_general_ci varchar(10) 10 - + 65CA25E0-C92B-4C62-BD0F-D9022AAAE2B5 teacher_open_course_schedule_session_tag_end_time teacher_open_course_schedule_session_tag_end_time @@ -17224,9 +17235,21 @@ COLLATE = utf8_general_ci varchar(10) 10 + +0CD1861E-23F3-4B23-AB66-C98B7C25ED6A +teacher_open_course_schedule_session_class_name +teacher_open_course_schedule_session_class_name +1663400034 +lx +1663400049 +lx +教室名称 +varchar(255) +255 + - + F50CC5A3-3465-4699-8F69-A29E98FE137C Key_1 Key_1 @@ -17235,12 +17258,12 @@ COLLATE = utf8_general_ci 1662809607 lx - + - + @@ -17249,7 +17272,7 @@ COLLATE = utf8_general_ci teacher_open_course_merge_teacher 1661850632 lx -1663078102 +1663078119 lx 教师-课程开课-关联教师 auto_increment = 1 @@ -17258,7 +17281,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + E2A6360D-5714-41B5-955B-89945A175C59 teacher_open_course_merge_teacher_id teacher_open_course_merge_teacher_id @@ -17270,7 +17293,7 @@ COLLATE = utf8_general_ci bigint 1 - + B09D0BDB-132E-4575-8B29-2EE351C1FE23 teacher_open_course_id teacher_open_course_id @@ -17281,7 +17304,7 @@ COLLATE = utf8_general_ci 课程开课ID bigint - + 7E53D94D-754B-44D9-959E-A49A6AFCA849 teacher_id teacher_id @@ -17292,7 +17315,7 @@ COLLATE = utf8_general_ci 教师ID bigint - + 3A68DDB6-31E8-415D-B94B-92B9DF070D92 teacher_open_course_merge_teacher_status teacher_open_course_merge_teacher_status @@ -17303,7 +17326,7 @@ COLLATE = utf8_general_ci 状态（1启用 2禁用） int - + 7B27FB20-159E-4340-AF84-992446D3D88E teacher_open_course_merge_teacher_add_time teacher_open_course_merge_teacher_add_time @@ -17314,7 +17337,20 @@ COLLATE = utf8_general_ci 创建时间 datetime - + +90845833-CF23-465B-B143-5499ABC48D61 +teacher_open_course_merge_teacher_auth_code +teacher_open_course_merge_teacher_auth_code +1663078074 +lx +1663078102 +lx +教师开课授权码 +varchar(10) +10 +1 + + 279FE47F-88A8-4633-A510-B081884ABC72 org_id org_id @@ -17325,7 +17361,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + CB1C06E4-C2EC-48D0-B1DA-529BE729E99E user_id user_id @@ -17336,22 +17372,9 @@ COLLATE = utf8_general_ci 用户ID bigint - -90845833-CF23-465B-B143-5499ABC48D61 -teacher_open_course_merge_teacher_auth_code -teacher_open_course_merge_teacher_auth_code -1663078074 -lx -1663078102 -lx -教师开课授权码 -varchar(10) -10 -1 - - + C35D2586-F094-4112-8601-9F10D6A9DB41 Key_1 Key_1 @@ -17360,12 +17383,12 @@ COLLATE = utf8_general_ci 1662865695 lx - + - + @@ -17383,7 +17406,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 17B370CF-378E-4E64-A980-89882213C82C teacher_merge_school_class_id teacher_merge_school_class_id @@ -17395,7 +17418,7 @@ COLLATE = utf8_general_ci bigint 1 - + 236A83D5-0BEE-4129-8525-6B8D3A1B4EC6 teacher_id teacher_id @@ -17406,7 +17429,7 @@ COLLATE = utf8_general_ci 教师ID bigint - + 6EEFBCF7-F309-4402-9BC6-A8BD70197B84 school_class_id school_class_id @@ -17417,7 +17440,7 @@ COLLATE = utf8_general_ci 班级ID bigint - + CD1F7C9F-FAA1-48E5-B65E-A4677E110748 teacher_merge_school_class_status teacher_merge_school_class_status @@ -17428,7 +17451,7 @@ COLLATE = utf8_general_ci 状态（1启用 2禁用） int - + C090103F-8A84-4BDA-A330-9AE196279EB2 teacher_merge_school_class_add_time teacher_merge_school_class_add_time @@ -17439,7 +17462,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 7B7183A9-BB12-43ED-B36E-F3143A525E40 org_id org_id @@ -17450,7 +17473,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 9174FB98-B263-42AB-9B54-6F9CBBA31A42 user_id user_id @@ -17463,7 +17486,7 @@ COLLATE = utf8_general_ci - + 2AFFDC6B-82E6-4E75-8F04-36F0FCDAD767 Key_1 Key_1 @@ -17472,17 +17495,17 @@ COLLATE = utf8_general_ci 1662982569 lx - + - + - + BFEA4109-96F9-4074-AF58-B84D6574A7FC PUBLIC PUBLIC @@ -17610,7 +17633,7 @@ COLLATE = utf8_general_ci - + ABEFC813-1056-4507-A9A7-809C149B4ABE 1661954753 lx @@ -17833,7 +17856,7 @@ COLLATE = utf8_general_ci - + 5963E417-B2CE-431D-988A-B3493AAE5EE4 MySQL 5.0 MYSQL50 diff --git a/data_base_design/天泽数据大平台.pdm b/data_base_design/天泽数据大平台.pdm index 141472c8..629ca682 100644 --- a/data_base_design/天泽数据大平台.pdm +++ b/data_base_design/天泽数据大平台.pdm @@ -1,5 +1,5 @@ - + @@ -4512,8 +4512,8 @@ Shadow=0 1661961019 1662810685 -((338453,26990), (339053,43395)) -((338719,43395),(338719,36777),(338753,36777),(338753,26990)) +((338453,26602), (339053,43395)) +((338719,43395),(338719,36777),(338753,36777),(338753,26602)) 1 8 16744576 @@ -4680,8 +4680,8 @@ Shadow=0 1662647833 1662647877 -((284541,15184), (285141,27625)) -((284830,15184),(284830,20457),(284841,20457),(284841,27625)) +((284541,14785), (285141,27625)) +((284830,14785),(284830,20457),(284841,20457),(284841,27625)) 1 8 16744576 @@ -4718,9 +4718,9 @@ Shadow=0 1662810688 -1662995498 -((296402,26648), (338650,29922)) -((338650,26648),(319044,26648),(319044,29622),(296402,29622)) +1663400051 +((296402,26244), (338650,29922)) +((338650,26244),(319044,26244),(319044,29622),(296402,29622)) 1 8 16744576 @@ -6167,9 +6167,9 @@ LABL 0 新宋体,8,N 1661955443 -1662647883 +1663402313 -1 -((275463,11436), (294463,18804)) +((275463,10624), (294463,18804)) 0 12615680 16570034 @@ -6516,9 +6516,9 @@ LABL 0 新宋体,8,N 1662809607 -1662995498 +1663400051 -1 -((329150,18150), (348150,35146)) +((329150,17342), (348150,35146)) 0 12615680 16570034 @@ -15209,7 +15209,7 @@ COLLATE = utf8_general_ci teacher_open_course_merge_student 1661850632 lx -1662648329 +1663402294 lx 课程开课-关联-学生 auto_increment = 1 @@ -15231,6 +15231,17 @@ COLLATE = utf8_general_ci 1 +4DEDD3F6-3919-4602-B549-7CC54021AC30 +teacher_open_course_id +teacher_open_course_id +1663402166 +lx +1663402289 +lx +课程开课ID +bigint + + 2BB34D52-A2A7-44F1-8A98-FC8B5C0A955A student_id student_id @@ -15241,7 +15252,7 @@ COLLATE = utf8_general_ci 学生ID bigint - + EC319A55-6852-40CB-88C0-DE1F41F9D7DF org_id org_id @@ -15252,7 +15263,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + A54FFF36-56CC-427C-BFA0-6376D3B6EEE3 user_id user_id @@ -15263,20 +15274,20 @@ COLLATE = utf8_general_ci 用户ID bigint - + EA0BF245-9346-4119-915C-F4ED28BC545B -create_time -create_time +teacher_open_course_school_class_merge_student_add_time +teacher_open_course_school_class_merge_student_add_time 1661957411 lx -1661957458 +1663402307 lx 创建时间 datetime - + 33D305FE-8588-4D40-B7D4-E228D91FD068 Key_1 Key_1 @@ -15290,7 +15301,7 @@ COLLATE = utf8_general_ci - + @@ -15308,7 +15319,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + AF3D06D0-8046-407D-8D01-0EB4F7C4430B teacher_open_course_schedule_session_tag_id teacher_open_course_schedule_session_tag_id @@ -15320,7 +15331,7 @@ COLLATE = utf8_general_ci bigint 1 - + 63C7BC3C-E3F7-4260-836A-0B2D076E27C8 teacher_open_course_schedule_session_tag_name teacher_open_course_schedule_session_tag_name @@ -15332,7 +15343,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + FCC2ACE6-2A14-4428-A607-72EE9B21B5E6 teacher_open_course_schedule_session_tag_duration teacher_open_course_schedule_session_tag_duration @@ -15343,7 +15354,7 @@ COLLATE = utf8_general_ci 课程时长（分钟） int - + 8851F4F5-A578-41C8-9DAF-B7A2F7796E7D teacher_open_course_schedule_session_tag_add_time teacher_open_course_schedule_session_tag_add_time @@ -15354,7 +15365,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + BE3DB6FF-142D-4A29-A9A3-B10FF0C5759B teacher_open_course_schedule_session_tag_start_time teacher_open_course_schedule_session_tag_start_time @@ -15366,7 +15377,7 @@ COLLATE = utf8_general_ci varchar(10) 10 - + 48411774-FB89-4143-9D62-59DEF8EE1E32 teacher_open_course_schedule_session_tag_end_time teacher_open_course_schedule_session_tag_end_time @@ -15378,7 +15389,7 @@ COLLATE = utf8_general_ci varchar(10) 10 - + C346B065-C2ED-4D45-A0D7-F357EFD8839A org_id org_id @@ -15389,7 +15400,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + F58C2E06-124C-4A14-B564-A92BCE8B2AB6 user_id user_id @@ -15402,7 +15413,7 @@ COLLATE = utf8_general_ci - + 6A318D25-C9C4-44C9-9C79-18E725965208 Key_1 Key_1 @@ -15411,12 +15422,12 @@ COLLATE = utf8_general_ci 1662810962 lx - + - + @@ -15434,7 +15445,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 5F40DE55-D689-437C-AA5A-D68EE5177EBA teacher_open_course_student_signin_setting_id teacher_open_course_student_signin_setting_id @@ -15446,7 +15457,7 @@ COLLATE = utf8_general_ci bigint 1 - + 45A0C89F-9D2D-42C1-8666-997CE6D29EB1 open_course_id open_course_id @@ -15457,7 +15468,7 @@ COLLATE = utf8_general_ci 开课ID bigint - + 3A7ED4E2-6702-471D-BB8C-97028D55FCD0 school_class_id school_class_id @@ -15468,7 +15479,7 @@ COLLATE = utf8_general_ci 班级ID bigint - + D5476993-DD9A-4B96-9C4B-183D5FB88447 type type @@ -15480,7 +15491,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + 3A0547DC-282A-4E24-AB04-6F8D270E3422 value value @@ -15492,7 +15503,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + F844F21D-B808-46C3-8B99-FF63B1DD6F60 org_id org_id @@ -15503,7 +15514,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 5E7E66D8-A3B5-4355-9A11-5942AEE4D028 user_id user_id @@ -15514,7 +15525,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + C953231B-E473-4F11-9DDB-57C25077D504 create_time create_time @@ -15527,7 +15538,7 @@ COLLATE = utf8_general_ci - + EB349942-35A7-44DC-A505-B80E66CA1F63 Key_1 Key_1 @@ -15536,12 +15547,12 @@ COLLATE = utf8_general_ci 1661960474 lx - + - + @@ -15559,7 +15570,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + C9A3B75C-FBF8-4D85-BE76-72E3FC2C2B1F teacher_open_course_chat_log_id teacher_open_course_chat_log_id @@ -15571,7 +15582,7 @@ COLLATE = utf8_general_ci bigint 1 - + 4A6E2BA8-7896-4993-8CC0-CFD616E08BBB teacher_open_course_chat_log_parent_id teacher_open_course_chat_log_parent_id @@ -15582,7 +15593,7 @@ COLLATE = utf8_general_ci 上级ID bigint - + 9FB26692-4080-41CD-AE24-7FD5A53526C6 teacher_open_course_id teacher_open_course_id @@ -15593,7 +15604,7 @@ COLLATE = utf8_general_ci 课程开课ID bigint - + D7BD01D2-4D7E-4228-B94F-711BB78D809D school_class_id school_class_id @@ -15604,7 +15615,7 @@ COLLATE = utf8_general_ci 班级ID bigint - + 18589108-4394-4335-8B90-7E3795F82B8A teacher_id teacher_id @@ -15615,7 +15626,7 @@ COLLATE = utf8_general_ci 教师ID bigint - + 2EDC1791-6AB4-47F1-8A97-4E8B2EE17830 student_id student_id @@ -15626,7 +15637,7 @@ COLLATE = utf8_general_ci 学生ID bigint - + 320B068F-2EFF-4C93-9044-C188C5E1BD85 chat_content chat_content @@ -15638,7 +15649,7 @@ COLLATE = utf8_general_ci varchar(2000) 2000 - + D2108D51-47D4-4398-942C-4DA987E91A52 keywords keywords @@ -15650,7 +15661,7 @@ COLLATE = utf8_general_ci varchar(500) 500 - + 087CD32F-4937-42CD-BD4C-474406B07466 score student_score @@ -15661,7 +15672,7 @@ COLLATE = utf8_general_ci 学生得分 float - + CAF2D8D3-F5A5-4FDF-B876-2EDBFE0FAC7D chat_files chat_files @@ -15673,7 +15684,7 @@ COLLATE = utf8_general_ci varchar(4000) 4000 - + 73146904-4C03-4C3F-A10C-34E2F07E3F5A teacher_open_course_chat_log_status teacher_open_course_chat_log_status @@ -15684,7 +15695,7 @@ COLLATE = utf8_general_ci 状态 （1正常 2删除） int - + 915B6210-D43D-4773-A051-C208B1123038 org_id org_id @@ -15695,7 +15706,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 052B1726-9F05-49F3-9AE1-E73D36F22ED1 user_id user_id @@ -15706,7 +15717,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + F4E24A74-7879-4FA7-A31A-1DF43C87CCA9 create_time create_time @@ -15719,7 +15730,7 @@ COLLATE = utf8_general_ci - + A2E2569E-143D-40A6-AFFD-4B17369021C3 Key_1 Key_1 @@ -15728,12 +15739,12 @@ COLLATE = utf8_general_ci 1662020297 87966 - + - + @@ -15751,7 +15762,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 009A23DE-07AF-4EA6-BBDD-26850AABC8AC teacher_open_course_homework_question_log_id teacher_open_course_homework_question_log_id @@ -15763,7 +15774,7 @@ COLLATE = utf8_general_ci bigint 1 - + E732E580-555A-47D5-864B-E868302C4391 teacher_open_course_question_homework_id teacher_open_course_question_homework_id @@ -15774,7 +15785,7 @@ COLLATE = utf8_general_ci 题库作业ID bigint - + 7492312E-B2F8-4A26-A165-E1D31D254D90 student_upload_file student_upload_file @@ -15786,7 +15797,7 @@ COLLATE = utf8_general_ci varchar(200) 200 - + 908C4B9C-AFDD-46B4-9E2F-BC84BEB3395B student_score student_score @@ -15797,7 +15808,7 @@ COLLATE = utf8_general_ci 学生得分 float - + 10DDF717-440B-465D-A18F-E9935C9BA8E4 reply_content reply_content @@ -15809,7 +15820,7 @@ COLLATE = utf8_general_ci varchar(500) 500 - + C06A272B-5147-40B7-8E49-1E6B509123F6 create_time create_time @@ -15820,7 +15831,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + F8795A3A-9DD9-4F5A-906A-E6964444570C org_id org_id @@ -15831,7 +15842,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 1993A879-EC68-450A-B775-D7C2671BDA96 user_id user_id @@ -15844,7 +15855,7 @@ COLLATE = utf8_general_ci - + FF4A3064-63A4-4FAD-A71D-F66FD27F3A94 Key_1 Key_1 @@ -15853,12 +15864,12 @@ COLLATE = utf8_general_ci 1662044179 lx - + - + @@ -15882,7 +15893,7 @@ COLLATE = utf8_general_ci } - + 03C2172E-8A06-48E0-8C25-4102C8253653 core_setting_id core_setting_id @@ -15894,7 +15905,7 @@ COLLATE = utf8_general_ci bigint 1 - + 5090D458-E136-4D46-9D89-930A55ED9A2C setting_key setting_key @@ -15906,7 +15917,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 0D922C4C-8420-482B-87B6-B0E99FBA62E0 setting_value setting_value @@ -15917,7 +15928,7 @@ COLLATE = utf8_general_ci 配置项 text - + A89D7A99-CD44-4F4E-8337-14A5D4BEE13E core_setting_stauts core_setting_stauts @@ -15928,7 +15939,7 @@ COLLATE = utf8_general_ci 状态 （1正常 2删除） int - + D4790CD3-3634-4FB5-B1F8-DDCA61E7AC11 create_time create_time @@ -15939,7 +15950,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + A9346C05-5EA0-4D30-A522-9DD5B13FCE7E org_id org_id @@ -15950,7 +15961,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + D46E4A36-6D0D-4F64-9C58-CAC3D1285F24 user_id user_id @@ -15963,7 +15974,7 @@ COLLATE = utf8_general_ci - + 8E777505-B813-4D1D-8C5F-B6F9747BA0F4 Key_1 Key_1 @@ -15972,12 +15983,12 @@ COLLATE = utf8_general_ci 1662045362 lx - + - + @@ -15995,7 +16006,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 18F050CC-F084-477F-8759-28E1D015FE0B teacher_open_course_score_dashboard_id teacher_open_course_score_dashboard_id @@ -16007,7 +16018,7 @@ COLLATE = utf8_general_ci bigint 1 - + C33241B0-D288-44ED-8554-C7086F839648 student_id student_id @@ -16018,7 +16029,7 @@ COLLATE = utf8_general_ci 学生ID bigint - + 155275C4-795A-4763-9C39-3FDF35ECECCA signin_score signin_score @@ -16029,7 +16040,7 @@ COLLATE = utf8_general_ci 签到成绩 float - + 26A9701D-C572-427D-8AD8-4D4D9DDC105D course_score course_score @@ -16040,7 +16051,7 @@ COLLATE = utf8_general_ci 章节练习成绩 float - + B1C7AFAC-3115-4EEF-855F-7578BE5C5555 real_operation_score real_operation_score @@ -16051,7 +16062,7 @@ COLLATE = utf8_general_ci 课程实操成绩 float - + AC3C7572-A095-42DE-99A5-3E8D2B9D3602 question_homework_score question_homework_score @@ -16062,7 +16073,7 @@ COLLATE = utf8_general_ci 作业成绩 float - + CB0FDAE5-DDBD-42D1-8E59-3B91E44A45C8 exam_score exam_score @@ -16073,7 +16084,7 @@ COLLATE = utf8_general_ci 考试成绩 float - + A37D010B-5B7E-4815-AC10-65C79F878234 chat_score chat_score @@ -16084,7 +16095,7 @@ COLLATE = utf8_general_ci 互动成绩 float - + D91526BC-31BA-4121-9416-7DB95281202C total_score total_score @@ -16095,7 +16106,7 @@ COLLATE = utf8_general_ci 总成绩 float - + 95464B6A-6611-4674-BBA4-EF869A472F84 manual_score manual_score @@ -16106,7 +16117,7 @@ COLLATE = utf8_general_ci 手动调整的分数 float - + 8E062DAC-DA29-4940-AEC3-1B8EFB468904 last_score last_score @@ -16117,7 +16128,7 @@ COLLATE = utf8_general_ci 最终成绩 float - + 696B62F5-6BCE-4377-8F04-F452C9FE5368 last_status last_status @@ -16129,7 +16140,7 @@ COLLATE = utf8_general_ci varchar(10) 10 - + D2334132-07CC-40C5-8A37-6F95CC12A041 org_id org_id @@ -16140,7 +16151,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 7BBBDC7F-C5E3-424A-AC3C-00E94E564F45 user_id user_id @@ -16151,7 +16162,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + CE5A2441-64A4-4C2A-8646-8D6CFE6C2A73 create_time create_time @@ -16164,7 +16175,7 @@ COLLATE = utf8_general_ci - + 6B3359F7-B844-4B95-9C3B-A4AAFBA27617 Key_1 Key_1 @@ -16173,12 +16184,12 @@ COLLATE = utf8_general_ci 1662045706 lx - + - + @@ -16201,7 +16212,7 @@ COLLATE = utf8_general_ci } - + 318651DC-E71A-449A-96A8-19F27C71F4AC teacher_open_course_notice_id teacher_open_course_notice_id @@ -16213,7 +16224,7 @@ COLLATE = utf8_general_ci bigint 1 - + F972E98C-839A-4F8E-B2B7-A92F064483DB school_class_ids school_class_ids @@ -16225,7 +16236,7 @@ COLLATE = utf8_general_ci varchar(2000) 2000 - + E3F89C48-E4A1-4B9B-AE85-66EE2378EC58 teacher_open_course_ids teacher_open_course_ids @@ -16237,7 +16248,7 @@ COLLATE = utf8_general_ci varchar(2000) 2000 - + 9072D638-91A2-45E3-B01A-56FD07AC2DBC notice_title notice_title @@ -16249,7 +16260,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 2AED03DE-64F7-47AF-810B-CC78F23EEF22 notice_content notice_content @@ -16261,7 +16272,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 08862E80-7DDC-40DF-8E1B-DCFED6B33AC8 create_time create_time @@ -16272,7 +16283,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + A04525A6-FB16-4CCC-9753-4907D73BA676 create_by_teacher_id create_by_teacher_id @@ -16283,7 +16294,7 @@ COLLATE = utf8_general_ci 消息创建--老师ID bigint - + 3B6BA47A-A3E1-41B3-B8E8-B877AF7DFB5B org_id org_id @@ -16294,7 +16305,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + E49B7F20-513A-4E10-BEE8-D5B768200303 user_id user_id @@ -16305,7 +16316,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + C28FF8AA-D0BD-4EFE-8BEE-802D56989498 del_flag del_flag @@ -16318,7 +16329,7 @@ COLLATE = utf8_general_ci - + 3D2650BD-129F-48EC-B75C-872417A4E822 Key_1 Key_1 @@ -16327,12 +16338,12 @@ COLLATE = utf8_general_ci 1662046440 lx - + - + @@ -16355,7 +16366,7 @@ COLLATE = utf8_general_ci } - + 3DB701D7-DA2C-4296-853B-38D2E719CCA6 teacher_open_course_knowledge_point_id teacher_open_course_knowledge_point_id @@ -16367,7 +16378,7 @@ COLLATE = utf8_general_ci bigint 1 - + 171BF047-E676-4C5B-89B3-8B25136416A7 teacher_open_course_id teacher_open_course_id @@ -16378,7 +16389,7 @@ COLLATE = utf8_general_ci 课程开课ID bigint - + 0B7D7F9A-015D-42DD-8116-30CEC65236D8 chapter_id chapter_id @@ -16389,7 +16400,7 @@ COLLATE = utf8_general_ci 章节ID bigint - + E622D525-8AFB-4926-AE32-117E18C429E0 teacher_open_course_knowledge_point_title teacher_open_course_knowledge_point_title @@ -16401,7 +16412,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + B1BD789A-9684-4E7A-AD8A-BE79C7B6C7C8 teacher_open_course_knowledge_point_content teacher_open_course_knowledge_point_content @@ -16413,7 +16424,7 @@ COLLATE = utf8_general_ci varchar(4000) 4000 - + C44A8ACF-B4BC-4140-9003-1ADAC230C1DA teacher_open_course_knowledge_point_status teacher_open_course_knowledge_point_status @@ -16424,7 +16435,7 @@ COLLATE = utf8_general_ci 状态 （1正常 2删除） int - + 35B92FEF-A383-4FD2-AAC3-10355BCA6896 create_time create_time @@ -16435,7 +16446,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 2745088B-3993-46E7-9035-2EF382FEC082 org_id org_id @@ -16446,7 +16457,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 9699889E-0268-4565-971A-41D449A2A5F2 user_id user_id @@ -16459,7 +16470,7 @@ COLLATE = utf8_general_ci - + 75299271-38A3-44A7-824D-00792734CF12 Key_1 Key_1 @@ -16468,12 +16479,12 @@ COLLATE = utf8_general_ci 1662047767 lx - + - + @@ -16491,7 +16502,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 326FA1E3-0BA3-420E-8242-ED8A4A4F0617 student_client_link_id student_client_link_id @@ -16503,7 +16514,7 @@ COLLATE = utf8_general_ci bigint 1 - + E2FC1BD3-0EBA-4330-A432-204E68A01861 student_client_link_order student_client_link_order @@ -16514,7 +16525,7 @@ COLLATE = utf8_general_ci 导航栏排序 int - + A897CD71-A97A-450E-92FA-72474727C640 student_client_link_title student_client_link_title @@ -16526,7 +16537,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + B988F3BD-EEE2-40FB-9E5E-73ABC59935D9 student_client_link_content student_client_link_content @@ -16538,7 +16549,7 @@ COLLATE = utf8_general_ci varchar(2000) 2000 - + C9FBBBB6-7477-4B29-8A15-08222FB01DE8 student_client_link_type student_client_link_type @@ -16550,7 +16561,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + B5987B41-6AE9-469F-A36F-48C3C9674252 student_client_link_img student_client_link_img @@ -16561,7 +16572,7 @@ COLLATE = utf8_general_ci 链接图片（可用于轮播大图，icon小图等功能） text - + DD99CF28-4303-4935-8168-CE022C8C31CD student_client_link_status student_client_link_status @@ -16572,7 +16583,7 @@ COLLATE = utf8_general_ci 状态（ 1 正常 2删除） int - + 963FA155-9A25-41BA-8B52-209536B76758 student_client_link_open_type student_client_link_open_type @@ -16584,7 +16595,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + 05CE988B-2AF5-4A63-9451-25A9EF95C5DB create_time create_time @@ -16595,7 +16606,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 1E5FBB70-DADA-4251-9BDA-85E132223109 user_id user_id @@ -16606,7 +16617,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + F1483087-727F-4BFE-97BA-9692FD8D1AB2 org_id org_id @@ -16619,7 +16630,7 @@ COLLATE = utf8_general_ci - + B095A5B3-D6C4-40C4-B986-497B3849ED54 Key_1 Key_1 @@ -16628,12 +16639,12 @@ COLLATE = utf8_general_ci 1662554252 lx - + - + @@ -16651,7 +16662,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + CCCB7690-1E0F-4355-AC7A-ABB58CC8632B university_system_id university_system_id @@ -16663,7 +16674,7 @@ COLLATE = utf8_general_ci bigint 1 - + B0D08F82-9D1C-42E8-B332-4422FC72BF67 university_system_name university_system_name @@ -16675,7 +16686,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 8A8F809D-A11E-4F1E-AB4B-C8B02D1DA3AB university_system_contact university_system_contact @@ -16687,7 +16698,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + 1F10D7BD-3F66-4E4E-AA41-06A06D9D00D1 university_system_contact_tel university_system_contact_tel @@ -16699,7 +16710,7 @@ COLLATE = utf8_general_ci varchar(20) 20 - + 139361B7-C257-4094-9BCE-1F8A44668480 university_system_add_time university_system_add_time @@ -16710,7 +16721,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 7BA84D60-66CD-47EA-8DCB-025AEFC85CFF university_system_status university_system_status @@ -16721,7 +16732,7 @@ COLLATE = utf8_general_ci 状态 （1正常 2删除） int - + EE6D1A35-06C2-4560-B40B-D1E87CA5F291 university_faculty_id university_faculty_id @@ -16732,7 +16743,7 @@ COLLATE = utf8_general_ci 院系ID（学院ID） int - + 87AEE496-5BD2-4A50-ACC8-980A708FC4DB user_id user_id @@ -16743,7 +16754,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + 6D140299-48E6-4630-99C8-D96E361AB3B1 org_id org_id @@ -16756,7 +16767,7 @@ COLLATE = utf8_general_ci - + F02FEAFC-6CDC-461B-BCD4-A60CB97164BA Key_1 Key_1 @@ -16765,12 +16776,12 @@ COLLATE = utf8_general_ci 1662648377 lx - + - + @@ -16788,7 +16799,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 884F2204-DCE1-485E-A4B2-D4378BEE2044 university_faculty_id university_faculty_id @@ -16800,7 +16811,7 @@ COLLATE = utf8_general_ci bigint 1 - + 2AB481C3-D261-4ADD-B9F9-146124372F4B university_faculty_name university_faculty_name @@ -16812,7 +16823,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 04BE427C-8D5A-48B8-808F-80D87158F9E4 university_faculty_contact university_faculty_contact @@ -16824,7 +16835,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + A6EF43AB-F19B-4BE5-B34E-D4AE59D57B17 university_faculty_contact_tel university_faculty_contact_tel @@ -16836,7 +16847,7 @@ COLLATE = utf8_general_ci varchar(20) 20 - + C8BE2BF4-F676-43CB-A1CE-369836C8D540 university_faculty_contact_address university_faculty_contact_address @@ -16848,7 +16859,7 @@ COLLATE = utf8_general_ci varchar(200) 200 - + 68386B1B-1359-4E14-80BB-D40EB3E6D05E universities_colleges_id universities_colleges_id @@ -16859,7 +16870,7 @@ COLLATE = utf8_general_ci 院校ID （院系的上一级） bigint - + 34891715-8E26-4F10-A789-93454383373B university_faculty_status university_faculty_status @@ -16870,7 +16881,7 @@ COLLATE = utf8_general_ci 状态（ 1 正常 2删除） int - + 7EA4E9C0-C919-4B3F-8300-66888606CDFE university_faculty_add_time university_faculty_add_time @@ -16881,7 +16892,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 860EA0A3-DB84-4B76-BB61-CD32C4838D5E user_id user_id @@ -16892,7 +16903,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + 6D5D545B-7423-4471-B969-D5AD4F7D6459 org_id org_id @@ -16905,7 +16916,7 @@ COLLATE = utf8_general_ci - + 8827D654-DDB8-4D1E-A500-362CE79333F8 Key_1 Key_1 @@ -16914,12 +16925,12 @@ COLLATE = utf8_general_ci 1662648708 lx - + - + @@ -16937,7 +16948,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 5288224C-53C1-4C24-B9E9-054F89E3408E teacher_open_course_schedule_session_class_id teacher_open_course_schedule_session_class_id @@ -16949,7 +16960,7 @@ COLLATE = utf8_general_ci bigint 1 - + 9F4A9A8A-17A5-4DDE-B4C8-5B1CAB398160 teacher_open_course_schedule_session_class_name teacher_open_course_schedule_session_class_name @@ -16961,7 +16972,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 9BC97CEE-44E7-4253-BD67-61CE17D5A991 teacher_open_course_schedule_session_class_parent_id teacher_open_course_schedule_session_class_parent_id @@ -16973,7 +16984,7 @@ COLLATE = utf8_general_ci bigint 1 - + B86F6DCB-0565-4214-A6DA-1A973CE66EA1 org_id org_id @@ -16984,7 +16995,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 056FDBB3-D0F8-4845-BD40-72B5A4B1932F user_id user_id @@ -16995,7 +17006,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + 095D37B8-4403-4981-AFB2-8D79C7F04A9A teacher_open_course_schedule_session_class_add_time teacher_open_course_schedule_session_class_add_time @@ -17008,7 +17019,7 @@ COLLATE = utf8_general_ci - + 8F5B1BAF-BE16-44DE-8DF5-9A1EAD731C04 Key_1 Key_1 @@ -17017,12 +17028,12 @@ COLLATE = utf8_general_ci 1662808852 lx - + - + @@ -17031,8 +17042,8 @@ COLLATE = utf8_general_ci teacher_open_course_schedule_session 1661850632 lx -1662971416 -87966 +1663400049 +lx 课程开课-排课管理-课表 auto_increment = 1 ENGINE = InnoDB @@ -17040,7 +17051,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 6392E614-144C-4A81-B339-C428F15B45D9 teacher_open_course_schedule_session_id teacher_open_course_schedule_session_id @@ -17052,7 +17063,7 @@ COLLATE = utf8_general_ci bigint 1 - + D6281D02-4BB6-4C60-AC33-6DE084397A78 teacher_open_course_schedule_session_day_time teacher_open_course_schedule_session_day_time @@ -17064,7 +17075,7 @@ COLLATE = utf8_general_ci varchar(20) 20 - + 84F8C272-4766-4209-9667-728323948B7D teacher_open_course_schedule_session_add_time teacher_open_course_schedule_session_add_time @@ -17075,7 +17086,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 379DA977-579C-4E07-B57C-A112F3DDE178 teacher_open_course_schedule_session_status teacher_open_course_schedule_session_status @@ -17086,7 +17097,7 @@ COLLATE = utf8_general_ci 状态（1正常 2删除） int - + D506683D-A194-4D05-ADB9-BB50C1250024 teacher_open_course_id teacher_open_course_id @@ -17097,7 +17108,7 @@ COLLATE = utf8_general_ci 课程开课ID bigint - + 3C52ADED-57C3-4912-BE68-3F75ADDB2382 teacher_id teacher_id @@ -17108,7 +17119,7 @@ COLLATE = utf8_general_ci 教师ID bigint - + 8CD1F62C-46A8-4CF0-B2BD-294B7516B104 school_class_Ids school_class_Ids @@ -17120,7 +17131,7 @@ COLLATE = utf8_general_ci varchar(4000) 4000 - + 7A7E2C88-8FF1-48BA-A8DF-4A9A96368B9B teacher_open_course_schedule_session_start_date teacher_open_course_schedule_session_start_date @@ -17132,7 +17143,7 @@ COLLATE = utf8_general_ci varchar(20) 20 - + 9BEAE88E-4EA1-4171-8315-D61CE82BCADD teacher_open_course_schedule_session_end_date teacher_open_course_schedule_session_end_date @@ -17144,7 +17155,7 @@ COLLATE = utf8_general_ci varchar(20) 20 - + 01EA483A-4478-44D1-8032-98E2EB7DCB79 teacher_open_course_schedule_session_week_num teacher_open_course_schedule_session_week_num @@ -17155,7 +17166,7 @@ COLLATE = utf8_general_ci 周次 int - + A6D7EF46-7437-4280-B26D-396E02AF3FBD org_id org_id @@ -17166,7 +17177,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 4DCDE709-2B62-4BCE-B430-60038263BD7B user_id user_id @@ -17177,7 +17188,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + 304C72F1-293D-44CC-9572-3372A477FA70 teacher_open_course_schedule_session_tag_name teacher_open_course_schedule_session_tag_name @@ -17189,7 +17200,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 7FD0EA25-23EA-4A8F-8D6E-D32BBD1CED3A teacher_open_course_schedule_session_tag_duration teacher_open_course_schedule_session_tag_duration @@ -17200,7 +17211,7 @@ COLLATE = utf8_general_ci 课程时长（分钟） int - + EB95D7C9-2B62-4BF6-A8BA-6CD48F29A389 teacher_open_course_schedule_session_tag_start_time teacher_open_course_schedule_session_tag_start_time @@ -17212,7 +17223,7 @@ COLLATE = utf8_general_ci varchar(10) 10 - + 65CA25E0-C92B-4C62-BD0F-D9022AAAE2B5 teacher_open_course_schedule_session_tag_end_time teacher_open_course_schedule_session_tag_end_time @@ -17224,9 +17235,21 @@ COLLATE = utf8_general_ci varchar(10) 10 + +0CD1861E-23F3-4B23-AB66-C98B7C25ED6A +teacher_open_course_schedule_session_class_name +teacher_open_course_schedule_session_class_name +1663400034 +lx +1663400049 +lx +教室名称 +varchar(255) +255 + - + F50CC5A3-3465-4699-8F69-A29E98FE137C Key_1 Key_1 @@ -17235,12 +17258,12 @@ COLLATE = utf8_general_ci 1662809607 lx - + - + @@ -17258,7 +17281,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + E2A6360D-5714-41B5-955B-89945A175C59 teacher_open_course_merge_teacher_id teacher_open_course_merge_teacher_id @@ -17270,7 +17293,7 @@ COLLATE = utf8_general_ci bigint 1 - + B09D0BDB-132E-4575-8B29-2EE351C1FE23 teacher_open_course_id teacher_open_course_id @@ -17281,7 +17304,7 @@ COLLATE = utf8_general_ci 课程开课ID bigint - + 7E53D94D-754B-44D9-959E-A49A6AFCA849 teacher_id teacher_id @@ -17292,7 +17315,7 @@ COLLATE = utf8_general_ci 教师ID bigint - + 3A68DDB6-31E8-415D-B94B-92B9DF070D92 teacher_open_course_merge_teacher_status teacher_open_course_merge_teacher_status @@ -17303,7 +17326,7 @@ COLLATE = utf8_general_ci 状态（1启用 2禁用） int - + 7B27FB20-159E-4340-AF84-992446D3D88E teacher_open_course_merge_teacher_add_time teacher_open_course_merge_teacher_add_time @@ -17314,7 +17337,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 90845833-CF23-465B-B143-5499ABC48D61 teacher_open_course_merge_teacher_auth_code teacher_open_course_merge_teacher_auth_code @@ -17327,7 +17350,7 @@ COLLATE = utf8_general_ci 10 1 - + 279FE47F-88A8-4633-A510-B081884ABC72 org_id org_id @@ -17338,7 +17361,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + CB1C06E4-C2EC-48D0-B1DA-529BE729E99E user_id user_id @@ -17351,7 +17374,7 @@ COLLATE = utf8_general_ci - + C35D2586-F094-4112-8601-9F10D6A9DB41 Key_1 Key_1 @@ -17360,12 +17383,12 @@ COLLATE = utf8_general_ci 1662865695 lx - + - + @@ -17383,7 +17406,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 17B370CF-378E-4E64-A980-89882213C82C teacher_merge_school_class_id teacher_merge_school_class_id @@ -17395,7 +17418,7 @@ COLLATE = utf8_general_ci bigint 1 - + 236A83D5-0BEE-4129-8525-6B8D3A1B4EC6 teacher_id teacher_id @@ -17406,7 +17429,7 @@ COLLATE = utf8_general_ci 教师ID bigint - + 6EEFBCF7-F309-4402-9BC6-A8BD70197B84 school_class_id school_class_id @@ -17417,7 +17440,7 @@ COLLATE = utf8_general_ci 班级ID bigint - + CD1F7C9F-FAA1-48E5-B65E-A4677E110748 teacher_merge_school_class_status teacher_merge_school_class_status @@ -17428,7 +17451,7 @@ COLLATE = utf8_general_ci 状态（1启用 2禁用） int - + C090103F-8A84-4BDA-A330-9AE196279EB2 teacher_merge_school_class_add_time teacher_merge_school_class_add_time @@ -17439,7 +17462,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 7B7183A9-BB12-43ED-B36E-F3143A525E40 org_id org_id @@ -17450,7 +17473,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 9174FB98-B263-42AB-9B54-6F9CBBA31A42 user_id user_id @@ -17463,7 +17486,7 @@ COLLATE = utf8_general_ci - + 2AFFDC6B-82E6-4E75-8F04-36F0FCDAD767 Key_1 Key_1 @@ -17472,17 +17495,17 @@ COLLATE = utf8_general_ci 1662982569 lx - + - + - + BFEA4109-96F9-4074-AF58-B84D6574A7FC PUBLIC PUBLIC @@ -17610,7 +17633,7 @@ COLLATE = utf8_general_ci - + ABEFC813-1056-4507-A9A7-809C149B4ABE 1661954753 lx @@ -17833,7 +17856,7 @@ COLLATE = utf8_general_ci - + 5963E417-B2CE-431D-988A-B3493AAE5EE4 MySQL 5.0 MYSQL50 diff --git a/httpTest/TeacherOpenCourseScheduleSession.http b/httpTest/TeacherOpenCourseScheduleSession.http index 06510397..7eae2edf 100644 --- a/httpTest/TeacherOpenCourseScheduleSession.http +++ b/httpTest/TeacherOpenCourseScheduleSession.http @@ -22,13 +22,15 @@ Cookie: JSESSIONID={{session}} "teacherOpenCourseScheduleSessionTagName": "第一节", "teacherOpenCourseScheduleSessionTagDuration": 20, "teacherOpenCourseScheduleSessionTagStartTime": "09:00", - "teacherOpenCourseScheduleSessionTagEndTime": "09:20" + "teacherOpenCourseScheduleSessionTagEndTime": "09:20", + "teacherOpenCourseScheduleSessionClassName": "教名称名称1/105" }, { "teacherOpenCourseScheduleSessionTagName": "第二节", "teacherOpenCourseScheduleSessionTagDuration": 60, "teacherOpenCourseScheduleSessionTagStartTime": "09:40", - "teacherOpenCourseScheduleSessionTagEndTime": "10:40" + "teacherOpenCourseScheduleSessionTagEndTime": "10:40", + "teacherOpenCourseScheduleSessionClassName": "教名称名称2/106" } ] } diff --git a/httpTest/http-client.private.env.json b/httpTest/http-client.private.env.json index 284efd01..a1509655 100644 --- a/httpTest/http-client.private.env.json +++ b/httpTest/http-client.private.env.json @@ -1,6 +1,6 @@ { "dev": { "baseURL": "http://localhost:9090/server/", - "session": "0F7AA33E419DC104AE8DA15725136F46" + "session": "497889C2B1819A5699DB4FB749932184" } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeStudentDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeStudentDao.java new file mode 100644 index 00000000..d073b9af --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeStudentDao.java @@ -0,0 +1,25 @@ +package com.ibeetl.jlw.dao; + +import com.ibeetl.jlw.entity.TeacherOpenCourseMergeStudent; +import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeStudentQuery; +import org.beetl.sql.core.engine.PageQuery; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; +import org.beetl.sql.mapper.annotation.Update; + +import java.util.List; + +/** + * 开课关联学生 Dao + */ +@SqlResource("jlw.teacherOpenCourseMergeStudent") +public interface TeacherOpenCourseMergeStudentDao extends BaseMapper{ + PageQuery queryByCondition(PageQuery query); + PageQuery queryByConditionQuery(PageQuery query); + @Update + void deleteTeacherOpenCourseMergeStudentByIds(String ids); + @Update + int updateGivenByIds(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery); + List getByIds(String ids); + List getValuesByQuery(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery); +} diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeStudent.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeStudent.java new file mode 100644 index 00000000..f6451095 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeStudent.java @@ -0,0 +1,128 @@ +package com.ibeetl.jlw.entity; + +import com.ibeetl.admin.core.annotation.Dict; +import com.ibeetl.admin.core.entity.BaseEntity; +import com.ibeetl.admin.core.util.ValidateConfig; +import org.beetl.sql.annotation.entity.AssignID; + +import javax.validation.constraints.NotNull; +import java.util.Date; + +/* +* 课程开课-关联-学生 +* gen by Spring Boot2 Admin 2022-09-17 +*/ +public class TeacherOpenCourseMergeStudent extends BaseEntity{ + + //课程开课-班级-学生-关联ID + @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) + @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeStudent") + + private Long teacherOpenCourseSchoolClassMergeStudentId ; + + //课程开课ID + @Dict(type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") + + private Long teacherOpenCourseId ; + + //学生ID + @Dict(type="student.student_name.student_status=1") + + private Long studentId ; + + //组织ID + + private Long orgId ; + + //用户ID + + private Long userId ; + + //创建时间 + + private Date teacherOpenCourseSchoolClassMergeStudentAddTime ; + + public TeacherOpenCourseMergeStudent(){ + } + + /**课程开课-班级-学生-关联ID + *@return + */ + public Long getTeacherOpenCourseSchoolClassMergeStudentId(){ + return teacherOpenCourseSchoolClassMergeStudentId; + } + /**课程开课-班级-学生-关联ID + *@param teacherOpenCourseSchoolClassMergeStudentId + */ + public void setTeacherOpenCourseSchoolClassMergeStudentId(Long teacherOpenCourseSchoolClassMergeStudentId){ + this.teacherOpenCourseSchoolClassMergeStudentId = teacherOpenCourseSchoolClassMergeStudentId; + } + + /**课程开课ID + *@return + */ + public Long getTeacherOpenCourseId(){ + return teacherOpenCourseId; + } + /**课程开课ID + *@param teacherOpenCourseId + */ + public void setTeacherOpenCourseId(Long teacherOpenCourseId){ + this.teacherOpenCourseId = teacherOpenCourseId; + } + + /**学生ID + *@return + */ + public Long getStudentId(){ + return studentId; + } + /**学生ID + *@param studentId + */ + public void setStudentId(Long studentId){ + this.studentId = studentId; + } + + /**组织ID + *@return + */ + public Long getOrgId(){ + return orgId; + } + /**组织ID + *@param orgId + */ + public void setOrgId(Long orgId){ + this.orgId = orgId; + } + + /**用户ID + *@return + */ + public Long getUserId(){ + return userId; + } + /**用户ID + *@param userId + */ + public void setUserId(Long userId){ + this.userId = userId; + } + + /**创建时间 + *@return + */ + public Date getTeacherOpenCourseSchoolClassMergeStudentAddTime(){ + return teacherOpenCourseSchoolClassMergeStudentAddTime; + } + /**创建时间 + *@param teacherOpenCourseSchoolClassMergeStudentAddTime + */ + public void setTeacherOpenCourseSchoolClassMergeStudentAddTime(Date teacherOpenCourseSchoolClassMergeStudentAddTime){ + this.teacherOpenCourseSchoolClassMergeStudentAddTime = teacherOpenCourseSchoolClassMergeStudentAddTime; + } + + +} diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java index 51daac8c..32947932 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java @@ -1,5 +1,6 @@ package com.ibeetl.jlw.entity; +import cn.hutool.core.date.DateUtil; import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; @@ -62,8 +63,8 @@ public class TeacherOpenCourseScheduleSession extends BaseEntity{ private Long userId ; - @FetchSql("select teacher_open_course_schedule_session_tag_name, teacher_open_course_schedule_session_add_time," + - "teacher_open_course_schedule_session_tag_duration," + + @FetchSql("select teacher_open_course_schedule_session_tag_name,teacher_open_course_schedule_session_day_time," + + " teacher_open_course_schedule_session_tag_duration, teacher_open_course_schedule_session_class_name," + "teacher_open_course_schedule_session_tag_start_time, teacher_open_course_schedule_session_tag_end_time " + "from teacher_open_course_schedule_session where teacher_open_course_id = #teacherOpenCourseId# " + "and teacher_id = #teacherId# and teacher_open_course_schedule_session_status = 1") @@ -73,6 +74,7 @@ public class TeacherOpenCourseScheduleSession extends BaseEntity{ private String teacherOpenCourseScheduleSessionTagName ; + //课程时长（分钟） private Integer teacherOpenCourseScheduleSessionTagDuration ; @@ -97,6 +99,10 @@ public class TeacherOpenCourseScheduleSession extends BaseEntity{ private Integer teacherOpenCourseScheduleSessionWeekNum; + // 教室名称 + + private String teacherOpenCourseScheduleSessionClassName; + @Data public static class TeacherOpenCourseScheduleSessionTagTemp { @@ -106,19 +112,37 @@ public class TeacherOpenCourseScheduleSession extends BaseEntity{ //创建时间 - private Date teacherOpenCourseScheduleSessionAddTime; + private Date teacherOpenCourseScheduleSessionDayTime; - //课程时长（分钟） + //课程时长（分钟） private Integer teacherOpenCourseScheduleSessionTagDuration; - //开始时间 + //开始时间 private String teacherOpenCourseScheduleSessionTagStartTime; - //结束时间 + //结束时间 private String teacherOpenCourseScheduleSessionTagEndTime; - } + + // 星期几 + private String teacherOpenCourseScheduleSessionTagWeek; + + // 教室名称 + private String teacherOpenCourseScheduleSessionClassName; + + public void setTeacherOpenCourseScheduleSessionDayTime(Date teacherOpenCourseScheduleSessionDayTime) { + this.teacherOpenCourseScheduleSessionDayTime = teacherOpenCourseScheduleSessionDayTime; + if (null != teacherOpenCourseScheduleSessionDayTime) { + TeacherOpenCourseScheduleSessionOptions.WeekDetailType byWeekNumber = TeacherOpenCourseScheduleSessionOptions + .WeekDetailType.getByWeekNumber(DateUtil.dayOfWeek(teacherOpenCourseScheduleSessionDayTime)); + // 根据当前日期，显示中文的星期几 + this.setTeacherOpenCourseScheduleSessionTagWeek(byWeekNumber.getWeek()); + } + } + + + } } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionOptions.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionOptions.java index 12d1a44c..b8769305 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionOptions.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionOptions.java @@ -82,22 +82,37 @@ public class TeacherOpenCourseScheduleSessionOptions { /** * 星期一到星期日 */ - T1(2), - T2(3), - T3(4), - T4(5), - T5(6), - T6(7), - T7(1); + T1(2, "星期一"), + T2(3, "星期二"), + T3(4, "星期三"), + T4(5, "星期四"), + T5(6, "星期五"), + T6(7, "星期六"), + T7(1, "星期日"); /** * 星期转为数字 */ @Getter private Integer weekNumber; + /** + * 星期转为数字 + */ + @Getter + private String week; - WeekDetailType(int weekNumber) { + WeekDetailType(int weekNumber, String week) { this.weekNumber = weekNumber; + this.week = week; + } + + public static WeekDetailType getByWeekNumber(Integer weekNumber) { + for (WeekDetailType weekDetailType: values()) { + if (weekDetailType.getWeekNumber().equals(weekNumber)) { + return weekDetailType; + } + } + return null; } } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionTag.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionTag.java index 3e72efd1..dded08f6 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionTag.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionTag.java @@ -31,6 +31,9 @@ public class TeacherOpenCourseScheduleSessionTag extends BaseEntity{ //创建时间 private Date teacherOpenCourseScheduleSessionTagAddTime ; + + // 星期几（中文显示） + private String teacherOpenCourseScheduleSessionTagWeek; //开始时间 @@ -39,7 +42,10 @@ public class TeacherOpenCourseScheduleSessionTag extends BaseEntity{ //结束时间 private String teacherOpenCourseScheduleSessionTagEndTime ; - + + // 上课楼名称 + private String teacherOpenCourseScheduleSessionClassName; + //组织ID private Long orgId ; @@ -156,4 +162,19 @@ public class TeacherOpenCourseScheduleSessionTag extends BaseEntity{ } + public String getTeacherOpenCourseScheduleSessionTagWeek() { + return teacherOpenCourseScheduleSessionTagWeek; + } + + public void setTeacherOpenCourseScheduleSessionTagWeek(String teacherOpenCourseScheduleSessionTagWeek) { + this.teacherOpenCourseScheduleSessionTagWeek = teacherOpenCourseScheduleSessionTagWeek; + } + + public String getTeacherOpenCourseScheduleSessionClassName() { + return teacherOpenCourseScheduleSessionClassName; + } + + public void setTeacherOpenCourseScheduleSessionClassName(String teacherOpenCourseScheduleSessionClassName) { + this.teacherOpenCourseScheduleSessionClassName = teacherOpenCourseScheduleSessionClassName; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java new file mode 100644 index 00000000..6cb94bd3 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java @@ -0,0 +1,147 @@ +package com.ibeetl.jlw.service; + +import cn.jlw.util.ToolUtils; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.ibeetl.admin.core.service.CoreBaseService; +import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.admin.core.web.JsonResult; +import com.ibeetl.admin.core.web.JsonReturnCode; +import com.ibeetl.jlw.dao.TeacherOpenCourseMergeStudentDao; +import com.ibeetl.jlw.entity.TeacherOpenCourseMergeStudent; +import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeStudentQuery; +import org.apache.commons.lang3.StringUtils; +import org.beetl.sql.core.SqlId; +import org.beetl.sql.core.engine.PageQuery; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * 开课关联学生 Service + * 当分布式ID开启后请勿使用insert(*,true) + */ + +@Service +@Transactional +public class TeacherOpenCourseMergeStudentService extends CoreBaseService{ + + @Resource private TeacherOpenCourseMergeStudentDao teacherOpenCourseMergeStudentDao; + + public PageQueryqueryByCondition(PageQuery query){ + PageQuery ret = teacherOpenCourseMergeStudentDao.queryByCondition(query); + queryListAfter(ret.getList()); + return ret; + } + + public PageQueryqueryByConditionQuery(PageQuery query){ + PageQuery ret = teacherOpenCourseMergeStudentDao.queryByConditionQuery(query); + queryListAfter(ret.getList()); + return ret; + } + + public void deleteByList(List list){ + String ids = ""; + ToolUtils.deleteNullList(list); + for(int i=0;null != list && i teacherOpenCourseMergeStudentList = new ArrayList<>(); + try { + teacherOpenCourseMergeStudentList = JSON.parseArray(teacherOpenCourseMergeStudentQuery.getTeacherOpenCourseMergeStudentJsonStr(), TeacherOpenCourseMergeStudent.class); + } catch (Exception e) { + try { + teacherOpenCourseMergeStudentList.add(JSONObject.parseObject(teacherOpenCourseMergeStudentQuery.getTeacherOpenCourseMergeStudentJsonStr(), TeacherOpenCourseMergeStudent.class)); + } catch (Exception e1) {} + } + ToolUtils.deleteNullList(teacherOpenCourseMergeStudentList); + if(null != teacherOpenCourseMergeStudentList && teacherOpenCourseMergeStudentList.size()>0){ + for(int i=0;i 0; + if(!flag){ + msg = "更新指定参数失败"; + } + }else{ + msg = "指定参数为空"; + } + return msg; + } + + public List getValues (Object paras){ + return sqlManager.select(SqlId.of("jlw.teacherOpenCourseMergeStudent.getTeacherOpenCourseMergeStudentValues"), TeacherOpenCourseMergeStudent.class, paras); + } + + public List getValuesByQuery (TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery){ + return teacherOpenCourseMergeStudentDao.getValuesByQuery(teacherOpenCourseMergeStudentQuery); + } + + public TeacherOpenCourseMergeStudent getInfo (Long teacherOpenCourseSchoolClassMergeStudentId){ + TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery = new TeacherOpenCourseMergeStudentQuery(); + teacherOpenCourseMergeStudentQuery.setTeacherOpenCourseSchoolClassMergeStudentId(teacherOpenCourseSchoolClassMergeStudentId); + List list = teacherOpenCourseMergeStudentDao.getValuesByQuery(teacherOpenCourseMergeStudentQuery); + if(null != list && list.size()>0){ + return list.get(0); + }else{ + return null; + } + } + + public TeacherOpenCourseMergeStudent getInfo (TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery){ + List list = teacherOpenCourseMergeStudentDao.getValuesByQuery(teacherOpenCourseMergeStudentQuery); + if(null != list && list.size()>0){ + return list.get(0); + }else{ + return null; + } + } + +} diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java index 8568ccf9..3de5e90f 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java @@ -60,7 +60,7 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService queryByConditionGroup(PageQuery query){ PageQuery ret = teacherOpenCourseScheduleSessionDao.queryByConditionGroup(query); queryListAfter(ret.getList()); @@ -245,6 +245,7 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService getPageList(TeacherOpenCourseMergeStudentQuery condition,@SCoreUser CoreUser coreUser){ + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + PageQuery page = condition.getPageQuery(); + teacherOpenCourseMergeStudentService.queryByConditionQuery(page); + return JsonResult.success(page); + } + } + + + @GetMapping(API + "/getInfo.do") + public JsonResultgetInfo(TeacherOpenCourseMergeStudentQuery param,@SCoreUser CoreUser coreUser) { + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + TeacherOpenCourseMergeStudent teacherOpenCourseMergeStudent = teacherOpenCourseMergeStudentService.getInfo(param); + return JsonResult.success(teacherOpenCourseMergeStudent); + } + } + + + @GetMapping(API + "/getList.do") + public JsonResult>getList(TeacherOpenCourseMergeStudentQuery param,@SCoreUser CoreUser coreUser) { + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + Listlist = teacherOpenCourseMergeStudentService.getValuesByQuery(param); + return JsonResult.success(list); + } + } + + + /* 后台页面 */ + + @GetMapping(MODEL + "/index.do") + @Function("teacherOpenCourseMergeStudent.query") + public ModelAndView index() { + ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeStudent/index.html") ; + view.addObject("search", TeacherOpenCourseMergeStudentQuery.class.getName()); + return view; + } + + @GetMapping(MODEL + "/edit.do") + @Function("teacherOpenCourseMergeStudent.edit") + public ModelAndView edit(Long teacherOpenCourseSchoolClassMergeStudentId) { + ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeStudent/edit.html"); + TeacherOpenCourseMergeStudent teacherOpenCourseMergeStudent = teacherOpenCourseMergeStudentService.queryById(teacherOpenCourseSchoolClassMergeStudentId); + view.addObject("teacherOpenCourseMergeStudent", teacherOpenCourseMergeStudent); + return view; + } + + @GetMapping(MODEL + "/add.do") + @Function("teacherOpenCourseMergeStudent.add") + public ModelAndView add(Long teacherOpenCourseSchoolClassMergeStudentId) { + ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeStudent/add.html"); + if(null != teacherOpenCourseSchoolClassMergeStudentId){ + TeacherOpenCourseMergeStudent teacherOpenCourseMergeStudent = teacherOpenCourseMergeStudentService.queryById(teacherOpenCourseSchoolClassMergeStudentId); + view.addObject("teacherOpenCourseMergeStudent", teacherOpenCourseMergeStudent); + }else { + view.addObject("teacherOpenCourseMergeStudent", new TeacherOpenCourseMergeStudent()); + } + return view; + } + + /* 后台接口 */ + + @PostMapping(MODEL + "/list.json") + @Function("teacherOpenCourseMergeStudent.query") + public JsonResult list(TeacherOpenCourseMergeStudentQuery condition){ + PageQuery page = condition.getPageQuery(); + teacherOpenCourseMergeStudentService.queryByCondition(page); + return JsonResult.success(page); + } + + @PostMapping(MODEL + "/addAll.json") + @Function("teacherOpenCourseMergeStudent.add") + public JsonResult addAll(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery,@SCoreUser CoreUser coreUser){ + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + teacherOpenCourseMergeStudentQuery.setUserId(coreUser.getId()); + teacherOpenCourseMergeStudentQuery.setOrgId(coreUser.getOrgId()); + String msg = teacherOpenCourseMergeStudentService.addAll(teacherOpenCourseMergeStudentQuery); + if (StringUtils.isBlank(msg)) { + return JsonResult.success(); + } else { + return JsonResult.failMessage("新增失败,"+msg); + } + } + } + + @PostMapping(MODEL + "/add.json") + @Function("teacherOpenCourseMergeStudent.add") + public JsonResult add(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery, BindingResult result,@SCoreUser CoreUser coreUser){ + if(result.hasErrors()){ + return JsonResult.failMessage(result); + }else{ + teacherOpenCourseMergeStudentQuery.setUserId(coreUser.getId()); + teacherOpenCourseMergeStudentQuery.setOrgId(coreUser.getOrgId()); + return teacherOpenCourseMergeStudentService.add(teacherOpenCourseMergeStudentQuery); + } + } + + @PostMapping(MODEL + "/edit.json") + @Function("teacherOpenCourseMergeStudent.edit") + public JsonResult update(@Validated(ValidateConfig.UPDATE.class) TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery, BindingResult result) { + if(result.hasErrors()){ + return JsonResult.failMessage(result); + }else { + teacherOpenCourseMergeStudentQuery.setUserId(null); + teacherOpenCourseMergeStudentQuery.setOrgId(null); + String msg = teacherOpenCourseMergeStudentService.edit(teacherOpenCourseMergeStudentQuery); + if (StringUtils.isBlank(msg)) { + return JsonResult.success(); + } else { + return JsonResult.failMessage("更新失败,"+msg); + } + } + } + + + @GetMapping(MODEL + "/view.json") + @Function("teacherOpenCourseMergeStudent.query") + public JsonResultqueryInfo(Long teacherOpenCourseSchoolClassMergeStudentId) { + TeacherOpenCourseMergeStudent teacherOpenCourseMergeStudent = teacherOpenCourseMergeStudentService.queryById( teacherOpenCourseSchoolClassMergeStudentId); + return JsonResult.success(teacherOpenCourseMergeStudent); + } + + @GetMapping(MODEL + "/getValues.json") + @Function("teacherOpenCourseMergeStudent.query") + public JsonResult>getValues(TeacherOpenCourseMergeStudentQuery param) { + Listlist = teacherOpenCourseMergeStudentService.getValuesByQuery(param); + return JsonResult.success(list); + } + + + @PostMapping(MODEL + "/delete.json") + @Function("teacherOpenCourseMergeStudent.delete") + @ResponseBody + public JsonResult delete(String ids) { + teacherOpenCourseMergeStudentService.deleteTeacherOpenCourseMergeStudent(ids); + return JsonResult.success(); + } + + +} diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeStudentQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeStudentQuery.java new file mode 100644 index 00000000..d53de117 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeStudentQuery.java @@ -0,0 +1,129 @@ +package com.ibeetl.jlw.web.query; + +import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.annotation.Query; +import com.ibeetl.admin.core.web.query.PageParam; +import com.ibeetl.jlw.entity.TeacherOpenCourseMergeStudent; + +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + *开课关联学生查询 + */ +public class TeacherOpenCourseMergeStudentQuery extends PageParam { + @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) + @Query(name = "课程开课-班级-学生-关联ID", display = true) + private Long teacherOpenCourseSchoolClassMergeStudentId; + @Query(name = "课程开课ID", display = true,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") + private Long teacherOpenCourseId; + @Query(name = "学生ID", display = true,type=Query.TYPE_DICT,dict="student.student_name.student_status=1") + private Long studentId; + @Query(name = "组织ID", display = false) + private Long orgId; + @Query(name = "用户ID", display = false) + private Long userId; + @Query(name = "创建时间", display = false) + private Date teacherOpenCourseSchoolClassMergeStudentAddTime; + + private String teacherOpenCourseSchoolClassMergeStudentIdPlural; + private String teacherOpenCourseIdPlural; + private String studentIdPlural; + private String orgIdPlural; + private String userIdPlural; + + private String teacherOpenCourseMergeStudentJsonStr;//json格式 + + private String _given;//指定更新的特定字段，多个逗号隔开 + + public Long getTeacherOpenCourseSchoolClassMergeStudentId(){ + return teacherOpenCourseSchoolClassMergeStudentId; + } + public void setTeacherOpenCourseSchoolClassMergeStudentId(Long teacherOpenCourseSchoolClassMergeStudentId ){ + this.teacherOpenCourseSchoolClassMergeStudentId = teacherOpenCourseSchoolClassMergeStudentId; + } + public Long getTeacherOpenCourseId(){ + return teacherOpenCourseId; + } + public void setTeacherOpenCourseId(Long teacherOpenCourseId ){ + this.teacherOpenCourseId = teacherOpenCourseId; + } + public Long getStudentId(){ + return studentId; + } + public void setStudentId(Long studentId ){ + this.studentId = studentId; + } + public Long getOrgId(){ + return orgId; + } + public void setOrgId(Long orgId ){ + this.orgId = orgId; + } + public Long getUserId(){ + return userId; + } + public void setUserId(Long userId ){ + this.userId = userId; + } + public Date getTeacherOpenCourseSchoolClassMergeStudentAddTime(){ + return teacherOpenCourseSchoolClassMergeStudentAddTime; + } + public void setTeacherOpenCourseSchoolClassMergeStudentAddTime(Date teacherOpenCourseSchoolClassMergeStudentAddTime ){ + this.teacherOpenCourseSchoolClassMergeStudentAddTime = teacherOpenCourseSchoolClassMergeStudentAddTime; + } + + public TeacherOpenCourseMergeStudent pojo(){ + TeacherOpenCourseMergeStudent pojo = new TeacherOpenCourseMergeStudent(); + pojo.setTeacherOpenCourseSchoolClassMergeStudentId(this.getTeacherOpenCourseSchoolClassMergeStudentId()); + pojo.setTeacherOpenCourseId(this.getTeacherOpenCourseId()); + pojo.setStudentId(this.getStudentId()); + pojo.setOrgId(this.getOrgId()); + pojo.setUserId(this.getUserId()); + pojo.setTeacherOpenCourseSchoolClassMergeStudentAddTime(this.getTeacherOpenCourseSchoolClassMergeStudentAddTime()); + return pojo; + } + + public String getTeacherOpenCourseSchoolClassMergeStudentIdPlural(){ + return teacherOpenCourseSchoolClassMergeStudentIdPlural; + } + public void setTeacherOpenCourseSchoolClassMergeStudentIdPlural(String teacherOpenCourseSchoolClassMergeStudentIdPlural){ + this.teacherOpenCourseSchoolClassMergeStudentIdPlural = teacherOpenCourseSchoolClassMergeStudentIdPlural; + } + public String getTeacherOpenCourseIdPlural(){ + return teacherOpenCourseIdPlural; + } + public void setTeacherOpenCourseIdPlural(String teacherOpenCourseIdPlural){ + this.teacherOpenCourseIdPlural = teacherOpenCourseIdPlural; + } + public String getStudentIdPlural(){ + return studentIdPlural; + } + public void setStudentIdPlural(String studentIdPlural){ + this.studentIdPlural = studentIdPlural; + } + public String getOrgIdPlural(){ + return orgIdPlural; + } + public void setOrgIdPlural(String orgIdPlural){ + this.orgIdPlural = orgIdPlural; + } + public String getUserIdPlural(){ + return userIdPlural; + } + public void setUserIdPlural(String userIdPlural){ + this.userIdPlural = userIdPlural; + } + public String getTeacherOpenCourseMergeStudentJsonStr(){ + return teacherOpenCourseMergeStudentJsonStr; + } + public void setTeacherOpenCourseMergeStudentJsonStr(String teacherOpenCourseMergeStudentJsonStr ){ + this.teacherOpenCourseMergeStudentJsonStr = teacherOpenCourseMergeStudentJsonStr; + } + public String get_given() { + return _given; + } + public void set_given(String _given) { + this._given = _given; + } +} diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeStudent.md b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeStudent.md new file mode 100644 index 00000000..03d28b33 --- /dev/null +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeStudent.md @@ -0,0 +1,228 @@ +queryByCondition +=== +* 根据不为空的参数进行分页查询 + + select + @pageTag(){ + t.* + @} + from teacher_open_course_merge_student t + where 1=1 + @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行 + and #function("teacherOpenCourseMergeStudent.query")# + @if(!isEmpty(teacherOpenCourseSchoolClassMergeStudentId)){ + and t.teacher_open_course_school_class_merge_student_id =#teacherOpenCourseSchoolClassMergeStudentId# + @} + @if(!isEmpty(teacherOpenCourseSchoolClassMergeStudentIdPlural)){ + and find_in_set(t.teacher_open_course_school_class_merge_student_id,#teacherOpenCourseSchoolClassMergeStudentIdPlural#) + @} + @if(!isEmpty(teacherOpenCourseId)){ + and t.teacher_open_course_id =#teacherOpenCourseId# + @} + @if(!isEmpty(teacherOpenCourseIdPlural)){ + and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#) + @} + @if(!isEmpty(studentId)){ + and t.student_id =#studentId# + @} + @if(!isEmpty(studentIdPlural)){ + and find_in_set(t.student_id,#studentIdPlural#) + @} + @if(!isEmpty(orgId)){ + and t.org_id =#orgId# + @} + @if(!isEmpty(orgIdPlural)){ + and find_in_set(t.org_id,#orgIdPlural#) + @} + @if(!isEmpty(userId)){ + and t.user_id =#userId# + @} + @if(!isEmpty(userIdPlural)){ + and find_in_set(t.user_id,#userIdPlural#) + @} + @if(!isEmpty(teacherOpenCourseSchoolClassMergeStudentAddTime)){ + and t.teacher_open_course_school_class_merge_student_add_time =#teacherOpenCourseSchoolClassMergeStudentAddTime# + @} + + +queryByConditionQuery +=== +* 根据不为空的参数进行分页查询(无权限) + + select + @pageTag(){ + t.* + @} + from teacher_open_course_merge_student t + where 1=1 + @if(!isEmpty(teacherOpenCourseSchoolClassMergeStudentId)){ + and t.teacher_open_course_school_class_merge_student_id =#teacherOpenCourseSchoolClassMergeStudentId# + @} + @if(!isEmpty(teacherOpenCourseSchoolClassMergeStudentIdPlural)){ + and find_in_set(t.teacher_open_course_school_class_merge_student_id,#teacherOpenCourseSchoolClassMergeStudentIdPlural#) + @} + @if(!isEmpty(teacherOpenCourseId)){ + and t.teacher_open_course_id =#teacherOpenCourseId# + @} + @if(!isEmpty(teacherOpenCourseIdPlural)){ + and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#) + @} + @if(!isEmpty(studentId)){ + and t.student_id =#studentId# + @} + @if(!isEmpty(studentIdPlural)){ + and find_in_set(t.student_id,#studentIdPlural#) + @} + @if(!isEmpty(orgId)){ + and t.org_id =#orgId# + @} + @if(!isEmpty(orgIdPlural)){ + and find_in_set(t.org_id,#orgIdPlural#) + @} + @if(!isEmpty(userId)){ + and t.user_id =#userId# + @} + @if(!isEmpty(userIdPlural)){ + and find_in_set(t.user_id,#userIdPlural#) + @} + @if(!isEmpty(teacherOpenCourseSchoolClassMergeStudentAddTime)){ + and t.teacher_open_course_school_class_merge_student_add_time =#teacherOpenCourseSchoolClassMergeStudentAddTime# + @} + + + + +deleteTeacherOpenCourseMergeStudentByIds +=== + +* 批量删除 + + delete from teacher_open_course_merge_student where find_in_set(teacher_open_course_school_class_merge_student_id,#ids#) + + + +getByIds +=== + +select * from teacher_open_course_merge_student where find_in_set(teacher_open_course_school_class_merge_student_id,#ids#) + + +updateGivenByIds +=== + +* 批量更新指定字段，无论此字段是否有值 + + update teacher_open_course_merge_student + set + @if(contain("teacherOpenCourseId",_given)){ + @if(isEmpty(teacherOpenCourseId)){ + teacher_open_course_id = null , + @}else{ + teacher_open_course_id = #teacherOpenCourseId# , + @} + @} + @if(contain("studentId",_given)){ + @if(isEmpty(studentId)){ + student_id = null , + @}else{ + student_id = #studentId# , + @} + @} + @if(contain("orgId",_given)){ + @if(isEmpty(orgId)){ + org_id = null , + @}else{ + org_id = #orgId# , + @} + @} + @if(contain("userId",_given)){ + @if(isEmpty(userId)){ + user_id = null , + @}else{ + user_id = #userId# , + @} + @} + @if(contain("teacherOpenCourseSchoolClassMergeStudentAddTime",_given)){ + @if(isEmpty(teacherOpenCourseSchoolClassMergeStudentAddTime)){ + teacher_open_course_school_class_merge_student_add_time = null , + @}else{ + teacher_open_course_school_class_merge_student_add_time = #teacherOpenCourseSchoolClassMergeStudentAddTime# , + @} + @} + teacher_open_course_school_class_merge_student_id = teacher_open_course_school_class_merge_student_id + where find_in_set(teacher_open_course_school_class_merge_student_id,#teacherOpenCourseSchoolClassMergeStudentIdPlural#) + + + +getTeacherOpenCourseMergeStudentValues +=== + +* 根据不为空的参数进行查询 + + select t.* + from teacher_open_course_merge_student t + where 1=1 + @if(!isEmpty(teacherOpenCourseSchoolClassMergeStudentId)){ + and t.teacher_open_course_school_class_merge_student_id =#teacherOpenCourseSchoolClassMergeStudentId# + @} + @if(!isEmpty(teacherOpenCourseId)){ + and t.teacher_open_course_id =#teacherOpenCourseId# + @} + @if(!isEmpty(studentId)){ + and t.student_id =#studentId# + @} + @if(!isEmpty(orgId)){ + and t.org_id =#orgId# + @} + @if(!isEmpty(userId)){ + and t.user_id =#userId# + @} + @if(!isEmpty(teacherOpenCourseSchoolClassMergeStudentAddTime)){ + and t.teacher_open_course_school_class_merge_student_add_time =#teacherOpenCourseSchoolClassMergeStudentAddTime# + @} + + +getValuesByQuery +=== + +* 根据不为空的参数进行查询 + + select t.* + from teacher_open_course_merge_student t + where 1=1 and #function("teacherOpenCourseMergeStudent.query")# + @if(!isEmpty(teacherOpenCourseSchoolClassMergeStudentId)){ + and t.teacher_open_course_school_class_merge_student_id =#teacherOpenCourseSchoolClassMergeStudentId# + @} + @if(!isEmpty(teacherOpenCourseSchoolClassMergeStudentIdPlural)){ + and find_in_set(t.teacher_open_course_school_class_merge_student_id,#teacherOpenCourseSchoolClassMergeStudentIdPlural#) + @} + @if(!isEmpty(teacherOpenCourseId)){ + and t.teacher_open_course_id =#teacherOpenCourseId# + @} + @if(!isEmpty(teacherOpenCourseIdPlural)){ + and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#) + @} + @if(!isEmpty(studentId)){ + and t.student_id =#studentId# + @} + @if(!isEmpty(studentIdPlural)){ + and find_in_set(t.student_id,#studentIdPlural#) + @} + @if(!isEmpty(orgId)){ + and t.org_id =#orgId# + @} + @if(!isEmpty(orgIdPlural)){ + and find_in_set(t.org_id,#orgIdPlural#) + @} + @if(!isEmpty(userId)){ + and t.user_id =#userId# + @} + @if(!isEmpty(userIdPlural)){ + and find_in_set(t.user_id,#userIdPlural#) + @} + @if(!isEmpty(teacherOpenCourseSchoolClassMergeStudentAddTime)){ + and t.teacher_open_course_school_class_merge_student_add_time =#teacherOpenCourseSchoolClassMergeStudentAddTime# + @} + + + diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md b/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md index ae162d02..975da17c 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md @@ -85,24 +85,17 @@ queryByConditionGroup * 根据不为空的参数进行分页查询 select @pageTag(){ - tz.teacher_open_course_schedule_session_id, - tz.teacher_open_course_schedule_session_day_time, - tz.teacher_open_course_schedule_session_status, - tz.teacher_open_course_id, - tz.teacher_id, - tz.school_class_Ids, - tz.org_id, - tz.user_id + tz.* @} from ( select t.teacher_open_course_schedule_session_id, - t.teacher_open_course_schedule_session_day_time, t.teacher_open_course_schedule_session_add_time, t.teacher_open_course_schedule_session_status, + GROUP_CONCAT(DISTINCT teacher_open_course_schedule_session_class_name) AS teacher_open_course_schedule_session_class_name, t.teacher_open_course_id, t.teacher_id, - t.school_class_Ids, + t.school_class_ids, t.org_id, t.user_id from teacher_open_course_schedule_session t diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeStudent/add.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeStudent/add.js new file mode 100644 index 00000000..157fec78 --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeStudent/add.js @@ -0,0 +1,38 @@ +layui.define([ 'form', 'laydate', 'table','teacherOpenCourseMergeStudentApi'], function(exports) { + var form = layui.form; + var teacherOpenCourseMergeStudentApi = layui.teacherOpenCourseMergeStudentApi; + var index = layui.index; + var view = { + init:function(){ + Lib.initGenrealForm($("#addForm"),form); + this.initSubmit(); + }, + initSubmit:function(){ + $("#addButton").click(function(){ + form.on('submit(form)', function(){ + var teacherOpenCourseSchoolClassMergeStudentId = $("#addForm input[name='teacherOpenCourseSchoolClassMergeStudentId']").val(); + if(!$.isEmpty(teacherOpenCourseSchoolClassMergeStudentId)){ + teacherOpenCourseMergeStudentApi.updateTeacherOpenCourseMergeStudent($('#addForm'),function(){ + parent.window.dataReload(); + Common.info("更新成功"); + Lib.closeFrame(); + }); + }else{ + teacherOpenCourseMergeStudentApi.addTeacherOpenCourseMergeStudent($('#addForm'),function(){ + parent.window.dataReload(); + Common.info("添加成功"); + Lib.closeFrame(); + }); + } + + }); + }); + + $("#addButton-cancel").click(function(){ + Lib.closeFrame(); + }); + } + + } + exports('add',view); +}); diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeStudent/del.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeStudent/del.js new file mode 100644 index 00000000..fc494ea0 --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeStudent/del.js @@ -0,0 +1,23 @@ +layui.define(['table', 'teacherOpenCourseMergeStudentApi'], function(exports) { + var teacherOpenCourseMergeStudentApi = layui.teacherOpenCourseMergeStudentApi; + var table=layui.table; + var view = { + init:function(){ + }, + delBatch:function(){ + var data = Common.getMoreDataFromTable(table,"teacherOpenCourseMergeStudentTable"); + if(data==null){ + return ; + } + Common.openConfirm("确认要删除这些开课关联学生?",function(){ + var ids =Common.concatBatchId(data,"teacherOpenCourseSchoolClassMergeStudentId"); + teacherOpenCourseMergeStudentApi.del(ids,function(){ + Common.info("删除成功"); + dataReload(); + }) + }) + } + } + exports('del',view); + +}); \ No newline at end of file diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeStudent/edit.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeStudent/edit.js new file mode 100644 index 00000000..096d2d0f --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeStudent/edit.js @@ -0,0 +1,28 @@ +layui.define([ 'form', 'laydate', 'table','teacherOpenCourseMergeStudentApi'], function(exports) { + var form = layui.form; + var teacherOpenCourseMergeStudentApi = layui.teacherOpenCourseMergeStudentApi; + var index = layui.index; + var view = { + init:function(){ + Lib.initGenrealForm($("#updateForm"),form); + this.initSubmit(); + }, + initSubmit:function(){ + $("#updateButton").click(function(){ + form.on('submit(form)', function(){ + teacherOpenCourseMergeStudentApi.updateTeacherOpenCourseMergeStudent($('#updateForm'),function(){ + parent.window.dataReload(); + Common.info("更新成功"); + Lib.closeFrame(); + }); + }); + }); + $("#updateButton-cancel").click(function(){ + Lib.closeFrame(); + }); + } + + } + exports('edit',view); + +}); \ No newline at end of file diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeStudent/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeStudent/index.js new file mode 100644 index 00000000..b108ffb0 --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeStudent/index.js @@ -0,0 +1,164 @@ +layui.define([ 'form', 'laydate', 'table' ], function(exports) { + var form = layui.form; + var laydate = layui.laydate; + var table = layui.table; + var teacherOpenCourseMergeStudentTable = null; + var view ={ + init:function(){ + var that = this + this.initTable(); + this.initSearchForm(); + this.initToolBar(); + window.dataReload = function(){ + Lib.doSearchForm($("#searchForm"),teacherOpenCourseMergeStudentTable) + that.initToolBar(); + } + }, + initTable:function(){ + var sx_ = localStorage.getItem("teacherOpenCourseMergeStudentTable_field_"+Common.userInfoId); //筛选值显示、隐藏缓存 + if($.isEmpty(sx_)){sx_ = {};}else {sx_ = JSON.parse(sx_);} + teacherOpenCourseMergeStudentTable = table.render({ + elem : '#teacherOpenCourseMergeStudentTable', + height : Lib.getTableHeight(1), + cellMinWidth: 100, + method : 'post', + url : Common.ctxPath + '/jlw/teacherOpenCourseMergeStudent/list.json' // 数据接口 + ,page : Lib.tablePage // 开启分页 + ,toolbar: '#toolbar_teacherOpenCourseMergeStudent' //自定义头部左侧工具栏 + ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏 + ,limit : 10, + cols : [ [ // 表头 + { + type : 'checkbox', + + }, + { + field : 'teacherOpenCourseSchoolClassMergeStudentId', + title : '课程开课-班级-学生-关联ID', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['teacherOpenCourseSchoolClassMergeStudentId'])?false:sx_['teacherOpenCourseSchoolClassMergeStudentId'], + + width : 60, + }, + { + field : 'teacherOpenCourseIdText', //数据字典类型为 teacher_open_course.teacher_open_course_title.teacher_open_course_status=1 + title : '课程开课ID', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['teacherOpenCourseIdText'])?false:sx_['teacherOpenCourseIdText'], + }, + { + field : 'studentIdText', //数据字典类型为 student.student_name.student_status=1 + title : '学生ID', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['studentIdText'])?false:sx_['studentIdText'], + }, + { + field : 'orgId', + title : '组织ID', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['orgId'])?false:sx_['orgId'], + }, + { + field : 'userId', + title : '用户ID', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['userId'])?false:sx_['userId'], + }, + { + field : 'teacherOpenCourseSchoolClassMergeStudentAddTime', + title : '创建时间', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['teacherOpenCourseSchoolClassMergeStudentAddTime'])?false:sx_['teacherOpenCourseSchoolClassMergeStudentAddTime'], + } + ,{ + field : 'operation_',title : '操作',align:"center", templet: function (d) { + var htm = ''; + htm += ''; + return htm; + } + } + + ] ] + + }); + + table.on('checkbox(teacherOpenCourseMergeStudentTable)', function(obj){ + var teacherOpenCourseMergeStudent = obj.data; + if(obj.checked){ + //按钮逻辑Lib.buttonEnable() + }else{ + + } + }) + }, + + initSearchForm:function(){ + Lib.initSearchForm( $("#searchForm"),teacherOpenCourseMergeStudentTable,form); + }, + + initToolBar:function(){ + toolbar = { + add: function () { + var url = "/jlw/teacherOpenCourseMergeStudent/add.do"; + Common.openDlg(url,"开课关联学生管理>新增"); + }, + edit: function () { + var data = Common.getOneFromTable(table,"teacherOpenCourseMergeStudentTable"); + if(data==null){ + return ; + } + var url = "/jlw/teacherOpenCourseMergeStudent/add.do?teacherOpenCourseSchoolClassMergeStudentId="+data.teacherOpenCourseSchoolClassMergeStudentId; + Common.openDlg(url,"开课关联学生管理>"+data.teacherOpenCourseSchoolClassMergeStudentId+">编辑"); + }, + del: function () { + layui.use(['del'], function(){ + var delView = layui.del + delView.delBatch(); + }); + }, + search: function () { + Lib.doSearchForm($("#searchForm"), teacherOpenCourseMergeStudentTable, 1); + view.initToolBar() + }, + refresh: function () { + searchForm.reset(); + Lib.doSearchForm($("#searchForm"), teacherOpenCourseMergeStudentTable, 1); + view.initToolBar() + }, + } + //触发事件 + $('.ext-toolbar').on('click', function() { + var type = $(this).data('type'); + toolbar[type] ? toolbar[type].call(this) : ''; + }); + + }, initTableTool: table.on('tool(teacherOpenCourseMergeStudentTable)', function (obj) { + var data = obj.data; + if (obj.event === 'edit') { + var url = "/jlw/teacherOpenCourseMergeStudent/add.do?teacherOpenCourseSchoolClassMergeStudentId="+data.teacherOpenCourseSchoolClassMergeStudentId; + Common.openDlg(url,"开课关联学生管理>"+data.teacherOpenCourseSchoolClassMergeStudentId+">编辑"); + }else if(obj.event === "del"){ + layer.confirm('是否确定删除该信息？', function (index) { + var ret = Common.postAjax("/jlw/teacherOpenCourseMergeStudent/delete.json",{ids:data.teacherOpenCourseSchoolClassMergeStudentId}); + layer.msg(ret.code == 0?"删除成功！":ret.msg, { + offset: ['50%'], + icon: ret.code == 0?1:2, + time: 1500 //2秒关闭（如果不配置，默认是3秒） + },function (){ + if(ret.code == 0){ + Lib.tableRefresh(); + } + }); + }); + } + }) + } + exports('index',view); + +}); diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeStudent/teacherOpenCourseMergeStudentApi.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeStudent/teacherOpenCourseMergeStudentApi.js new file mode 100644 index 00000000..94d3a731 --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeStudent/teacherOpenCourseMergeStudentApi.js @@ -0,0 +1,18 @@ +/*访问后台的代码*/ +layui.define([], function(exports) { + var api={ + updateTeacherOpenCourseMergeStudent:function(form,callback){ + Lib.submitForm("/jlw/teacherOpenCourseMergeStudent/edit.json",form,{},callback) + }, + addTeacherOpenCourseMergeStudent:function(form,callback){ + Lib.submitForm("/jlw/teacherOpenCourseMergeStudent/add.json",form,{},callback) + }, + del:function(ids,callback){ + Common.post("/jlw/teacherOpenCourseMergeStudent/delete.json",{"ids":ids},function(){ + callback(); + }) + } + + }; + exports('teacherOpenCourseMergeStudentApi',api); +}); \ No newline at end of file diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseMergeStudent/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeStudent/add.html new file mode 100644 index 00000000..12f62553 --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeStudent/add.html @@ -0,0 +1,58 @@ + + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+ + + + + + diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseMergeStudent/edit.html b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeStudent/edit.html new file mode 100644 index 00000000..46ff8647 --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeStudent/edit.html @@ -0,0 +1,58 @@ + + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+ + + + + + diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseMergeStudent/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeStudent/index.html new file mode 100644 index 00000000..2f949fbd --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeStudent/index.html @@ -0,0 +1,29 @@ + + + +
+ + + +