diff --git a/data_base_design/天泽数据大平台.pdb b/data_base_design/天泽数据大平台.pdb index a9893fd6..021306c6 100644 --- a/data_base_design/天泽数据大平台.pdb +++ b/data_base_design/天泽数据大平台.pdb @@ -1,5 +1,5 @@ - + @@ -4762,7 +4762,7 @@ Shadow=0 1623769194 1662982681 -1 -((-9119,51176), (6123,66472)) +((-8713,51503), (5717,66145)) 12615680 16570034 12632256 @@ -4918,7 +4918,7 @@ LABL 0 新宋体,8,N 1623826338 1662982681 -1 -((41316,49404), (68094,57500)) +((42066,49567), (67344,57337)) 12615680 16570034 12632256 @@ -5143,7 +5143,7 @@ LABL 0 新宋体,8,N 1623845173 1662982681 -1 -((96916,49454), (124106,66550)) +((97679,49822), (123343,66182)) 12615680 16570034 12632256 @@ -5193,7 +5193,7 @@ LABL 0 新宋体,8,N 1623859429 1662982681 -1 -((125618,49262), (150748,67258)) +((126318,49651), (150048,66869)) 12615680 16570034 12632256 @@ -5597,7 +5597,7 @@ LABL 0 新宋体,8,N 1627129933 1663689104 -1 -((97742,67314), (113808,74510)) +((98172,67457), (113378,74367)) 12615680 16570034 12632256 @@ -14623,11 +14623,12 @@ COLLATE = utf8_general_ci teacher_open_course_homework_setting_school_class_ids 1663859987 lx -1664170757 +1664176177 87966 班级ID集合（逗号隔开） varchar(2000) 2000 +1 9DA96F9A-14FC-4934-BDB7-D1CCC1FB86F8 @@ -17964,8 +17965,8 @@ COLLATE = utf8_general_ci resources_question_snapshot 1563157584 lx -1663940769 -lx +1664174457 +87966 资源管理 - 题库管理-快照-关联来源 auto_increment = 1 ENGINE = InnoDB @@ -17991,12 +17992,14 @@ COLLATE = utf8_general_ci from_id 1563157584 lx -1664171022 +1664174457 87966 来源ID bigint -1 -{F4F16ECD-F2F1-4006-AF6F-638D5C65F35E},MYSQL50,56={4A2BD2F3-4A8A-4421-8A48-A8029BDA28E8},Unsigned,4=true +1 +{F4F16ECD-F2F1-4006-AF6F-638D5C65F35E},MYSQL50,159={4A2BD2F3-4A8A-4421-8A48-A8029BDA28E8},Unsigned,5=false +{9480E6AA-83DD-4AA7-9C91-E48F709C29D9},CharSet,0= +{B314652C-DD43-4F81-8524-6F97A1BAACBA},Collate,0= @@ -18006,11 +18009,12 @@ COLLATE = utf8_general_ci from_type 1663937890 lx -1664171022 +1664174457 87966 来源类型（HOMEWORK...） varchar(100) 100 +1 7CC923C5-15FB-416F-9848-3A6074318CB7 diff --git a/data_base_design/天泽数据大平台.pdm b/data_base_design/天泽数据大平台.pdm index 021306c6..f3093023 100644 --- a/data_base_design/天泽数据大平台.pdm +++ b/data_base_design/天泽数据大平台.pdm @@ -1,5 +1,5 @@ - + @@ -4595,9 +4595,9 @@ Shadow=0 1662045015 -1662047569 +1664182251 ((248996,52379), (276525,52979)) -((248996,52871),(262008,52871),(262008,52679),(276525,52679)) +((248996,52628),(262008,52628),(262008,52679),(276525,52679)) 1 8 16744576 @@ -6273,9 +6273,9 @@ LABL 0 新宋体,8,N 1662044179 -1662047569 +1664182251 -1 -((239120,50172), (259774,60288)) +((239120,49840), (259774,60288)) 0 12615680 16570034 @@ -14612,10 +14612,11 @@ COLLATE = utf8_general_ci teacher_open_course_homework_id 1663942430 lx -1664170757 +1664176259 87966 题库作业ID bigint +1 1B732079-0BAA-432C-900D-C8C3CBF52938 @@ -15848,8 +15849,8 @@ COLLATE = utf8_general_ci teacher_open_course_homework_question_log 1661850632 lx -1662045090 -lx +1664182248 +87966 我的课程-题库作业-做题日志 auto_increment = 1 ENGINE = InnoDB @@ -15881,52 +15882,63 @@ COLLATE = utf8_general_ci bigint -7492312E-B2F8-4A26-A165-E1D31D254D90 -student_upload_file -student_upload_file -1662044183 -lx -1662044827 -lx -附件，学生端上传附件（单文件） -varchar(200) -200 +8F40D113-4306-4501-9973-FFAA88015492 +resources_question_snapshot_id +resources_question_snapshot_id +1664182126 +87966 +1664182237 +87966 +题目快照ID +bigint -908C4B9C-AFDD-46B4-9E2F-BC84BEB3395B -student_score -student_score -1662044856 -lx -1662044948 -lx -学生得分 -float +96FF607B-0F40-4825-9A6C-89CD8C1C5F1B +teacher_open_course_homework_question_log_answer +teacher_open_course_homework_question_log_answer +1664182126 +87966 +1664182237 +87966 +学生提交的答案 +varchar(1000) +1000 -10DDF717-440B-465D-A18F-E9935C9BA8E4 -reply_content -reply_content -1662044856 +7492312E-B2F8-4A26-A165-E1D31D254D90 +teacher_open_course_homework_question_log_upload_file +teacher_open_course_homework_question_log_upload_file +1662044183 lx -1662044948 -lx -老师评语 -varchar(500) -500 +1664182126 +87966 +附件，学生端上传附件（单文件） +varchar(1000) +1000 C06A272B-5147-40B7-8E49-1E6B509123F6 -create_time -create_time +teacher_open_course_homework_question_log_add_time +teacher_open_course_homework_question_log_add_time 1661869211 lx -1662044179 -lx +1664182115 +87966 创建时间 datetime +4EFDDD7C-101B-4ECE-A88D-B680589D6BEA +teacher_open_course_homework_question_log_status +teacher_open_course_homework_question_log_status +1664181836 +87966 +1664182121 +87966 +状态（1正常 2删除） +int + + F8795A3A-9DD9-4F5A-906A-E6964444570C org_id org_id @@ -15937,7 +15949,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 1993A879-EC68-450A-B775-D7C2671BDA96 user_id user_id @@ -15950,7 +15962,7 @@ COLLATE = utf8_general_ci - + FF4A3064-63A4-4FAD-A71D-F66FD27F3A94 Key_1 Key_1 @@ -15964,7 +15976,7 @@ COLLATE = utf8_general_ci - + @@ -15988,7 +16000,7 @@ COLLATE = utf8_general_ci } - + 03C2172E-8A06-48E0-8C25-4102C8253653 core_setting_id core_setting_id @@ -16000,7 +16012,7 @@ COLLATE = utf8_general_ci bigint 1 - + 5090D458-E136-4D46-9D89-930A55ED9A2C setting_key setting_key @@ -16012,7 +16024,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 0D922C4C-8420-482B-87B6-B0E99FBA62E0 setting_value setting_value @@ -16023,7 +16035,7 @@ COLLATE = utf8_general_ci 配置项 text - + A89D7A99-CD44-4F4E-8337-14A5D4BEE13E core_setting_stauts core_setting_stauts @@ -16034,7 +16046,7 @@ COLLATE = utf8_general_ci 状态 （1正常 2删除） int - + D4790CD3-3634-4FB5-B1F8-DDCA61E7AC11 create_time create_time @@ -16045,7 +16057,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + A9346C05-5EA0-4D30-A522-9DD5B13FCE7E org_id org_id @@ -16056,7 +16068,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + D46E4A36-6D0D-4F64-9C58-CAC3D1285F24 user_id user_id @@ -16069,7 +16081,7 @@ COLLATE = utf8_general_ci - + 8E777505-B813-4D1D-8C5F-B6F9747BA0F4 Key_1 Key_1 @@ -16078,12 +16090,12 @@ COLLATE = utf8_general_ci 1662045362 lx - + - + @@ -16101,7 +16113,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 @@ -16113,7 +16125,7 @@ COLLATE = utf8_general_ci bigint 1 - + C33241B0-D288-44ED-8554-C7086F839648 student_id student_id @@ -16124,7 +16136,7 @@ COLLATE = utf8_general_ci 学生ID bigint - + 155275C4-795A-4763-9C39-3FDF35ECECCA signin_score signin_score @@ -16135,7 +16147,7 @@ COLLATE = utf8_general_ci 签到成绩 float - + 26A9701D-C572-427D-8AD8-4D4D9DDC105D course_score course_score @@ -16146,7 +16158,7 @@ COLLATE = utf8_general_ci 章节练习成绩 float - + B1C7AFAC-3115-4EEF-855F-7578BE5C5555 real_operation_score real_operation_score @@ -16157,7 +16169,7 @@ COLLATE = utf8_general_ci 课程实操成绩 float - + AC3C7572-A095-42DE-99A5-3E8D2B9D3602 question_homework_score question_homework_score @@ -16168,7 +16180,7 @@ COLLATE = utf8_general_ci 作业成绩 float - + CB0FDAE5-DDBD-42D1-8E59-3B91E44A45C8 exam_score exam_score @@ -16179,7 +16191,7 @@ COLLATE = utf8_general_ci 考试成绩 float - + A37D010B-5B7E-4815-AC10-65C79F878234 chat_score chat_score @@ -16190,7 +16202,7 @@ COLLATE = utf8_general_ci 互动成绩 float - + D91526BC-31BA-4121-9416-7DB95281202C total_score total_score @@ -16201,7 +16213,7 @@ COLLATE = utf8_general_ci 总成绩 float - + 95464B6A-6611-4674-BBA4-EF869A472F84 manual_score manual_score @@ -16212,7 +16224,7 @@ COLLATE = utf8_general_ci 手动调整的分数 float - + 8E062DAC-DA29-4940-AEC3-1B8EFB468904 last_score last_score @@ -16223,7 +16235,7 @@ COLLATE = utf8_general_ci 最终成绩 float - + 696B62F5-6BCE-4377-8F04-F452C9FE5368 last_status last_status @@ -16235,7 +16247,7 @@ COLLATE = utf8_general_ci varchar(10) 10 - + D2334132-07CC-40C5-8A37-6F95CC12A041 org_id org_id @@ -16246,7 +16258,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 7BBBDC7F-C5E3-424A-AC3C-00E94E564F45 user_id user_id @@ -16257,7 +16269,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + CE5A2441-64A4-4C2A-8646-8D6CFE6C2A73 create_time create_time @@ -16270,7 +16282,7 @@ COLLATE = utf8_general_ci - + 6B3359F7-B844-4B95-9C3B-A4AAFBA27617 Key_1 Key_1 @@ -16279,12 +16291,12 @@ COLLATE = utf8_general_ci 1662045706 lx - + - + @@ -16307,7 +16319,7 @@ COLLATE = utf8_general_ci } - + 318651DC-E71A-449A-96A8-19F27C71F4AC teacher_open_course_notice_id teacher_open_course_notice_id @@ -16319,7 +16331,7 @@ COLLATE = utf8_general_ci bigint 1 - + F972E98C-839A-4F8E-B2B7-A92F064483DB school_class_ids school_class_ids @@ -16331,7 +16343,7 @@ COLLATE = utf8_general_ci varchar(2000) 2000 - + E3F89C48-E4A1-4B9B-AE85-66EE2378EC58 teacher_open_course_ids teacher_open_course_ids @@ -16343,7 +16355,7 @@ COLLATE = utf8_general_ci varchar(2000) 2000 - + 9072D638-91A2-45E3-B01A-56FD07AC2DBC notice_title notice_title @@ -16355,7 +16367,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 2AED03DE-64F7-47AF-810B-CC78F23EEF22 notice_content notice_content @@ -16367,7 +16379,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 08862E80-7DDC-40DF-8E1B-DCFED6B33AC8 create_time create_time @@ -16378,7 +16390,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + A04525A6-FB16-4CCC-9753-4907D73BA676 create_by_teacher_id create_by_teacher_id @@ -16389,7 +16401,7 @@ COLLATE = utf8_general_ci 消息创建--老师ID bigint - + 3B6BA47A-A3E1-41B3-B8E8-B877AF7DFB5B org_id org_id @@ -16400,7 +16412,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + E49B7F20-513A-4E10-BEE8-D5B768200303 user_id user_id @@ -16411,7 +16423,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + C28FF8AA-D0BD-4EFE-8BEE-802D56989498 del_flag del_flag @@ -16424,7 +16436,7 @@ COLLATE = utf8_general_ci - + 3D2650BD-129F-48EC-B75C-872417A4E822 Key_1 Key_1 @@ -16433,12 +16445,12 @@ COLLATE = utf8_general_ci 1662046440 lx - + - + @@ -16461,7 +16473,7 @@ COLLATE = utf8_general_ci } - + 3DB701D7-DA2C-4296-853B-38D2E719CCA6 teacher_open_course_knowledge_point_id teacher_open_course_knowledge_point_id @@ -16473,7 +16485,7 @@ COLLATE = utf8_general_ci bigint 1 - + 171BF047-E676-4C5B-89B3-8B25136416A7 teacher_open_course_id teacher_open_course_id @@ -16484,7 +16496,7 @@ COLLATE = utf8_general_ci 课程开课ID bigint - + 0B7D7F9A-015D-42DD-8116-30CEC65236D8 chapter_id chapter_id @@ -16495,7 +16507,7 @@ COLLATE = utf8_general_ci 章节ID bigint - + E622D525-8AFB-4926-AE32-117E18C429E0 teacher_open_course_knowledge_point_title teacher_open_course_knowledge_point_title @@ -16507,7 +16519,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 @@ -16519,7 +16531,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 @@ -16530,7 +16542,7 @@ COLLATE = utf8_general_ci 状态 （1正常 2删除） int - + 35B92FEF-A383-4FD2-AAC3-10355BCA6896 create_time create_time @@ -16541,7 +16553,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 2745088B-3993-46E7-9035-2EF382FEC082 org_id org_id @@ -16552,7 +16564,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 9699889E-0268-4565-971A-41D449A2A5F2 user_id user_id @@ -16565,7 +16577,7 @@ COLLATE = utf8_general_ci - + 75299271-38A3-44A7-824D-00792734CF12 Key_1 Key_1 @@ -16574,12 +16586,12 @@ COLLATE = utf8_general_ci 1662047767 lx - + - + @@ -16597,7 +16609,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 326FA1E3-0BA3-420E-8242-ED8A4A4F0617 student_client_link_id student_client_link_id @@ -16609,7 +16621,7 @@ COLLATE = utf8_general_ci bigint 1 - + E2FC1BD3-0EBA-4330-A432-204E68A01861 student_client_link_order student_client_link_order @@ -16620,7 +16632,7 @@ COLLATE = utf8_general_ci 导航栏排序 int - + A897CD71-A97A-450E-92FA-72474727C640 student_client_link_title student_client_link_title @@ -16632,7 +16644,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + B988F3BD-EEE2-40FB-9E5E-73ABC59935D9 student_client_link_content student_client_link_content @@ -16644,7 +16656,7 @@ COLLATE = utf8_general_ci varchar(2000) 2000 - + C9FBBBB6-7477-4B29-8A15-08222FB01DE8 student_client_link_type student_client_link_type @@ -16656,7 +16668,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + B5987B41-6AE9-469F-A36F-48C3C9674252 student_client_link_img student_client_link_img @@ -16667,7 +16679,7 @@ COLLATE = utf8_general_ci 链接图片（可用于轮播大图，icon小图等功能） text - + DD99CF28-4303-4935-8168-CE022C8C31CD student_client_link_status student_client_link_status @@ -16678,7 +16690,7 @@ COLLATE = utf8_general_ci 状态（ 1 正常 2删除） int - + 963FA155-9A25-41BA-8B52-209536B76758 student_client_link_open_type student_client_link_open_type @@ -16690,7 +16702,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + 05CE988B-2AF5-4A63-9451-25A9EF95C5DB create_time create_time @@ -16701,7 +16713,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 1E5FBB70-DADA-4251-9BDA-85E132223109 user_id user_id @@ -16712,7 +16724,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + F1483087-727F-4BFE-97BA-9692FD8D1AB2 org_id org_id @@ -16725,7 +16737,7 @@ COLLATE = utf8_general_ci - + B095A5B3-D6C4-40C4-B986-497B3849ED54 Key_1 Key_1 @@ -16734,12 +16746,12 @@ COLLATE = utf8_general_ci 1662554252 lx - + - + @@ -16757,7 +16769,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + CCCB7690-1E0F-4355-AC7A-ABB58CC8632B university_system_id university_system_id @@ -16769,7 +16781,7 @@ COLLATE = utf8_general_ci bigint 1 - + B0D08F82-9D1C-42E8-B332-4422FC72BF67 university_system_name university_system_name @@ -16781,7 +16793,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 8A8F809D-A11E-4F1E-AB4B-C8B02D1DA3AB university_system_contact university_system_contact @@ -16793,7 +16805,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + 1F10D7BD-3F66-4E4E-AA41-06A06D9D00D1 university_system_contact_tel university_system_contact_tel @@ -16805,7 +16817,7 @@ COLLATE = utf8_general_ci varchar(20) 20 - + 139361B7-C257-4094-9BCE-1F8A44668480 university_system_add_time university_system_add_time @@ -16816,7 +16828,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 7BA84D60-66CD-47EA-8DCB-025AEFC85CFF university_system_status university_system_status @@ -16827,7 +16839,7 @@ COLLATE = utf8_general_ci 状态 （1正常 2删除） int - + EE6D1A35-06C2-4560-B40B-D1E87CA5F291 university_faculty_id university_faculty_id @@ -16838,7 +16850,7 @@ COLLATE = utf8_general_ci 院系ID（学院ID） int - + 87AEE496-5BD2-4A50-ACC8-980A708FC4DB user_id user_id @@ -16849,7 +16861,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + 6D140299-48E6-4630-99C8-D96E361AB3B1 org_id org_id @@ -16862,7 +16874,7 @@ COLLATE = utf8_general_ci - + F02FEAFC-6CDC-461B-BCD4-A60CB97164BA Key_1 Key_1 @@ -16871,12 +16883,12 @@ COLLATE = utf8_general_ci 1662648377 lx - + - + @@ -16894,7 +16906,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 884F2204-DCE1-485E-A4B2-D4378BEE2044 university_faculty_id university_faculty_id @@ -16906,7 +16918,7 @@ COLLATE = utf8_general_ci bigint 1 - + 2AB481C3-D261-4ADD-B9F9-146124372F4B university_faculty_name university_faculty_name @@ -16918,7 +16930,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 04BE427C-8D5A-48B8-808F-80D87158F9E4 university_faculty_contact university_faculty_contact @@ -16930,7 +16942,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + A6EF43AB-F19B-4BE5-B34E-D4AE59D57B17 university_faculty_contact_tel university_faculty_contact_tel @@ -16942,7 +16954,7 @@ COLLATE = utf8_general_ci varchar(20) 20 - + C8BE2BF4-F676-43CB-A1CE-369836C8D540 university_faculty_contact_address university_faculty_contact_address @@ -16954,7 +16966,7 @@ COLLATE = utf8_general_ci varchar(200) 200 - + 68386B1B-1359-4E14-80BB-D40EB3E6D05E universities_colleges_id universities_colleges_id @@ -16965,7 +16977,7 @@ COLLATE = utf8_general_ci 院校ID （院系的上一级） bigint - + 34891715-8E26-4F10-A789-93454383373B university_faculty_status university_faculty_status @@ -16976,7 +16988,7 @@ COLLATE = utf8_general_ci 状态（ 1 正常 2删除） int - + 7EA4E9C0-C919-4B3F-8300-66888606CDFE university_faculty_add_time university_faculty_add_time @@ -16987,7 +16999,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 860EA0A3-DB84-4B76-BB61-CD32C4838D5E user_id user_id @@ -16998,7 +17010,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + 6D5D545B-7423-4471-B969-D5AD4F7D6459 org_id org_id @@ -17011,7 +17023,7 @@ COLLATE = utf8_general_ci - + 8827D654-DDB8-4D1E-A500-362CE79333F8 Key_1 Key_1 @@ -17020,12 +17032,12 @@ COLLATE = utf8_general_ci 1662648708 lx - + - + @@ -17043,7 +17055,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 @@ -17055,7 +17067,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 @@ -17067,7 +17079,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 @@ -17079,7 +17091,7 @@ COLLATE = utf8_general_ci bigint 1 - + B86F6DCB-0565-4214-A6DA-1A973CE66EA1 org_id org_id @@ -17090,7 +17102,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 056FDBB3-D0F8-4845-BD40-72B5A4B1932F user_id user_id @@ -17101,7 +17113,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 @@ -17114,7 +17126,7 @@ COLLATE = utf8_general_ci - + 8F5B1BAF-BE16-44DE-8DF5-9A1EAD731C04 Key_1 Key_1 @@ -17123,12 +17135,12 @@ COLLATE = utf8_general_ci 1662808852 lx - + - + @@ -17146,7 +17158,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 @@ -17158,7 +17170,7 @@ COLLATE = utf8_general_ci bigint 1 - + 84F8C272-4766-4209-9667-728323948B7D teacher_open_course_schedule_session_add_time teacher_open_course_schedule_session_add_time @@ -17169,7 +17181,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 379DA977-579C-4E07-B57C-A112F3DDE178 teacher_open_course_schedule_session_status teacher_open_course_schedule_session_status @@ -17180,7 +17192,7 @@ COLLATE = utf8_general_ci 状态（1正常 2删除） int - + D506683D-A194-4D05-ADB9-BB50C1250024 teacher_open_course_id teacher_open_course_id @@ -17191,7 +17203,7 @@ COLLATE = utf8_general_ci 课程开课ID bigint - + 3C52ADED-57C3-4912-BE68-3F75ADDB2382 teacher_id teacher_id @@ -17202,7 +17214,7 @@ COLLATE = utf8_general_ci 教师ID bigint - + 8CD1F62C-46A8-4CF0-B2BD-294B7516B104 school_class_Ids school_class_Ids @@ -17214,7 +17226,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 @@ -17226,7 +17238,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 @@ -17238,7 +17250,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 @@ -17249,7 +17261,7 @@ COLLATE = utf8_general_ci 周次 int - + A6D7EF46-7437-4280-B26D-396E02AF3FBD org_id org_id @@ -17260,7 +17272,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 4DCDE709-2B62-4BCE-B430-60038263BD7B user_id user_id @@ -17273,7 +17285,7 @@ COLLATE = utf8_general_ci - + F50CC5A3-3465-4699-8F69-A29E98FE137C Key_1 Key_1 @@ -17282,12 +17294,12 @@ COLLATE = utf8_general_ci 1662809607 lx - + - + @@ -17305,7 +17317,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 @@ -17317,7 +17329,7 @@ COLLATE = utf8_general_ci bigint 1 - + B09D0BDB-132E-4575-8B29-2EE351C1FE23 teacher_open_course_id teacher_open_course_id @@ -17328,7 +17340,7 @@ COLLATE = utf8_general_ci 课程开课ID bigint - + 7E53D94D-754B-44D9-959E-A49A6AFCA849 teacher_id teacher_id @@ -17339,7 +17351,7 @@ COLLATE = utf8_general_ci 教师ID bigint - + 3A68DDB6-31E8-415D-B94B-92B9DF070D92 teacher_open_course_merge_teacher_status teacher_open_course_merge_teacher_status @@ -17350,7 +17362,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 @@ -17361,7 +17373,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 @@ -17374,7 +17386,7 @@ COLLATE = utf8_general_ci 10 1 - + 279FE47F-88A8-4633-A510-B081884ABC72 org_id org_id @@ -17385,7 +17397,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + CB1C06E4-C2EC-48D0-B1DA-529BE729E99E user_id user_id @@ -17398,7 +17410,7 @@ COLLATE = utf8_general_ci - + C35D2586-F094-4112-8601-9F10D6A9DB41 Key_1 Key_1 @@ -17407,12 +17419,12 @@ COLLATE = utf8_general_ci 1662865695 lx - + - + @@ -17430,7 +17442,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 17B370CF-378E-4E64-A980-89882213C82C teacher_open_course_merge_school_class_id teacher_open_course_merge_school_class_id @@ -17442,7 +17454,7 @@ COLLATE = utf8_general_ci bigint 1 - + 236A83D5-0BEE-4129-8525-6B8D3A1B4EC6 teacher_open_course_id teacher_open_course_id @@ -17453,7 +17465,7 @@ COLLATE = utf8_general_ci 教师开课ID bigint - + 6EEFBCF7-F309-4402-9BC6-A8BD70197B84 school_class_id school_class_id @@ -17464,7 +17476,7 @@ COLLATE = utf8_general_ci 班级ID bigint - + CD1F7C9F-FAA1-48E5-B65E-A4677E110748 teacher_open_course_merge_school_class_status teacher_open_course_merge_school_class_status @@ -17475,7 +17487,7 @@ COLLATE = utf8_general_ci 状态（1启用 2禁用） int - + C090103F-8A84-4BDA-A330-9AE196279EB2 teacher_open_course_merge_school_class_add_time teacher_open_course_merge_school_class_add_time @@ -17486,7 +17498,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 7B7183A9-BB12-43ED-B36E-F3143A525E40 org_id org_id @@ -17497,7 +17509,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 9174FB98-B263-42AB-9B54-6F9CBBA31A42 user_id user_id @@ -17510,7 +17522,7 @@ COLLATE = utf8_general_ci - + 2AFFDC6B-82E6-4E75-8F04-36F0FCDAD767 Key_1 Key_1 @@ -17519,12 +17531,12 @@ COLLATE = utf8_general_ci 1662982569 lx - + - + @@ -17542,7 +17554,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + FB211503-CF3E-4103-B61C-2E325317C715 data_contest_application_id data_contest_application_id @@ -17554,7 +17566,7 @@ COLLATE = utf8_general_ci bigint 1 - + 3EA632DB-A439-4642-9D80-00C4162E3D55 data_contest_application_name data_contest_application_name @@ -17565,7 +17577,7 @@ COLLATE = utf8_general_ci 大赛名称 int - + 5EEBC61F-D540-4B9F-BC81-9A7686F4CDF5 data_contest_application_host_name data_contest_application_host_name @@ -17577,7 +17589,7 @@ COLLATE = utf8_general_ci varchar(200) 200 - + 1C6BBDA4-F9EE-4CA1-BB5D-06670A2F4123 data_contest_application_technical_name data_contest_application_technical_name @@ -17589,7 +17601,7 @@ COLLATE = utf8_general_ci varchar(200) 200 - + E13737EE-A348-45CD-8CB2-7121F0BEB925 data_contest_application_lowest_number data_contest_application_lowest_number @@ -17600,7 +17612,7 @@ COLLATE = utf8_general_ci 参与最低人数 int - + 36AD5B45-E7B1-4921-B976-F32F2FB68819 data_contest_application_highest_number data_contest_application_highest_number @@ -17611,7 +17623,7 @@ COLLATE = utf8_general_ci 参与最高人数 int - + 15593A04-28EB-46C8-A5F2-55297E67B2C5 data_contest_application_status data_contest_application_status @@ -17622,7 +17634,7 @@ COLLATE = utf8_general_ci 状态（ 1 正常 2删除） int - + 1D111CDF-52D5-4666-86F0-EE3A6253D200 data_contest_application_model data_contest_application_model @@ -17634,7 +17646,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + 6A6E7C74-8503-4C41-A3CC-AB7600975C83 data_contest_application_add_time data_contest_application_add_time @@ -17645,7 +17657,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 618BF08C-52DE-4104-878C-F4C852499EDC user_id user_id @@ -17656,7 +17668,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + 86EE9B2C-375E-43DD-A5E3-442A1C7B68F8 org_id org_id @@ -17667,7 +17679,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 69E30F12-548D-4F86-AF60-423761BC363F data_contest_application_apply_start_time data_contest_application_apply_start_time @@ -17678,7 +17690,7 @@ COLLATE = utf8_general_ci 报名开始时间 datetime - + B033AC6A-AD19-4BDB-9C21-160BD3FFB825 data_contest_application_apply_end_time data_contest_application_apply_end_time @@ -17689,7 +17701,7 @@ COLLATE = utf8_general_ci 报名结束时间 datetime - + D39E9505-70CC-448B-8D7D-99F588F8426D data_contest_application_try_play_start_time data_contest_application_try_play_start_time @@ -17700,7 +17712,7 @@ COLLATE = utf8_general_ci 试玩开始时间 datetime - + 8E5672AE-76FC-48A1-A626-8074CAA46BB3 data_contest_application_try_play_end_time data_contest_application_try_play_end_time @@ -17711,7 +17723,7 @@ COLLATE = utf8_general_ci 试玩结束时间 datetime - + 97B3D96F-68C3-4E5E-9859-86A1A64A0E55 data_contest_application_stage_start_time data_contest_application_stage_start_time @@ -17722,7 +17734,7 @@ COLLATE = utf8_general_ci 大赛开始时间 datetime - + 0A898BC9-890E-496F-8263-ED3A460A3574 data_contest_application_stage_end_time data_contest_application_stage_end_time @@ -17733,7 +17745,7 @@ COLLATE = utf8_general_ci 大赛结束时间 datetime - + 6359ED80-8E01-41C8-A409-10DEEDFF293C data_contest_application_shrink_img data_contest_application_shrink_img @@ -17745,7 +17757,7 @@ COLLATE = utf8_general_ci varchar(1000) 1000 - + ECEF8ECF-C531-4ADE-8BBA-25BE7DD95249 data_contest_application_carousel_img data_contest_application_carousel_img @@ -17759,7 +17771,7 @@ COLLATE = utf8_general_ci - + B03D33F0-85A3-419F-8575-83AC3B8F2AAF Key_1 Key_1 @@ -17768,12 +17780,12 @@ COLLATE = utf8_general_ci 1663686482 87966 - + - + @@ -17791,7 +17803,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 37C90E98-0F71-453A-9BB7-BCF0E255B57E teacher_open_course_schedule_session_snap_id teacher_open_course_schedule_session_snap_id @@ -17803,7 +17815,7 @@ COLLATE = utf8_general_ci bigint 1 - + F2F5E447-FAD6-4BE6-BA46-51C24C2BDBD4 teacher_open_course_schedule_session_id teacher_open_course_schedule_session_id @@ -17814,7 +17826,7 @@ COLLATE = utf8_general_ci 关联排课ID bigint - + 70519675-39D3-4A62-BE68-038DF130B07D teacher_open_course_id teacher_open_course_id @@ -17825,7 +17837,7 @@ COLLATE = utf8_general_ci 教师开课ID bigint - + A7BF3423-E11D-416F-A731-F45356E01DA9 teacher_open_course_schedule_session_snap_status teacher_open_course_schedule_session_snap_status @@ -17836,7 +17848,7 @@ COLLATE = utf8_general_ci 状态（1正常 2删除） int - + 2A1826B2-F029-47F5-88EA-8E840861A445 teacher_open_course_schedule_session_tag_name teacher_open_course_schedule_session_tag_name @@ -17848,7 +17860,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 70662FD1-C20F-4B7C-BFED-66B4A94EBD61 teacher_open_course_schedule_session_tag_duration teacher_open_course_schedule_session_tag_duration @@ -17859,7 +17871,7 @@ COLLATE = utf8_general_ci 课程时长（分钟） int - + 3E372D23-EA27-45DF-A011-4B6D6383E811 teacher_open_course_schedule_session_day_time teacher_open_course_schedule_session_day_time @@ -17871,7 +17883,7 @@ COLLATE = utf8_general_ci varchar(20) 20 - + 16A7E02B-46FB-4640-86EE-AABB4E9C3E1A teacher_open_course_schedule_session_tag_start_time teacher_open_course_schedule_session_tag_start_time @@ -17883,7 +17895,7 @@ COLLATE = utf8_general_ci varchar(10) 10 - + 6FFBF9E4-D1A0-45F1-B109-BA039EB05C86 teacher_open_course_schedule_session_tag_end_time teacher_open_course_schedule_session_tag_end_time @@ -17895,7 +17907,7 @@ COLLATE = utf8_general_ci varchar(10) 10 - + 6C030A2B-C219-4C7D-A44D-EA4A86820E5C teacher_open_course_schedule_session_class_name teacher_open_course_schedule_session_class_name @@ -17907,7 +17919,7 @@ COLLATE = utf8_general_ci varchar(255) 255 - + 24CA63C4-331D-4E55-A333-A20B4A6DE11F teacher_open_course_schedule_session_snap_add_time teacher_open_course_schedule_session_snap_add_time @@ -17918,7 +17930,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + CB6EFB98-C675-42D2-8BE1-87A762BAFBA1 org_id org_id @@ -17929,7 +17941,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 2C5F2D72-CD86-4110-B751-E1A9F8DC1EE4 user_id user_id @@ -17942,7 +17954,7 @@ COLLATE = utf8_general_ci - + 34B82EA4-DFF5-4DAA-8DC5-88016A7E9853 Key_1 Key_1 @@ -17951,12 +17963,12 @@ COLLATE = utf8_general_ci 1663743144 87966 - + - + @@ -17974,7 +17986,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + AC155EE6-EF64-45BB-B846-41E20125AC83 resources_question_snapshot_id resources_question_snapshot_id @@ -17986,7 +17998,7 @@ COLLATE = utf8_general_ci bigint 1 - + D00F59E0-A483-453B-B382-AD18F74C0ABB from_id from_id @@ -18003,7 +18015,7 @@ COLLATE = utf8_general_ci - + 4CD5F796-DD7D-4978-9E99-2F93C55A9DE6 from_type from_type @@ -18016,7 +18028,7 @@ COLLATE = utf8_general_ci 100 1 - + 7CC923C5-15FB-416F-9848-3A6074318CB7 course_info_id course_info_id @@ -18027,7 +18039,7 @@ COLLATE = utf8_general_ci 课程ID bigint - + C2F9DA27-4C8F-4E1C-8FC7-097B5D5E2112 question_type question_type @@ -18039,7 +18051,7 @@ COLLATE = utf8_general_ci int(2) 2 - + D0F029A5-D1D5-41C6-A45A-8C02F71554D4 question_score question_score @@ -18052,7 +18064,7 @@ COLLATE = utf8_general_ci 3 1 - + 0ECC9C70-B0C6-4B6A-AA55-900348999E97 question_stem question_stem @@ -18064,7 +18076,7 @@ COLLATE = utf8_general_ci varchar(3000) 3000 - + 3A2CD667-596E-4179-A1C3-C84574CC2D35 question_option_a question_option_a @@ -18076,7 +18088,7 @@ COLLATE = utf8_general_ci varchar(1000) 1000 - + 904C4226-FB16-49BB-BD20-7D4B75F9F84D question_option_b question_option_b @@ -18088,7 +18100,7 @@ COLLATE = utf8_general_ci varchar(1000) 1000 - + 65D90F75-0EE9-4B45-9ABA-E0134A1861B6 question_option_c question_option_c @@ -18100,7 +18112,7 @@ COLLATE = utf8_general_ci varchar(1000) 1000 - + 5372673F-EFA4-43E1-A307-9015247C3F08 question_option_d question_option_d @@ -18112,7 +18124,7 @@ COLLATE = utf8_general_ci varchar(1000) 1000 - + 73EBF1AA-5D7F-49B4-BDDD-F43924A73C10 question_option_e question_option_e @@ -18124,7 +18136,7 @@ COLLATE = utf8_general_ci varchar(1000) 1000 - + 7AF50FDC-012A-42EB-A0EA-ADE08E1C234B question_answer question_answer @@ -18136,7 +18148,7 @@ COLLATE = utf8_general_ci varchar(255) 255 - + C73F0E11-433D-4331-98DF-1BFDFDBC7071 question_analysis question_analysis @@ -18148,7 +18160,7 @@ COLLATE = utf8_general_ci varchar(3000) 3000 - + ECFF01FA-E7F1-4AC3-A90C-02D6558F5528 question_status question_status @@ -18160,7 +18172,7 @@ COLLATE = utf8_general_ci int(2) 2 - + 97AAC8D6-13BD-4D2E-9C79-FF779394577C user_id user_id @@ -18171,7 +18183,7 @@ COLLATE = utf8_general_ci 后台用户ID bigint - + 81D26B2E-3769-4C43-A6F5-CBCD440252BC org_id org_id @@ -18184,7 +18196,7 @@ COLLATE = utf8_general_ci - + 7392447A-2744-4FA6-A36F-A826153E895A Key_1 Key_1 @@ -18193,17 +18205,17 @@ COLLATE = utf8_general_ci 1664171022 87966 - + - + - + BFEA4109-96F9-4074-AF58-B84D6574A7FC PUBLIC PUBLIC @@ -18331,7 +18343,7 @@ COLLATE = utf8_general_ci - + ABEFC813-1056-4507-A9A7-809C149B4ABE 1661954753 lx @@ -18554,7 +18566,7 @@ COLLATE = utf8_general_ci - + 5963E417-B2CE-431D-988A-B3493AAE5EE4 MySQL 5.0 MYSQL50 diff --git a/doc/sql/mysql/tianze-pro.sql b/doc/sql/mysql/tianze-pro.sql index e336420d..13c45f12 100644 --- a/doc/sql/mysql/tianze-pro.sql +++ b/doc/sql/mysql/tianze-pro.sql @@ -28629,18 +28629,30 @@ alter table teacher_open_course_homework comment '我的课程-题库作业'; -- ---------------------------- -- Table structure for teacher_open_course_homework_question_log -- ---------------------------- -DROP TABLE IF EXISTS `teacher_open_course_homework_question_log`; -CREATE TABLE `teacher_open_course_homework_question_log` ( - `teacher_open_course_homework_question_log_id` bigint(20) NOT NULL COMMENT '学生做题日志ID', - `teacher_open_course_question_homework_id` bigint(20) NULL DEFAULT NULL COMMENT '题库作业ID', - `student_upload_file` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '附件，学生端上传附件（单文件）', - `student_score` float NULL DEFAULT NULL COMMENT '学生得分', - `reply_content` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '老师评语', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', - `org_id` bigint(20) NULL DEFAULT NULL COMMENT '组织ID', - `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户ID', - PRIMARY KEY (`teacher_open_course_homework_question_log_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '我的课程-题库作业-做题日志' ROW_FORMAT = DYNAMIC; +drop table if exists teacher_open_course_homework_question_log; + +/*==============================================================*/ +/* Table: teacher_open_course_homework_question_log */ +/*==============================================================*/ +create table teacher_open_course_homework_question_log +( + teacher_open_course_homework_question_log_id bigint not null comment '学生做题日志ID', + teacher_open_course_question_homework_id bigint comment '题库作业ID', + resources_question_snapshot_id bigint comment '题目快照ID', + teacher_open_course_homework_question_log_answer varchar(1000) comment '学生提交的答案', + teacher_open_course_homework_question_log_upload_file varchar(1000) comment '附件，学生端上传附件（单文件）', + teacher_open_course_homework_question_log_add_time datetime comment '创建时间', + teacher_open_course_homework_question_log_status int comment '状态（1正常 2删除）', + org_id bigint comment '组织ID', + user_id bigint comment '用户ID', + primary key (teacher_open_course_homework_question_log_id) +) +auto_increment = 1 +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8 +COLLATE = utf8_general_ci; + +alter table teacher_open_course_homework_question_log comment '我的课程-题库作业-做题日志'; -- ---------------------------- -- Records of teacher_open_course_homework_question_log diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHomeworkQuestionLogDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHomeworkQuestionLogDao.java new file mode 100644 index 00000000..1d205232 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHomeworkQuestionLogDao.java @@ -0,0 +1,27 @@ +package com.ibeetl.jlw.dao; + +import com.ibeetl.jlw.entity.TeacherOpenCourseHomeworkQuestionLog; +import com.ibeetl.jlw.web.query.TeacherOpenCourseHomeworkQuestionLogQuery; +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.teacherOpenCourseHomeworkQuestionLog") +public interface TeacherOpenCourseHomeworkQuestionLogDao extends BaseMapper{ + PageQuery queryByCondition(PageQuery query); + PageQuery queryByConditionQuery(PageQuery query); + @Update + void deleteTeacherOpenCourseHomeworkQuestionLogByIds(String ids); + @Update + void deleteByIds(String ids); + @Update + int updateGivenByIds(TeacherOpenCourseHomeworkQuestionLogQuery teacherOpenCourseHomeworkQuestionLogQuery); + List getByIds(String ids); + List getValuesByQuery(TeacherOpenCourseHomeworkQuestionLogQuery teacherOpenCourseHomeworkQuestionLogQuery); +} diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHomeworkQuestionLog.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHomeworkQuestionLog.java new file mode 100644 index 00000000..4270ec53 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHomeworkQuestionLog.java @@ -0,0 +1,180 @@ +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-26 +*/ +public class TeacherOpenCourseHomeworkQuestionLog extends BaseEntity{ + + //学生做题日志ID + @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) + @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseHomeworkQuestionLog") + + private Long teacherOpenCourseHomeworkQuestionLogId ; + + //题库作业ID + @Dict(type="teacher_open_course_homework.teacher_open_course_homework_name.teacher_open_course_homework_status=1") + + private Long teacherOpenCourseQuestionHomeworkId ; + + //题目快照ID + @Dict(type="resources_question_snapshot.question_stem.question_status=1") + + private Long resourcesQuestionSnapshotId ; + + //学生提交的答案 + + private String teacherOpenCourseHomeworkQuestionLogAnswer ; + + //附件，学生端上传附件（单文件） + + private String teacherOpenCourseHomeworkQuestionLogUploadFile ; + + //创建时间 + + private Date teacherOpenCourseHomeworkQuestionLogAddTime ; + + //状态（1正常 2删除） + @Dict(type="global_status") + + private Integer teacherOpenCourseHomeworkQuestionLogStatus ; + + //组织ID + + private Long orgId ; + + //用户ID + + private Long userId ; + + public TeacherOpenCourseHomeworkQuestionLog(){ + } + + /**学生做题日志ID + *@return + */ + public Long getTeacherOpenCourseHomeworkQuestionLogId(){ + return teacherOpenCourseHomeworkQuestionLogId; + } + /**学生做题日志ID + *@param teacherOpenCourseHomeworkQuestionLogId + */ + public void setTeacherOpenCourseHomeworkQuestionLogId(Long teacherOpenCourseHomeworkQuestionLogId){ + this.teacherOpenCourseHomeworkQuestionLogId = teacherOpenCourseHomeworkQuestionLogId; + } + + /**题库作业ID + *@return + */ + public Long getTeacherOpenCourseQuestionHomeworkId(){ + return teacherOpenCourseQuestionHomeworkId; + } + /**题库作业ID + *@param teacherOpenCourseQuestionHomeworkId + */ + public void setTeacherOpenCourseQuestionHomeworkId(Long teacherOpenCourseQuestionHomeworkId){ + this.teacherOpenCourseQuestionHomeworkId = teacherOpenCourseQuestionHomeworkId; + } + + /**题目快照ID + *@return + */ + public Long getResourcesQuestionSnapshotId(){ + return resourcesQuestionSnapshotId; + } + /**题目快照ID + *@param resourcesQuestionSnapshotId + */ + public void setResourcesQuestionSnapshotId(Long resourcesQuestionSnapshotId){ + this.resourcesQuestionSnapshotId = resourcesQuestionSnapshotId; + } + + /**学生提交的答案 + *@return + */ + public String getTeacherOpenCourseHomeworkQuestionLogAnswer(){ + return teacherOpenCourseHomeworkQuestionLogAnswer; + } + /**学生提交的答案 + *@param teacherOpenCourseHomeworkQuestionLogAnswer + */ + public void setTeacherOpenCourseHomeworkQuestionLogAnswer(String teacherOpenCourseHomeworkQuestionLogAnswer){ + this.teacherOpenCourseHomeworkQuestionLogAnswer = teacherOpenCourseHomeworkQuestionLogAnswer; + } + + /**附件，学生端上传附件（单文件） + *@return + */ + public String getTeacherOpenCourseHomeworkQuestionLogUploadFile(){ + return teacherOpenCourseHomeworkQuestionLogUploadFile; + } + /**附件，学生端上传附件（单文件） + *@param teacherOpenCourseHomeworkQuestionLogUploadFile + */ + public void setTeacherOpenCourseHomeworkQuestionLogUploadFile(String teacherOpenCourseHomeworkQuestionLogUploadFile){ + this.teacherOpenCourseHomeworkQuestionLogUploadFile = teacherOpenCourseHomeworkQuestionLogUploadFile; + } + + /**创建时间 + *@return + */ + public Date getTeacherOpenCourseHomeworkQuestionLogAddTime(){ + return teacherOpenCourseHomeworkQuestionLogAddTime; + } + /**创建时间 + *@param teacherOpenCourseHomeworkQuestionLogAddTime + */ + public void setTeacherOpenCourseHomeworkQuestionLogAddTime(Date teacherOpenCourseHomeworkQuestionLogAddTime){ + this.teacherOpenCourseHomeworkQuestionLogAddTime = teacherOpenCourseHomeworkQuestionLogAddTime; + } + + /**状态（1正常 2删除） + *@return + */ + public Integer getTeacherOpenCourseHomeworkQuestionLogStatus(){ + return teacherOpenCourseHomeworkQuestionLogStatus; + } + /**状态（1正常 2删除） + *@param teacherOpenCourseHomeworkQuestionLogStatus + */ + public void setTeacherOpenCourseHomeworkQuestionLogStatus(Integer teacherOpenCourseHomeworkQuestionLogStatus){ + this.teacherOpenCourseHomeworkQuestionLogStatus = teacherOpenCourseHomeworkQuestionLogStatus; + } + + /**组织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; + } + + +} diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkQuestionLogService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkQuestionLogService.java new file mode 100644 index 00000000..18944c37 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkQuestionLogService.java @@ -0,0 +1,148 @@ +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.TeacherOpenCourseHomeworkQuestionLogDao; +import com.ibeetl.jlw.entity.TeacherOpenCourseHomeworkQuestionLog; +import com.ibeetl.jlw.web.query.TeacherOpenCourseHomeworkQuestionLogQuery; +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 TeacherOpenCourseHomeworkQuestionLogService extends CoreBaseService{ + + @Resource private TeacherOpenCourseHomeworkQuestionLogDao teacherOpenCourseHomeworkQuestionLogDao; + + public PageQueryqueryByCondition(PageQuery query){ + PageQuery ret = teacherOpenCourseHomeworkQuestionLogDao.queryByCondition(query); + queryListAfter(ret.getList()); + return ret; + } + + public PageQueryqueryByConditionQuery(PageQuery query){ + PageQuery ret = teacherOpenCourseHomeworkQuestionLogDao.queryByConditionQuery(query); + queryListAfter(ret.getList()); + return ret; + } + + public void deleteByList(List list){ + String ids = ""; + ToolUtils.deleteNullList(list); + for(int i=0;null != list && i teacherOpenCourseHomeworkQuestionLogList = new ArrayList<>(); + try { + teacherOpenCourseHomeworkQuestionLogList = JSON.parseArray(teacherOpenCourseHomeworkQuestionLogQuery.getTeacherOpenCourseHomeworkQuestionLogJsonStr(), TeacherOpenCourseHomeworkQuestionLog.class); + } catch (Exception e) { + try { + teacherOpenCourseHomeworkQuestionLogList.add(JSONObject.parseObject(teacherOpenCourseHomeworkQuestionLogQuery.getTeacherOpenCourseHomeworkQuestionLogJsonStr(), TeacherOpenCourseHomeworkQuestionLog.class)); + } catch (Exception e1) {} + } + ToolUtils.deleteNullList(teacherOpenCourseHomeworkQuestionLogList); + if(null != teacherOpenCourseHomeworkQuestionLogList && teacherOpenCourseHomeworkQuestionLogList.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.teacherOpenCourseHomeworkQuestionLog.getTeacherOpenCourseHomeworkQuestionLogValues"), TeacherOpenCourseHomeworkQuestionLog.class, paras); + } + + public List getValuesByQuery (TeacherOpenCourseHomeworkQuestionLogQuery teacherOpenCourseHomeworkQuestionLogQuery){ + return teacherOpenCourseHomeworkQuestionLogDao.getValuesByQuery(teacherOpenCourseHomeworkQuestionLogQuery); + } + + public TeacherOpenCourseHomeworkQuestionLog getInfo (Long teacherOpenCourseHomeworkQuestionLogId){ + TeacherOpenCourseHomeworkQuestionLogQuery teacherOpenCourseHomeworkQuestionLogQuery = new TeacherOpenCourseHomeworkQuestionLogQuery(); + teacherOpenCourseHomeworkQuestionLogQuery.setTeacherOpenCourseHomeworkQuestionLogId(teacherOpenCourseHomeworkQuestionLogId); + teacherOpenCourseHomeworkQuestionLogQuery.setTeacherOpenCourseHomeworkQuestionLogStatusPlural("1,2");//需要根据实际情况来 + List list = teacherOpenCourseHomeworkQuestionLogDao.getValuesByQuery(teacherOpenCourseHomeworkQuestionLogQuery); + if(null != list && list.size()>0){ + return list.get(0); + }else{ + return null; + } + } + + public TeacherOpenCourseHomeworkQuestionLog getInfo (TeacherOpenCourseHomeworkQuestionLogQuery teacherOpenCourseHomeworkQuestionLogQuery){ + List list = teacherOpenCourseHomeworkQuestionLogDao.getValuesByQuery(teacherOpenCourseHomeworkQuestionLogQuery); + if(null != list && list.size()>0){ + return list.get(0); + }else{ + return null; + } + } + +} diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkService.java index f47b5455..31b7129f 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkService.java @@ -175,4 +175,13 @@ public class TeacherOpenCourseHomeworkService extends CoreBaseService getPageList(TeacherOpenCourseHomeworkQuestionLogQuery condition,@SCoreUser CoreUser coreUser){ + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + PageQuery page = condition.getPageQuery(); + teacherOpenCourseHomeworkQuestionLogService.queryByConditionQuery(page); + return JsonResult.success(page); + } + } + + + @GetMapping(API + "/getInfo.do") + public JsonResultgetInfo(TeacherOpenCourseHomeworkQuestionLogQuery param,@SCoreUser CoreUser coreUser) { + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + TeacherOpenCourseHomeworkQuestionLog teacherOpenCourseHomeworkQuestionLog = teacherOpenCourseHomeworkQuestionLogService.getInfo(param); + return JsonResult.success(teacherOpenCourseHomeworkQuestionLog); + } + } + + + @GetMapping(API + "/getList.do") + public JsonResult>getList(TeacherOpenCourseHomeworkQuestionLogQuery param,@SCoreUser CoreUser coreUser) { + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + Listlist = teacherOpenCourseHomeworkQuestionLogService.getValuesByQuery(param); + return JsonResult.success(list); + } + } + + + /* 后台页面 */ + + @GetMapping(MODEL + "/index.do") + @Function("teacherOpenCourseHomeworkQuestionLog.query") + public ModelAndView index() { + ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHomeworkQuestionLog/index.html") ; + view.addObject("search", TeacherOpenCourseHomeworkQuestionLogQuery.class.getName()); + return view; + } + + @GetMapping(MODEL + "/edit.do") + @Function("teacherOpenCourseHomeworkQuestionLog.edit") + public ModelAndView edit(Long teacherOpenCourseHomeworkQuestionLogId) { + ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHomeworkQuestionLog/edit.html"); + TeacherOpenCourseHomeworkQuestionLog teacherOpenCourseHomeworkQuestionLog = teacherOpenCourseHomeworkQuestionLogService.queryById(teacherOpenCourseHomeworkQuestionLogId); + view.addObject("teacherOpenCourseHomeworkQuestionLog", teacherOpenCourseHomeworkQuestionLog); + return view; + } + + @GetMapping(MODEL + "/add.do") + @Function("teacherOpenCourseHomeworkQuestionLog.add") + public ModelAndView add(Long teacherOpenCourseHomeworkQuestionLogId) { + ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHomeworkQuestionLog/add.html"); + if(null != teacherOpenCourseHomeworkQuestionLogId){ + TeacherOpenCourseHomeworkQuestionLog teacherOpenCourseHomeworkQuestionLog = teacherOpenCourseHomeworkQuestionLogService.queryById(teacherOpenCourseHomeworkQuestionLogId); + view.addObject("teacherOpenCourseHomeworkQuestionLog", teacherOpenCourseHomeworkQuestionLog); + }else { + view.addObject("teacherOpenCourseHomeworkQuestionLog", new TeacherOpenCourseHomeworkQuestionLog()); + } + return view; + } + + /* 后台接口 */ + + @PostMapping(MODEL + "/list.json") + @Function("teacherOpenCourseHomeworkQuestionLog.query") + public JsonResult list(TeacherOpenCourseHomeworkQuestionLogQuery condition){ + PageQuery page = condition.getPageQuery(); + teacherOpenCourseHomeworkQuestionLogService.queryByCondition(page); + return JsonResult.success(page); + } + + @PostMapping(MODEL + "/addAll.json") + @Function("teacherOpenCourseHomeworkQuestionLog.add") + public JsonResult addAll(TeacherOpenCourseHomeworkQuestionLogQuery teacherOpenCourseHomeworkQuestionLogQuery,@SCoreUser CoreUser coreUser){ + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + teacherOpenCourseHomeworkQuestionLogQuery.setUserId(coreUser.getId()); + teacherOpenCourseHomeworkQuestionLogQuery.setOrgId(coreUser.getOrgId()); + String msg = teacherOpenCourseHomeworkQuestionLogService.addAll(teacherOpenCourseHomeworkQuestionLogQuery); + if (StringUtils.isBlank(msg)) { + return JsonResult.success(); + } else { + return JsonResult.failMessage("新增失败,"+msg); + } + } + } + + @PostMapping(MODEL + "/add.json") + @Function("teacherOpenCourseHomeworkQuestionLog.add") + public JsonResult add(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseHomeworkQuestionLogQuery teacherOpenCourseHomeworkQuestionLogQuery, BindingResult result,@SCoreUser CoreUser coreUser){ + if(result.hasErrors()){ + return JsonResult.failMessage(result); + }else{ + teacherOpenCourseHomeworkQuestionLogQuery.setUserId(coreUser.getId()); + teacherOpenCourseHomeworkQuestionLogQuery.setOrgId(coreUser.getOrgId()); + if(null == teacherOpenCourseHomeworkQuestionLogQuery.getTeacherOpenCourseHomeworkQuestionLogStatus()){ + teacherOpenCourseHomeworkQuestionLogQuery.setTeacherOpenCourseHomeworkQuestionLogStatus(1); + } + return teacherOpenCourseHomeworkQuestionLogService.add(teacherOpenCourseHomeworkQuestionLogQuery); + } + } + + @PostMapping(MODEL + "/edit.json") + @Function("teacherOpenCourseHomeworkQuestionLog.edit") + public JsonResult update(@Validated(ValidateConfig.UPDATE.class) TeacherOpenCourseHomeworkQuestionLogQuery teacherOpenCourseHomeworkQuestionLogQuery, BindingResult result) { + if(result.hasErrors()){ + return JsonResult.failMessage(result); + }else { + teacherOpenCourseHomeworkQuestionLogQuery.setUserId(null); + teacherOpenCourseHomeworkQuestionLogQuery.setOrgId(null); + String msg = teacherOpenCourseHomeworkQuestionLogService.edit(teacherOpenCourseHomeworkQuestionLogQuery); + if (StringUtils.isBlank(msg)) { + return JsonResult.success(); + } else { + return JsonResult.failMessage("更新失败,"+msg); + } + } + } + + + @GetMapping(MODEL + "/view.json") + @Function("teacherOpenCourseHomeworkQuestionLog.query") + public JsonResultqueryInfo(Long teacherOpenCourseHomeworkQuestionLogId) { + TeacherOpenCourseHomeworkQuestionLog teacherOpenCourseHomeworkQuestionLog = teacherOpenCourseHomeworkQuestionLogService.queryById( teacherOpenCourseHomeworkQuestionLogId); + return JsonResult.success(teacherOpenCourseHomeworkQuestionLog); + } + + @GetMapping(MODEL + "/getValues.json") + @Function("teacherOpenCourseHomeworkQuestionLog.query") + public JsonResult>getValues(TeacherOpenCourseHomeworkQuestionLogQuery param) { + Listlist = teacherOpenCourseHomeworkQuestionLogService.getValuesByQuery(param); + return JsonResult.success(list); + } + + + @PostMapping(MODEL + "/delete.json") + @Function("teacherOpenCourseHomeworkQuestionLog.delete") + @ResponseBody + public JsonResult delete(String ids) { + teacherOpenCourseHomeworkQuestionLogService.deleteTeacherOpenCourseHomeworkQuestionLog(ids); + return JsonResult.success(); + } + + +} diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHomeworkQuestionLogQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHomeworkQuestionLogQuery.java new file mode 100644 index 00000000..925ba800 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHomeworkQuestionLogQuery.java @@ -0,0 +1,163 @@ +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.TeacherOpenCourseHomeworkQuestionLog; + +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + *开课作业日志查询 + */ +public class TeacherOpenCourseHomeworkQuestionLogQuery extends PageParam { + @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) + @Query(name = "学生做题日志ID", display = false) + private Long teacherOpenCourseHomeworkQuestionLogId; + @Query(name = "题库作业ID", display = true,type=Query.TYPE_DICT,dict="teacher_open_course_homework.teacher_open_course_homework_name.teacher_open_course_homework_status=1") + private Long teacherOpenCourseQuestionHomeworkId; + @Query(name = "题目快照ID", display = true,type=Query.TYPE_DICT,dict="resources_question_snapshot.question_stem.question_status=1") + private Long resourcesQuestionSnapshotId; + @Query(name = "学生提交的答案", display = false) + private String teacherOpenCourseHomeworkQuestionLogAnswer; + @Query(name = "附件，学生端上传附件（单文件）", display = false) + private String teacherOpenCourseHomeworkQuestionLogUploadFile; + @Query(name = "创建时间", display = false) + private Date teacherOpenCourseHomeworkQuestionLogAddTime; + @Query(name = "状态（1正常 2删除）", display = true,type=Query.TYPE_DICT,dict="global_status") + private Integer teacherOpenCourseHomeworkQuestionLogStatus; + @Query(name = "组织ID", display = false) + private Long orgId; + @Query(name = "用户ID", display = false) + private Long userId; + + private String teacherOpenCourseHomeworkQuestionLogIdPlural; + private String teacherOpenCourseQuestionHomeworkIdPlural; + private String resourcesQuestionSnapshotIdPlural; + private String teacherOpenCourseHomeworkQuestionLogStatusPlural; + private String orgIdPlural; + private String userIdPlural; + + private String teacherOpenCourseHomeworkQuestionLogJsonStr;//json格式 + + private String _given;//指定更新的特定字段，多个逗号隔开 + + public Long getTeacherOpenCourseHomeworkQuestionLogId(){ + return teacherOpenCourseHomeworkQuestionLogId; + } + public void setTeacherOpenCourseHomeworkQuestionLogId(Long teacherOpenCourseHomeworkQuestionLogId ){ + this.teacherOpenCourseHomeworkQuestionLogId = teacherOpenCourseHomeworkQuestionLogId; + } + public Long getTeacherOpenCourseQuestionHomeworkId(){ + return teacherOpenCourseQuestionHomeworkId; + } + public void setTeacherOpenCourseQuestionHomeworkId(Long teacherOpenCourseQuestionHomeworkId ){ + this.teacherOpenCourseQuestionHomeworkId = teacherOpenCourseQuestionHomeworkId; + } + public Long getResourcesQuestionSnapshotId(){ + return resourcesQuestionSnapshotId; + } + public void setResourcesQuestionSnapshotId(Long resourcesQuestionSnapshotId ){ + this.resourcesQuestionSnapshotId = resourcesQuestionSnapshotId; + } + public String getTeacherOpenCourseHomeworkQuestionLogAnswer(){ + return teacherOpenCourseHomeworkQuestionLogAnswer; + } + public void setTeacherOpenCourseHomeworkQuestionLogAnswer(String teacherOpenCourseHomeworkQuestionLogAnswer ){ + this.teacherOpenCourseHomeworkQuestionLogAnswer = teacherOpenCourseHomeworkQuestionLogAnswer; + } + public String getTeacherOpenCourseHomeworkQuestionLogUploadFile(){ + return teacherOpenCourseHomeworkQuestionLogUploadFile; + } + public void setTeacherOpenCourseHomeworkQuestionLogUploadFile(String teacherOpenCourseHomeworkQuestionLogUploadFile ){ + this.teacherOpenCourseHomeworkQuestionLogUploadFile = teacherOpenCourseHomeworkQuestionLogUploadFile; + } + public Date getTeacherOpenCourseHomeworkQuestionLogAddTime(){ + return teacherOpenCourseHomeworkQuestionLogAddTime; + } + public void setTeacherOpenCourseHomeworkQuestionLogAddTime(Date teacherOpenCourseHomeworkQuestionLogAddTime ){ + this.teacherOpenCourseHomeworkQuestionLogAddTime = teacherOpenCourseHomeworkQuestionLogAddTime; + } + public Integer getTeacherOpenCourseHomeworkQuestionLogStatus(){ + return teacherOpenCourseHomeworkQuestionLogStatus; + } + public void setTeacherOpenCourseHomeworkQuestionLogStatus(Integer teacherOpenCourseHomeworkQuestionLogStatus ){ + this.teacherOpenCourseHomeworkQuestionLogStatus = teacherOpenCourseHomeworkQuestionLogStatus; + } + 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 TeacherOpenCourseHomeworkQuestionLog pojo(){ + TeacherOpenCourseHomeworkQuestionLog pojo = new TeacherOpenCourseHomeworkQuestionLog(); + pojo.setTeacherOpenCourseHomeworkQuestionLogId(this.getTeacherOpenCourseHomeworkQuestionLogId()); + pojo.setTeacherOpenCourseQuestionHomeworkId(this.getTeacherOpenCourseQuestionHomeworkId()); + pojo.setResourcesQuestionSnapshotId(this.getResourcesQuestionSnapshotId()); + pojo.setTeacherOpenCourseHomeworkQuestionLogAnswer(this.getTeacherOpenCourseHomeworkQuestionLogAnswer()); + pojo.setTeacherOpenCourseHomeworkQuestionLogUploadFile(this.getTeacherOpenCourseHomeworkQuestionLogUploadFile()); + pojo.setTeacherOpenCourseHomeworkQuestionLogAddTime(this.getTeacherOpenCourseHomeworkQuestionLogAddTime()); + pojo.setTeacherOpenCourseHomeworkQuestionLogStatus(this.getTeacherOpenCourseHomeworkQuestionLogStatus()); + pojo.setOrgId(this.getOrgId()); + pojo.setUserId(this.getUserId()); + return pojo; + } + + public String getTeacherOpenCourseHomeworkQuestionLogIdPlural(){ + return teacherOpenCourseHomeworkQuestionLogIdPlural; + } + public void setTeacherOpenCourseHomeworkQuestionLogIdPlural(String teacherOpenCourseHomeworkQuestionLogIdPlural){ + this.teacherOpenCourseHomeworkQuestionLogIdPlural = teacherOpenCourseHomeworkQuestionLogIdPlural; + } + public String getTeacherOpenCourseQuestionHomeworkIdPlural(){ + return teacherOpenCourseQuestionHomeworkIdPlural; + } + public void setTeacherOpenCourseQuestionHomeworkIdPlural(String teacherOpenCourseQuestionHomeworkIdPlural){ + this.teacherOpenCourseQuestionHomeworkIdPlural = teacherOpenCourseQuestionHomeworkIdPlural; + } + public String getResourcesQuestionSnapshotIdPlural(){ + return resourcesQuestionSnapshotIdPlural; + } + public void setResourcesQuestionSnapshotIdPlural(String resourcesQuestionSnapshotIdPlural){ + this.resourcesQuestionSnapshotIdPlural = resourcesQuestionSnapshotIdPlural; + } + public String getTeacherOpenCourseHomeworkQuestionLogStatusPlural(){ + return teacherOpenCourseHomeworkQuestionLogStatusPlural; + } + public void setTeacherOpenCourseHomeworkQuestionLogStatusPlural(String teacherOpenCourseHomeworkQuestionLogStatusPlural){ + this.teacherOpenCourseHomeworkQuestionLogStatusPlural = teacherOpenCourseHomeworkQuestionLogStatusPlural; + } + 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 getTeacherOpenCourseHomeworkQuestionLogJsonStr(){ + return teacherOpenCourseHomeworkQuestionLogJsonStr; + } + public void setTeacherOpenCourseHomeworkQuestionLogJsonStr(String teacherOpenCourseHomeworkQuestionLogJsonStr ){ + this.teacherOpenCourseHomeworkQuestionLogJsonStr = teacherOpenCourseHomeworkQuestionLogJsonStr; + } + public String get_given() { + return _given; + } + public void set_given(String _given) { + this._given = _given; + } +} diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseHomeworkQuestionLog.md b/web/src/main/resources/sql/jlw/teacherOpenCourseHomeworkQuestionLog.md new file mode 100644 index 00000000..f8c23729 --- /dev/null +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseHomeworkQuestionLog.md @@ -0,0 +1,313 @@ +queryByCondition +=== +* 根据不为空的参数进行分页查询 + + select + @pageTag(){ + t.* + @} + from teacher_open_course_homework_question_log t + where 1=1 + @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行 + and #function("teacherOpenCourseHomeworkQuestionLog.query")# + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogId)){ + and t.teacher_open_course_homework_question_log_id =#teacherOpenCourseHomeworkQuestionLogId# + @} + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogIdPlural)){ + and find_in_set(t.teacher_open_course_homework_question_log_id,#teacherOpenCourseHomeworkQuestionLogIdPlural#) + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkId)){ + and t.teacher_open_course_question_homework_id =#teacherOpenCourseQuestionHomeworkId# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkIdPlural)){ + and find_in_set(t.teacher_open_course_question_homework_id,#teacherOpenCourseQuestionHomeworkIdPlural#) + @} + @if(!isEmpty(resourcesQuestionSnapshotId)){ + and t.resources_question_snapshot_id =#resourcesQuestionSnapshotId# + @} + @if(!isEmpty(resourcesQuestionSnapshotIdPlural)){ + and find_in_set(t.resources_question_snapshot_id,#resourcesQuestionSnapshotIdPlural#) + @} + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogAnswer)){ + and t.teacher_open_course_homework_question_log_answer =#teacherOpenCourseHomeworkQuestionLogAnswer# + @} + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogUploadFile)){ + and t.teacher_open_course_homework_question_log_upload_file =#teacherOpenCourseHomeworkQuestionLogUploadFile# + @} + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogAddTime)){ + and t.teacher_open_course_homework_question_log_add_time =#teacherOpenCourseHomeworkQuestionLogAddTime# + @} + @if(isEmpty(teacherOpenCourseHomeworkQuestionLogStatus) && isEmpty(teacherOpenCourseHomeworkQuestionLogStatusPlural)){ + and t.teacher_open_course_homework_question_log_status != 2 + @}else{ + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogStatus)){ + and t.teacher_open_course_homework_question_log_status =#teacherOpenCourseHomeworkQuestionLogStatus# + @}else if(!isEmpty(teacherOpenCourseHomeworkQuestionLogStatusPlural)){ + and find_in_set(t.teacher_open_course_homework_question_log_status,#teacherOpenCourseHomeworkQuestionLogStatusPlural#) + @} + @} + @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#) + @} + + +queryByConditionQuery +=== +* 根据不为空的参数进行分页查询(无权限) + + select + @pageTag(){ + t.* + @} + from teacher_open_course_homework_question_log t + where 1=1 + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogId)){ + and t.teacher_open_course_homework_question_log_id =#teacherOpenCourseHomeworkQuestionLogId# + @} + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogIdPlural)){ + and find_in_set(t.teacher_open_course_homework_question_log_id,#teacherOpenCourseHomeworkQuestionLogIdPlural#) + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkId)){ + and t.teacher_open_course_question_homework_id =#teacherOpenCourseQuestionHomeworkId# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkIdPlural)){ + and find_in_set(t.teacher_open_course_question_homework_id,#teacherOpenCourseQuestionHomeworkIdPlural#) + @} + @if(!isEmpty(resourcesQuestionSnapshotId)){ + and t.resources_question_snapshot_id =#resourcesQuestionSnapshotId# + @} + @if(!isEmpty(resourcesQuestionSnapshotIdPlural)){ + and find_in_set(t.resources_question_snapshot_id,#resourcesQuestionSnapshotIdPlural#) + @} + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogAnswer)){ + and t.teacher_open_course_homework_question_log_answer =#teacherOpenCourseHomeworkQuestionLogAnswer# + @} + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogUploadFile)){ + and t.teacher_open_course_homework_question_log_upload_file =#teacherOpenCourseHomeworkQuestionLogUploadFile# + @} + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogAddTime)){ + and t.teacher_open_course_homework_question_log_add_time =#teacherOpenCourseHomeworkQuestionLogAddTime# + @} + @if(isEmpty(teacherOpenCourseHomeworkQuestionLogStatus) && isEmpty(teacherOpenCourseHomeworkQuestionLogStatusPlural)){ + and t.teacher_open_course_homework_question_log_status != 2 + @}else{ + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogStatus)){ + and t.teacher_open_course_homework_question_log_status =#teacherOpenCourseHomeworkQuestionLogStatus# + @}else if(!isEmpty(teacherOpenCourseHomeworkQuestionLogStatusPlural)){ + and find_in_set(t.teacher_open_course_homework_question_log_status,#teacherOpenCourseHomeworkQuestionLogStatusPlural#) + @} + @} + @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#) + @} + + + + +deleteTeacherOpenCourseHomeworkQuestionLogByIds +=== + +* 批量删除（假删除） + + update teacher_open_course_homework_question_log set teacher_open_course_homework_question_log_status = 2 where find_in_set(teacher_open_course_homework_question_log_id,#ids#) + + +deleteByIds +=== + +* 批量删除（真删除） + + delete from teacher_open_course_homework_question_log where find_in_set(teacher_open_course_homework_question_log_id,#ids#) + + + +getByIds +=== + +select * from teacher_open_course_homework_question_log where find_in_set(teacher_open_course_homework_question_log_id,#ids#) + + +updateGivenByIds +=== + +* 批量更新指定字段，无论此字段是否有值 + + update teacher_open_course_homework_question_log + set + @if(contain("teacherOpenCourseQuestionHomeworkId",_given)){ + @if(isEmpty(teacherOpenCourseQuestionHomeworkId)){ + teacher_open_course_question_homework_id = null , + @}else{ + teacher_open_course_question_homework_id = #teacherOpenCourseQuestionHomeworkId# , + @} + @} + @if(contain("resourcesQuestionSnapshotId",_given)){ + @if(isEmpty(resourcesQuestionSnapshotId)){ + resources_question_snapshot_id = null , + @}else{ + resources_question_snapshot_id = #resourcesQuestionSnapshotId# , + @} + @} + @if(contain("teacherOpenCourseHomeworkQuestionLogAnswer",_given)){ + @if(isEmpty(teacherOpenCourseHomeworkQuestionLogAnswer)){ + teacher_open_course_homework_question_log_answer = null , + @}else{ + teacher_open_course_homework_question_log_answer = #teacherOpenCourseHomeworkQuestionLogAnswer# , + @} + @} + @if(contain("teacherOpenCourseHomeworkQuestionLogUploadFile",_given)){ + @if(isEmpty(teacherOpenCourseHomeworkQuestionLogUploadFile)){ + teacher_open_course_homework_question_log_upload_file = null , + @}else{ + teacher_open_course_homework_question_log_upload_file = #teacherOpenCourseHomeworkQuestionLogUploadFile# , + @} + @} + @if(contain("teacherOpenCourseHomeworkQuestionLogAddTime",_given)){ + @if(isEmpty(teacherOpenCourseHomeworkQuestionLogAddTime)){ + teacher_open_course_homework_question_log_add_time = null , + @}else{ + teacher_open_course_homework_question_log_add_time = #teacherOpenCourseHomeworkQuestionLogAddTime# , + @} + @} + @if(contain("teacherOpenCourseHomeworkQuestionLogStatus",_given)){ + @if(isEmpty(teacherOpenCourseHomeworkQuestionLogStatus)){ + teacher_open_course_homework_question_log_status = null , + @}else{ + teacher_open_course_homework_question_log_status = #teacherOpenCourseHomeworkQuestionLogStatus# , + @} + @} + @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# , + @} + @} + teacher_open_course_homework_question_log_id = teacher_open_course_homework_question_log_id + where find_in_set(teacher_open_course_homework_question_log_id,#teacherOpenCourseHomeworkQuestionLogIdPlural#) + + + +getTeacherOpenCourseHomeworkQuestionLogValues +=== + +* 根据不为空的参数进行查询 + + select t.* + from teacher_open_course_homework_question_log t + where 1=1 + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogId)){ + and t.teacher_open_course_homework_question_log_id =#teacherOpenCourseHomeworkQuestionLogId# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkId)){ + and t.teacher_open_course_question_homework_id =#teacherOpenCourseQuestionHomeworkId# + @} + @if(!isEmpty(resourcesQuestionSnapshotId)){ + and t.resources_question_snapshot_id =#resourcesQuestionSnapshotId# + @} + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogAnswer)){ + and t.teacher_open_course_homework_question_log_answer =#teacherOpenCourseHomeworkQuestionLogAnswer# + @} + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogUploadFile)){ + and t.teacher_open_course_homework_question_log_upload_file =#teacherOpenCourseHomeworkQuestionLogUploadFile# + @} + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogAddTime)){ + and t.teacher_open_course_homework_question_log_add_time =#teacherOpenCourseHomeworkQuestionLogAddTime# + @} + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogStatus)){ + and t.teacher_open_course_homework_question_log_status =#teacherOpenCourseHomeworkQuestionLogStatus# + @}else{ + and t.teacher_open_course_homework_question_log_status != 2 + @} + @if(!isEmpty(orgId)){ + and t.org_id =#orgId# + @} + @if(!isEmpty(userId)){ + and t.user_id =#userId# + @} + + +getValuesByQuery +=== + +* 根据不为空的参数进行查询 + + select t.* + from teacher_open_course_homework_question_log t + where 1=1 and #function("teacherOpenCourseHomeworkQuestionLog.query")# + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogId)){ + and t.teacher_open_course_homework_question_log_id =#teacherOpenCourseHomeworkQuestionLogId# + @} + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogIdPlural)){ + and find_in_set(t.teacher_open_course_homework_question_log_id,#teacherOpenCourseHomeworkQuestionLogIdPlural#) + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkId)){ + and t.teacher_open_course_question_homework_id =#teacherOpenCourseQuestionHomeworkId# + @} + @if(!isEmpty(teacherOpenCourseQuestionHomeworkIdPlural)){ + and find_in_set(t.teacher_open_course_question_homework_id,#teacherOpenCourseQuestionHomeworkIdPlural#) + @} + @if(!isEmpty(resourcesQuestionSnapshotId)){ + and t.resources_question_snapshot_id =#resourcesQuestionSnapshotId# + @} + @if(!isEmpty(resourcesQuestionSnapshotIdPlural)){ + and find_in_set(t.resources_question_snapshot_id,#resourcesQuestionSnapshotIdPlural#) + @} + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogAnswer)){ + and t.teacher_open_course_homework_question_log_answer =#teacherOpenCourseHomeworkQuestionLogAnswer# + @} + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogUploadFile)){ + and t.teacher_open_course_homework_question_log_upload_file =#teacherOpenCourseHomeworkQuestionLogUploadFile# + @} + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogAddTime)){ + and t.teacher_open_course_homework_question_log_add_time =#teacherOpenCourseHomeworkQuestionLogAddTime# + @} + @if(isEmpty(teacherOpenCourseHomeworkQuestionLogStatus) && isEmpty(teacherOpenCourseHomeworkQuestionLogStatusPlural)){ + and t.teacher_open_course_homework_question_log_status != 2 + @}else{ + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogStatus)){ + and t.teacher_open_course_homework_question_log_status =#teacherOpenCourseHomeworkQuestionLogStatus# + @}else if(!isEmpty(teacherOpenCourseHomeworkQuestionLogStatusPlural)){ + and find_in_set(t.teacher_open_course_homework_question_log_status,#teacherOpenCourseHomeworkQuestionLogStatusPlural#) + @} + @} + @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#) + @} + + + diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkQuestionLog/add.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkQuestionLog/add.js new file mode 100644 index 00000000..ee5bee10 --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkQuestionLog/add.js @@ -0,0 +1,38 @@ +layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHomeworkQuestionLogApi'], function(exports) { + var form = layui.form; + var teacherOpenCourseHomeworkQuestionLogApi = layui.teacherOpenCourseHomeworkQuestionLogApi; + 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 teacherOpenCourseHomeworkQuestionLogId = $("#addForm input[name='teacherOpenCourseHomeworkQuestionLogId']").val(); + if(!$.isEmpty(teacherOpenCourseHomeworkQuestionLogId)){ + teacherOpenCourseHomeworkQuestionLogApi.updateTeacherOpenCourseHomeworkQuestionLog($('#addForm'),function(){ + parent.window.dataReload(); + Common.info("更新成功"); + Lib.closeFrame(); + }); + }else{ + teacherOpenCourseHomeworkQuestionLogApi.addTeacherOpenCourseHomeworkQuestionLog($('#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/teacherOpenCourseHomeworkQuestionLog/del.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkQuestionLog/del.js new file mode 100644 index 00000000..59d329e9 --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkQuestionLog/del.js @@ -0,0 +1,23 @@ +layui.define(['table', 'teacherOpenCourseHomeworkQuestionLogApi'], function(exports) { + var teacherOpenCourseHomeworkQuestionLogApi = layui.teacherOpenCourseHomeworkQuestionLogApi; + var table=layui.table; + var view = { + init:function(){ + }, + delBatch:function(){ + var data = Common.getMoreDataFromTable(table,"teacherOpenCourseHomeworkQuestionLogTable"); + if(data==null){ + return ; + } + Common.openConfirm("确认要删除这些开课作业日志?",function(){ + var ids =Common.concatBatchId(data,"teacherOpenCourseHomeworkQuestionLogId"); + teacherOpenCourseHomeworkQuestionLogApi.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/teacherOpenCourseHomeworkQuestionLog/edit.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkQuestionLog/edit.js new file mode 100644 index 00000000..2fa453dc --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkQuestionLog/edit.js @@ -0,0 +1,28 @@ +layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHomeworkQuestionLogApi'], function(exports) { + var form = layui.form; + var teacherOpenCourseHomeworkQuestionLogApi = layui.teacherOpenCourseHomeworkQuestionLogApi; + var index = layui.index; + var view = { + init:function(){ + Lib.initGenrealForm($("#updateForm"),form); + this.initSubmit(); + }, + initSubmit:function(){ + $("#updateButton").click(function(){ + form.on('submit(form)', function(){ + teacherOpenCourseHomeworkQuestionLogApi.updateTeacherOpenCourseHomeworkQuestionLog($('#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/teacherOpenCourseHomeworkQuestionLog/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkQuestionLog/index.js new file mode 100644 index 00000000..e790a9b7 --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkQuestionLog/index.js @@ -0,0 +1,185 @@ +layui.define([ 'form', 'laydate', 'table' ], function(exports) { + var form = layui.form; + var laydate = layui.laydate; + var table = layui.table; + var teacherOpenCourseHomeworkQuestionLogTable = null; + var view ={ + init:function(){ + var that = this + this.initTable(); + this.initSearchForm(); + this.initToolBar(); + window.dataReload = function(){ + Lib.doSearchForm($("#searchForm"),teacherOpenCourseHomeworkQuestionLogTable) + that.initToolBar(); + } + }, + initTable:function(){ + var sx_ = localStorage.getItem("teacherOpenCourseHomeworkQuestionLogTable_field_"+Common.userInfoId); //筛选值显示、隐藏缓存 + if($.isEmpty(sx_)){sx_ = {};}else {sx_ = JSON.parse(sx_);} + teacherOpenCourseHomeworkQuestionLogTable = table.render({ + elem : '#teacherOpenCourseHomeworkQuestionLogTable', + height : Lib.getTableHeight(1), + cellMinWidth: 100, + method : 'post', + url : Common.ctxPath + '/jlw/teacherOpenCourseHomeworkQuestionLog/list.json' // 数据接口 + ,page : Lib.tablePage // 开启分页 + ,toolbar: '#toolbar_teacherOpenCourseHomeworkQuestionLog' //自定义头部左侧工具栏 + ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏 + ,limit : 10, + cols : [ [ // 表头 + { + type : 'checkbox', + + }, + { + field : 'teacherOpenCourseHomeworkQuestionLogId', + title : '学生做题日志ID', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['teacherOpenCourseHomeworkQuestionLogId'])?false:sx_['teacherOpenCourseHomeworkQuestionLogId'], + + width : 60, + }, + { + field : 'teacherOpenCourseQuestionHomeworkIdText', //数据字典类型为 teacher_open_course_homework.teacher_open_course_homework_name.teacher_open_course_homework_status=1 + title : '题库作业ID', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['teacherOpenCourseQuestionHomeworkIdText'])?false:sx_['teacherOpenCourseQuestionHomeworkIdText'], + }, + { + field : 'resourcesQuestionSnapshotIdText', //数据字典类型为 resources_question_snapshot.question_stem.question_status=1 + title : '题目快照ID', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['resourcesQuestionSnapshotIdText'])?false:sx_['resourcesQuestionSnapshotIdText'], + }, + { + field : 'teacherOpenCourseHomeworkQuestionLogAnswer', + title : '学生提交的答案', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['teacherOpenCourseHomeworkQuestionLogAnswer'])?false:sx_['teacherOpenCourseHomeworkQuestionLogAnswer'], + }, + { + field : 'teacherOpenCourseHomeworkQuestionLogUploadFile', + title : '附件，学生端上传附件（单文件）', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['teacherOpenCourseHomeworkQuestionLogUploadFile'])?false:sx_['teacherOpenCourseHomeworkQuestionLogUploadFile'], + }, + { + field : 'teacherOpenCourseHomeworkQuestionLogAddTime', + title : '创建时间', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['teacherOpenCourseHomeworkQuestionLogAddTime'])?false:sx_['teacherOpenCourseHomeworkQuestionLogAddTime'], + }, + { + field : 'teacherOpenCourseHomeworkQuestionLogStatusText', //数据字典类型为 global_status + title : '状态（1正常 2删除）', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['teacherOpenCourseHomeworkQuestionLogStatusText'])?false:sx_['teacherOpenCourseHomeworkQuestionLogStatusText'], + }, + { + 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 : 'operation_',title : '操作',align:"center", templet: function (d) { + var htm = ''; + htm += ''; + return htm; + } + } + + ] ] + + }); + + table.on('checkbox(teacherOpenCourseHomeworkQuestionLogTable)', function(obj){ + var teacherOpenCourseHomeworkQuestionLog = obj.data; + if(obj.checked){ + //按钮逻辑Lib.buttonEnable() + }else{ + + } + }) + }, + + initSearchForm:function(){ + Lib.initSearchForm( $("#searchForm"),teacherOpenCourseHomeworkQuestionLogTable,form); + }, + + initToolBar:function(){ + toolbar = { + add: function () { + var url = "/jlw/teacherOpenCourseHomeworkQuestionLog/add.do"; + Common.openDlg(url,"开课作业日志管理>新增"); + }, + edit: function () { + var data = Common.getOneFromTable(table,"teacherOpenCourseHomeworkQuestionLogTable"); + if(data==null){ + return ; + } + var url = "/jlw/teacherOpenCourseHomeworkQuestionLog/add.do?teacherOpenCourseHomeworkQuestionLogId="+data.teacherOpenCourseHomeworkQuestionLogId; + Common.openDlg(url,"开课作业日志管理>"+data.teacherOpenCourseHomeworkQuestionLogId+">编辑"); + }, + del: function () { + layui.use(['del'], function(){ + var delView = layui.del + delView.delBatch(); + }); + }, + search: function () { + Lib.doSearchForm($("#searchForm"), teacherOpenCourseHomeworkQuestionLogTable, 1); + view.initToolBar() + }, + refresh: function () { + searchForm.reset(); + Lib.doSearchForm($("#searchForm"), teacherOpenCourseHomeworkQuestionLogTable, 1); + view.initToolBar() + }, + } + //触发事件 + $('.ext-toolbar').on('click', function() { + var type = $(this).data('type'); + toolbar[type] ? toolbar[type].call(this) : ''; + }); + + }, initTableTool: table.on('tool(teacherOpenCourseHomeworkQuestionLogTable)', function (obj) { + var data = obj.data; + if (obj.event === 'edit') { + var url = "/jlw/teacherOpenCourseHomeworkQuestionLog/add.do?teacherOpenCourseHomeworkQuestionLogId="+data.teacherOpenCourseHomeworkQuestionLogId; + Common.openDlg(url,"开课作业日志管理>"+data.teacherOpenCourseHomeworkQuestionLogId+">编辑"); + }else if(obj.event === "del"){ + layer.confirm('是否确定删除该信息？', function (index) { + var ret = Common.postAjax("/jlw/teacherOpenCourseHomeworkQuestionLog/delete.json",{ids:data.teacherOpenCourseHomeworkQuestionLogId}); + 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/teacherOpenCourseHomeworkQuestionLog/teacherOpenCourseHomeworkQuestionLogApi.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkQuestionLog/teacherOpenCourseHomeworkQuestionLogApi.js new file mode 100644 index 00000000..e2cf0f8b --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkQuestionLog/teacherOpenCourseHomeworkQuestionLogApi.js @@ -0,0 +1,18 @@ +/*访问后台的代码*/ +layui.define([], function(exports) { + var api={ + updateTeacherOpenCourseHomeworkQuestionLog:function(form,callback){ + Lib.submitForm("/jlw/teacherOpenCourseHomeworkQuestionLog/edit.json",form,{},callback) + }, + addTeacherOpenCourseHomeworkQuestionLog:function(form,callback){ + Lib.submitForm("/jlw/teacherOpenCourseHomeworkQuestionLog/add.json",form,{},callback) + }, + del:function(ids,callback){ + Common.post("/jlw/teacherOpenCourseHomeworkQuestionLog/delete.json",{"ids":ids},function(){ + callback(); + }) + } + + }; + exports('teacherOpenCourseHomeworkQuestionLogApi',api); +}); \ No newline at end of file diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkQuestionLog/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkQuestionLog/add.html new file mode 100644 index 00000000..c32c1fed --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkQuestionLog/add.html @@ -0,0 +1,81 @@ + + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + + diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkQuestionLog/edit.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkQuestionLog/edit.html new file mode 100644 index 00000000..78d4b5fa --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkQuestionLog/edit.html @@ -0,0 +1,81 @@ + + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + + diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkQuestionLog/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkQuestionLog/index.html new file mode 100644 index 00000000..1120818d --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkQuestionLog/index.html @@ -0,0 +1,29 @@ + + + +
+ + + + diff --git a/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkControllerTest.java b/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkControllerTest.java index 7cc2e7d3..ffd8cbb0 100644 --- a/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkControllerTest.java +++ b/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkControllerTest.java @@ -1,17 +1,20 @@ package com.ibeetl.jlw.web; import base.BaseTest; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.RandomUtil; import cn.hutool.json.JSONUtil; import com.ibeetl.admin.core.util.BeanUtil; import com.ibeetl.jlw.dao.ResourcesQuestionDao; import com.ibeetl.jlw.dao.SchoolClassDao; +import com.ibeetl.jlw.dao.TeacherOpenCourseDao; import com.ibeetl.jlw.entity.ResourcesQuestion; import com.ibeetl.jlw.entity.SchoolClass; -import com.ibeetl.jlw.web.query.ResourcesQuestionQuery; -import com.ibeetl.jlw.web.query.SchoolClassQuery; +import com.ibeetl.jlw.entity.TeacherOpenCourse; import com.ibeetl.jlw.web.query.TeacherOpenCourseHomeworkQuery; import com.ibeetl.jlw.web.query.TeacherOpenCourseHomeworkSettingQuery; import lombok.extern.slf4j.Slf4j; +import org.junit.Assert; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.RequestBuilder; @@ -36,6 +39,8 @@ class TeacherOpenCourseHomeworkControllerTest extends BaseTest { private ResourcesQuestionDao resourcesQuestionDao; @Resource private SchoolClassDao schoolClassDao; + @Resource + private TeacherOpenCourseDao teacherOpenCourseDao; @Test void getPageList() { @@ -89,25 +94,49 @@ class TeacherOpenCourseHomeworkControllerTest extends BaseTest { void delete() { } + /** + * 根据类型添加作业（题目作业，附件作业） + * + * @throws Exception + */ @Test void addByType() throws Exception { - ResourcesQuestionQuery resourcesQuestionQuery = new ResourcesQuestionQuery(); - resourcesQuestionQuery.setQuestionStatus(1); - List valuesByQuery = resourcesQuestionDao.getValuesByQuery(resourcesQuestionQuery); + // 所有题目 + ResourcesQuestion resourcesQuestion = new ResourcesQuestion(); + resourcesQuestion.setQuestionStatus(1); + List valuesByQuery = resourcesQuestionDao.template(resourcesQuestion); + + // 断言 题目表不能为空 + Assert.assertTrue(ObjectUtil.isNotEmpty(valuesByQuery)); + + // 所有班级 + SchoolClass schoolClass = new SchoolClass(); + schoolClass.setClassStatus(1); + List schoolClassList = schoolClassDao.template(schoolClass); + + // 断言 班级表不能为空 + Assert.assertTrue(ObjectUtil.isNotEmpty(schoolClassList)); - SchoolClassQuery schoolClassQuery = new SchoolClassQuery(); - schoolClassQuery.setClassStatus(1); - List schoolClassList = schoolClassDao.getValuesByQuery(schoolClassQuery); // 随机选题 String resourcesQuestionIds = getRandomString(valuesByQuery, ResourcesQuestion::getResourcesQuestionId); // 随机产生班级ID集合 String schoolClassIds = getRandomString(schoolClassList, SchoolClass::getClassId); + // 随机获取一个开课ID + + TeacherOpenCourse entity = new TeacherOpenCourse(); + entity.setTeacherOpenCourseStatus(1); + List openCourseList = teacherOpenCourseDao.template(entity); + // 断言 开课ID表不能为空 + Assert.assertTrue(ObjectUtil.isNotEmpty(openCourseList)); + // 自动填充属性 TeacherOpenCourseHomeworkQuery teacherOpenCourseHomeworkQuery = randomPojo(TeacherOpenCourseHomeworkQuery.class // 处理plural 结尾的属性 , BeanUtil::ignoreFieldsHandler, (e) -> { + // 随机取一个开课ID + e.setTeacherOpenCourseId(RandomUtil.randomEle(openCourseList).getTeacherOpenCourseId()); e.setTeacherOpenCourseHomeworkType(TeacherOpenCourseHomeworkQuery.TeacherOpenCourseHomeworkTypeEnum.QUESTION); e.setTeacherOpenCourseHomeworkStatus(1); e.setTeacherOpenCourseHomeworkPushStatus(1);