Compare commits

..

2 Commits

Author SHA1 Message Date
Maksim Skobaro
0a2d7c2c42 changes. 2025-06-24 02:58:15 +03:00
Maksim Skobaro
46d0e5555c changes. 2025-06-24 02:56:23 +03:00
2 changed files with 4 additions and 2 deletions

View File

@ -123,7 +123,7 @@ public class ParticipantService {
if (defenses != null && !defenses.isEmpty()) { if (defenses != null && !defenses.isEmpty()) {
defense = defenses.get(0); defense = defenses.get(0);
} }
if (defense != null) { if (defense != null && defense.isStateShouldBeProcessed(Defense.Status.TOPIC_CHOOSING)) {
taskService.checkAndCreateTopicChoosingTasksAndSendEmail(Collections.singletonList(studentData), defense); taskService.checkAndCreateTopicChoosingTasksAndSendEmail(Collections.singletonList(studentData), defense);
} }
} }

View File

@ -24,6 +24,7 @@ INSERT INTO public.participant (id, first_name, last_name, middle_name, email, n
INSERT INTO public.participant (id, first_name, last_name, middle_name, email, number_phone, deleted, created_at, updated_at) VALUES (27, 'София', 'Тихонова', 'Дмитриевна', 'tikhonova.sofia@mail.ru', '+79997892345', false, '2025-06-23 03:41:56.458424', '2025-06-23 03:41:56.458431'); INSERT INTO public.participant (id, first_name, last_name, middle_name, email, number_phone, deleted, created_at, updated_at) VALUES (27, 'София', 'Тихонова', 'Дмитриевна', 'tikhonova.sofia@mail.ru', '+79997892345', false, '2025-06-23 03:41:56.458424', '2025-06-23 03:41:56.458431');
INSERT INTO public.participant (id, first_name, last_name, middle_name, email, number_phone, deleted, created_at, updated_at) VALUES (23, 'Валерия', 'Королёва', 'Игоревна', 'koroleva.valeria@yandex.ru', '+79993458901', false, '2025-06-23 03:42:42.283585', '2025-06-23 03:42:42.283594'); INSERT INTO public.participant (id, first_name, last_name, middle_name, email, number_phone, deleted, created_at, updated_at) VALUES (23, 'Валерия', 'Королёва', 'Игоревна', 'koroleva.valeria@yandex.ru', '+79993458901', false, '2025-06-23 03:42:42.283585', '2025-06-23 03:42:42.283594');
INSERT INTO public.participant (id, first_name, last_name, middle_name, email, number_phone, deleted, created_at, updated_at) VALUES (22, 'Максим', 'Волков', 'Олегович', 'volkov.maxim@gmail.com', '+79992347890', false, '2025-06-23 04:17:19.212758', '2025-06-23 04:17:19.212763'); INSERT INTO public.participant (id, first_name, last_name, middle_name, email, number_phone, deleted, created_at, updated_at) VALUES (22, 'Максим', 'Волков', 'Олегович', 'volkov.maxim@gmail.com', '+79992347890', false, '2025-06-23 04:17:19.212758', '2025-06-23 04:17:19.212763');
INSERT INTO public.participant (id, first_name, last_name, middle_name, email, number_phone, deleted, created_at, updated_at) VALUES (29,'Георгий','Павлов','Максимович','pavlov.georgiy@mail.com','+79936652346',false,'2025-06-24 03:24:17.701799','2025-06-24 03:24:17.701811');
INSERT INTO public.teacher_data (id, participant_id, degree, created_at, updated_at) VALUES (1, 22, 'ктн., доц.', '2025-06-23 03:39:38.369701', '2025-06-23 03:39:38.369706'); INSERT INTO public.teacher_data (id, participant_id, degree, created_at, updated_at) VALUES (1, 22, 'ктн., доц.', '2025-06-23 03:39:38.369701', '2025-06-23 03:39:38.369706');
INSERT INTO public.teacher_data (id, participant_id, degree, created_at, updated_at) VALUES (2, 23, 'ктн., доц.', '2025-06-23 03:39:55.268771', '2025-06-23 03:39:55.268774'); INSERT INTO public.teacher_data (id, participant_id, degree, created_at, updated_at) VALUES (2, 23, 'ктн., доц.', '2025-06-23 03:39:55.268771', '2025-06-23 03:39:55.268774');
@ -81,9 +82,10 @@ INSERT INTO public.student_data (id, partic_id, study_form_id, curator_id, prote
INSERT INTO public.student_data (id, partic_id, study_form_id, curator_id, protection_order, protection_day, mark_practice, predefnese_mark, oztiv_mark, normal_control, anti_plagiarism, record_book_returned, work, diploma_topic_id, adviser_teacher_partic_id, group_id, marks_3, marks_4, marks_5, commission_mark, estimated, diploma_with_honors, vnedreniye, magistracy_recommendation, magistracy_wanted, electronic, created_at, updated_at) VALUES (11, 12, null, 2, 1, 2, 5, 4, 4, true, 78, true, '', 17, null, 2, 21, 24, 17, null, null, false, false, false, false, true, '2025-06-23 03:50:04.761995', '2025-06-23 03:50:04.761999'); INSERT INTO public.student_data (id, partic_id, study_form_id, curator_id, protection_order, protection_day, mark_practice, predefnese_mark, oztiv_mark, normal_control, anti_plagiarism, record_book_returned, work, diploma_topic_id, adviser_teacher_partic_id, group_id, marks_3, marks_4, marks_5, commission_mark, estimated, diploma_with_honors, vnedreniye, magistracy_recommendation, magistracy_wanted, electronic, created_at, updated_at) VALUES (11, 12, null, 2, 1, 2, 5, 4, 4, true, 78, true, '', 17, null, 2, 21, 24, 17, null, null, false, false, false, false, true, '2025-06-23 03:50:04.761995', '2025-06-23 03:50:04.761999');
INSERT INTO public."user" (id, login, password, partic_id, created_at, updated_at) VALUES (2, 'Teacher001', '{bcrypt}$2a$10$.HTDUMHEv3cMjZfdJPyrtugku6guROyqo9bDz5V46705ix0E94Rmm', 22, '2025-06-23 04:17:19.213271', '2025-06-23 04:17:19.213274'); INSERT INTO public."user" (id, login, password, partic_id, created_at, updated_at) VALUES (2, 'Teacher001', '{bcrypt}$2a$10$.HTDUMHEv3cMjZfdJPyrtugku6guROyqo9bDz5V46705ix0E94Rmm', 22, '2025-06-23 04:17:19.213271', '2025-06-23 04:17:19.213274');
INSERT INTO public."user" (id, login, password, partic_id, created_at, updated_at) VALUES (4, 'Secretary001', '{bcrypt}$2a$10$H/uiV2i.KXBIfv/XtQTinO4Hx4UfkaXuc1BKHL2CX2xkLryOXPdru', 29, '2025-06-24 03:24:17.963794', '2025-06-24 03:24:17.963823');
INSERT INTO public.participant_role (partic_id, role_id) VALUES (2, 2); INSERT INTO public.participant_role (partic_id, role_id) VALUES (2, 2);
INSERT INTO public.participant_role (partic_id, role_id) VALUES (22, 1); INSERT INTO public.participant_role (partic_id, role_id) VALUES (22, 4);
INSERT INTO public.participant_role (partic_id, role_id) VALUES (3, 2); INSERT INTO public.participant_role (partic_id, role_id) VALUES (3, 2);
INSERT INTO public.participant_role (partic_id, role_id) VALUES (4, 2); INSERT INTO public.participant_role (partic_id, role_id) VALUES (4, 2);
INSERT INTO public.participant_role (partic_id, role_id) VALUES (5, 2); INSERT INTO public.participant_role (partic_id, role_id) VALUES (5, 2);