fix(xg): 修正点名批次号返回值并补上留宿寝室号搜索

批次号必须放在响应 data 中,否则已选校区仍无法加载房间。班主任留宿列表补上寝室号搜索,处分导出改用项目内的 Excel 注解。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
“wuzhen”andCursor committed 2026-11-19 09:26:27 +08:00
1 parent f75c8a6834
commit 5da7a1ce5a
7 files changed
+150 -6

No files matched your search

@@ -0,0 +1,132 @@
-- =============================================================================
-- 2026-11-17 教师反馈整改测试数据
-- 绑定现有在住学生,不新建学生。可重复执行:先按固定 ID 删除再插入。
-- 时间相对 CURDATE(),请在造数当天测试点名和请假展示。
-- 标记:remark / leave_reason / stay_reason 含 TEST-20261117
-- =============================================================================
DELETE FROM xskh_discipline_record WHERE id BETWEEN 2026111704000000001 AND 2026111704000000009;
DELETE FROM xskh_discipline_type WHERE id BETWEEN 2026111703000000001 AND 2026111703000000009
OR id BETWEEN 2026111705000000001 AND 2026111705000000009;
DELETE FROM xg_holiday_stay WHERE id BETWEEN 2026111702000000001 AND 2026111702000000009;
DELETE FROM xg_student_leave WHERE id BETWEEN 2026111701000000001 AND 2026111701000000009;
INSERT INTO sys_dict_data (
dict_code, tenant_id, dict_sort, dict_label, dict_value,
dict_type, css_class, list_class, is_default,
create_dept, create_by, create_time, remark
)
SELECT 2026111310010000001, '000000', 3, '学生处分', '3', 'xskh_violation_source', '', 'warning', 'N',
103, 1, NOW(), '学生处分。警告4、严重警告5、记过8、留校察看10计入班级月扣分;开除学籍记0分'
FROM DUAL
WHERE NOT EXISTS (
SELECT 1 FROM sys_dict_data WHERE dict_type = 'xskh_violation_source' AND dict_value = '3'
);
-- 扣分项:用说明前缀分组,分值按 0.5 档。area_type 1 宿舍、2 教学区
INSERT INTO xskh_discipline_type (
id, type_code, type_name, type_category, area_type, remark, min_score, max_score,
status, sort_order, is_equalized, create_by, create_time, update_by, update_time, create_dept, deleted, tenant_id
) VALUES
(2026111705000000001, 'test20261117_ws', '地面未拖扫', '1', '1', '卫生方面;测试项,每处0.5分', 0.50, 0.50, '0', 901, '0', 1, NOW(), 1, NOW(), 103, 0, '000000'),
(2026111705000000002, 'test20261117_jl', '晚归', '1', '1', '纪律方面;测试项,0.5分一档', 0.50, 3.00, '0', 902, '0', 1, NOW(), 1, NOW(), 103, 0, '000000'),
(2026111705000000003, 'test20261117_zd', '抽烟', '1', '1', '重大违纪;测试项,提醒按钮看本说明', 2.00, 12.00, '0', 903, '0', 1, NOW(), 1, NOW(), 103, 0, '000000'),
(2026111705000000004, 'test20261117_qt', '临时观察项', '1', '1', '未归类的测试项,应出现在其他分组', 0.50, 2.00, '0', 904, '0', 1, NOW(), 1, NOW(), 103, 0, '000000'),
(2026111705000000005, 'test20261117_ws_jx', '教学区地面不洁', '1', '2', '卫生方面;教学区测试项', 0.50, 1.50, '0', 905, '0', 1, NOW(), 1, NOW(), 103, 0, '000000'),
(2026111705000000006, 'test20261117_jl_jx', '课堂迟到', '1', '2', '纪律方面;教学区测试项', 0.50, 2.00, '0', 906, '0', 1, NOW(), 1, NOW(), 103, 0, '000000'),
(2026111705000000007, 'test20261117_zd_jx', '打架斗殴', '1', '2', '重大违纪;教学区测试项', 2.00, 12.00, '0', 907, '0', 1, NOW(), 1, NOW(), 103, 0, '000000');
-- 处分种类,area_type=0,不出现在宿舍/教学区扣分选择里
INSERT INTO xskh_discipline_type (
id, type_code, type_name, type_category, area_type, remark, min_score, max_score,
status, sort_order, is_equalized, create_by, create_time, update_by, update_time, create_dept, deleted, tenant_id
) VALUES
(2026111703000000001, 'cf_warning', '警告', '2', '0', '学生处分,计入班级月扣分', 4.00, 4.00, '0', 1, '0', 1, NOW(), 1, NOW(), 103, 0, '000000'),
(2026111703000000002, 'cf_serious_warning', '严重警告', '2', '0', '学生处分,计入班级月扣分', 5.00, 5.00, '0', 2, '0', 1, NOW(), 1, NOW(), 103, 0, '000000'),
(2026111703000000003, 'cf_demerit', '记过', '2', '0', '学生处分,计入班级月扣分', 8.00, 8.00, '0', 3, '0', 1, NOW(), 1, NOW(), 103, 0, '000000'),
(2026111703000000004, 'cf_probation', '留校察看', '2', '0', '学生处分,计入班级月扣分', 10.00, 10.00, '0', 4, '0', 1, NOW(), 1, NOW(), 103, 0, '000000'),
(2026111703000000005, 'cf_expulsion', '开除学籍', '2', '0', '开除学籍不计班级扣分', 0.00, 0.00, '0', 5, '0', 1, NOW(), 1, NOW(), 103, 0, '000000');
-- 请假:审批完成。点名按当前时刻判断,卫生检查按当天重叠展示
INSERT INTO xg_student_leave (
id, tenant_id, create_by, create_time, update_by, update_time, deleted,
student_id, student_name, student_no, class_id, class_name, major_id, major_name, college_id, college_name,
leave_type_code, leave_type_name, start_time, end_time, leave_duration, is_leave_school, need_cancel,
leave_reason, approval_status
) VALUES
(2026111701000000001, '000000', 1, NOW(), 1, NOW(), 0,
2025122318101409228, '杨俊晖', '202201362028', 202512231409090214, '数字制造221', 20251223133303094, '数字化设计与制造', 202512231307170015, '智能制造学院',
'PERSONAL_LEAVE', '事假', CONCAT(CURDATE(), ' 18:00:00'), CONCAT(CURDATE(), ' 21:30:00'), 0.15, '0', '0',
'TEST-20261117 临安6501,今晚21:30返寝,同时有假期留宿', 'finish'),
(2026111701000000002, '000000', 1, NOW(), 1, NOW(), 0,
2025122318101409226, '熊忠文', '202201362026', 202512231409090214, '数字制造221', 20251223133303094, '数字化设计与制造', 202512231307170015, '智能制造学院',
'SICK_LEAVE', '病假', CONCAT(CURDATE(), ' 08:00:00'), CONCAT(CURDATE(), ' 10:00:00'), 0.08, '0', '0',
'TEST-20261117 临安6501,今天上午已结束,晚上点名不应锁成请假', 'finish'),
(2026111701000000003, '000000', 1, NOW(), 1, NOW(), 0,
2025122318101409225, '项晨', '202201362025', 202512231409090214, '数字制造221', 20251223133303094, '数字化设计与制造', 202512231307170015, '智能制造学院',
'OUT_LEAVE', '外出请假', CONCAT(DATE_SUB(CURDATE(), INTERVAL 1 DAY), ' 08:00:00'), CONCAT(DATE_ADD(CURDATE(), INTERVAL 1 DAY), ' 18:00:00'), 2.40, '1', '1',
'TEST-20261117 临安6501,当前仍在请假,结束时刻18:00,不是晚归', 'finish'),
(2026111701000000004, '000000', 1, NOW(), 1, NOW(), 0,
2025122318101409209, '洪一非', '202201362007', 202512231409090214, '数字制造221', 20251223133303094, '数字化设计与制造', 202512231307170015, '智能制造学院',
'HOME_LEAVE', '回家请假', CONCAT(CURDATE(), ' 20:00:00'), CONCAT(DATE_ADD(CURDATE(), INTERVAL 1 DAY), ' 01:30:00'), 0.23, '1', '1',
'TEST-20261117 临安6501,次日01:30返寝,橙色晚归', 'finish'),
(2026111701000000005, '000000', 1, NOW(), 1, NOW(), 0,
2025122318101413668, '余瑞恬', '202513022036', 202512231409090342, '药剂251', 20251223133304112, '药物制剂', 202512231307170006, '医药健康学院',
'PERSONAL_LEAVE', '事假', CONCAT(CURDATE(), ' 19:00:00'), CONCAT(CURDATE(), ' 22:10:00'), 0.13, '0', '0',
'TEST-20261117 西溪1101,22:10返寝。只应出现在西溪点名', 'finish');
-- 假期留宿:开始日08:00,结束为最后一晚的次日08:00
INSERT INTO xg_holiday_stay (
id, tenant_id, create_by, create_time, update_by, update_time, deleted,
student_id, student_name, student_no, class_id, class_name, major_id, major_name, college_id, college_name,
campus_id, campus_name, area_id, area_name, building_id, building_name, room_id, room_name, bed_id, bed_name,
holiday_type, apply_start_date, apply_end_date, stay_reason, stay_reason_type, student_phone,
emergency_contact, emergency_phone, parent_consent, apply_status, apply_time, remark
) VALUES
(2026111702000000001, '000000', 1, NOW(), 1, NOW(), 0,
2025122318101409228, '杨俊晖', '202201362028', 202512231409090214, '数字制造221', 20251223133303094, '数字化设计与制造', 202512231307170015, '智能制造学院',
1946815834653605889, '临安校区', 2015638219126755329, '临安默认宿舍区', 2048581964566482945, '临安6号楼', 2055600000000000501, '6501寝室', 2055700000000005011, '6501-01',
'国庆假期', CONCAT(CURDATE(), ' 08:00:00'), CONCAT(DATE_ADD(CURDATE(), INTERVAL 1 DAY), ' 08:00:00'),
'TEST-20261117 已通过,与今晚请假同时存在', '学习', '13800001001', '张父', '13800000001', '1', '2', NOW(), 'TEST-20261117'),
(2026111702000000002, '000000', 1, NOW(), 1, NOW(), 0,
2025122318101409235, '钟涛', '202201362037', 202512231409090214, '数字制造221', 20251223133303094, '数字化设计与制造', 202512231307170015, '智能制造学院',
1946815834653605889, '临安校区', 2015638219126755329, '临安默认宿舍区', 2048581964566482945, '临安6号楼', 2055600000000000501, '6501寝室', 2055700000000005014, '6501-04',
'国庆假期', CONCAT(DATE_ADD(CURDATE(), INTERVAL 1 DAY), ' 08:00:00'), CONCAT(DATE_ADD(CURDATE(), INTERVAL 2 DAY), ' 08:00:00'),
'TEST-20261117 已通过,开始日比杨俊晖晚一天,列表应排在后面', '实习', '13800001002', '钟父', '13800000002', '1', '2', NOW(), 'TEST-20261117'),
(2026111702000000003, '000000', 1, NOW(), 1, NOW(), 0,
2025122318101409233, '张峻玮', '202201362033', 202512231409090214, '数字制造221', 20251223133303094, '数字化设计与制造', 202512231307170015, '智能制造学院',
1946815834653605889, '临安校区', 2015638219126755329, '临安默认宿舍区', 2048581964566482945, '临安6号楼', 2055600000000000501, '6501寝室', 2055700000000005015, '6501-05',
'寒假', CONCAT(DATE_ADD(CURDATE(), INTERVAL 3 DAY), ' 08:00:00'), CONCAT(DATE_ADD(CURDATE(), INTERVAL 5 DAY), ' 08:00:00'),
'TEST-20261117 待审,寝室号搜索6501应能命中', '家庭困难', '13800001003', '张父', '13800000003', '1', '1', NOW(), 'TEST-20261117'),
(2026111702000000004, '000000', 1, NOW(), 1, NOW(), 0,
2025122318101409214, '金奕凯', '202201362012', 202512231409090214, '数字制造221', 20251223133303094, '数字化设计与制造', 202512231307170015, '智能制造学院',
1946815834653605889, '临安校区', 2015638219126755329, '临安默认宿舍区', 2048581964566482945, '临安6号楼', 2055600000000000501, '6501寝室', 2055700000000005016, '6501-06',
'寒假', CONCAT(DATE_ADD(CURDATE(), INTERVAL 2 DAY), ' 08:00:00'), CONCAT(DATE_ADD(CURDATE(), INTERVAL 3 DAY), ' 08:00:00'),
'TEST-20261117 待审,开始日早于张峻玮', '其他', '13800001004', '金父', '13800000004', '1', '1', NOW(), 'TEST-20261117'),
(2026111702000000005, '000000', 1, NOW(), 1, NOW(), 0,
2025122318101413638, '高佳怡', '202513022004', 202512231409090342, '药剂251', 20251223133304112, '药物制剂', 202512231307170006, '医药健康学院',
1946815553291304962, '西溪校区', 2015639946668298241, '西溪默认宿舍区', 2048578056012025858, '西溪1号楼', 2048600000000000101, '1101寝室', 2048700000000001012, '1101-1X',
'国庆假期', CONCAT(CURDATE(), ' 08:00:00'), CONCAT(DATE_ADD(CURDATE(), INTERVAL 1 DAY), ' 08:00:00'),
'TEST-20261117 西溪已通过留宿,不应出现在临安点名', '学习', '13800001005', '高父', '13800000005', '1', '2', NOW(), 'TEST-20261117'),
(2026111702000000006, '000000', 1, NOW(), 1, NOW(), 0,
2025122318101409225, '项晨', '202201362025', 202512231409090214, '数字制造221', 20251223133303094, '数字化设计与制造', 202512231307170015, '智能制造学院',
1946815834653605889, '临安校区', 2015638219126755329, '临安默认宿舍区', 2048581964566482945, '临安6号楼', 2055600000000000501, '6501寝室', 2055700000000005012, '6501-02',
'寒假', CONCAT(CURDATE(), ' 08:00:00'), CONCAT(DATE_ADD(CURDATE(), INTERVAL 1 DAY), ' 08:00:00'),
'TEST-20261117 已驳回,待审和已通过页搜6501不应出现', '其他', '13800001006', '项父', '13800000006', '1', '3', NOW(), 'TEST-20261117');
-- 学生处分:药剂251 四档有分,数字制造221 开除学籍 0 分
INSERT INTO xskh_discipline_record (
id, student_id, student_no, student_name, college_id, college_name, major_id, major_name, class_id, class_name,
discipline_type_id, discipline_type_name, discipline_date, discipline_reason, discipline_content,
score_deduction, status, violation_source, create_by, create_time, create_dept, deleted, tenant_id
) VALUES
(2026111704000000001, 2025122318101413665, '202513022032', '徐璟雯', 202512231307170006, '医药健康学院', 20251223133304112, '药物制剂', 202512231409090342, '药剂251',
2026111703000000001, '警告', CONCAT(CURDATE(), ' 00:00:00'), 'TEST-20261117 警告', '计入班级月扣分4分', 4.00, '1', '3', 1, NOW(), 103, 0, '000000'),
(2026111704000000002, 2025122318101413674, '202513022044', '朱鑫瑶', 202512231307170006, '医药健康学院', 20251223133304112, '药物制剂', 202512231409090342, '药剂251',
2026111703000000002, '严重警告', CONCAT(CURDATE(), ' 00:00:00'), 'TEST-20261117 严重警告', '计入班级月扣分5分', 5.00, '1', '3', 1, NOW(), 103, 0, '000000'),
(2026111704000000003, 2025122318101413653, '202513022019', '刘熙媛', 202512231307170006, '医药健康学院', 20251223133304112, '药物制剂', 202512231409090342, '药剂251',
2026111703000000003, '记过', CONCAT(CURDATE(), ' 00:00:00'), 'TEST-20261117 记过', '计入班级月扣分8分', 8.00, '1', '3', 1, NOW(), 103, 0, '000000'),
(2026111704000000004, 2025122318101413658, '202513022024', '沈云婷', 202512231307170006, '医药健康学院', 20251223133304112, '药物制剂', 202512231409090342, '药剂251',
2026111703000000004, '留校察看', CONCAT(CURDATE(), ' 00:00:00'), 'TEST-20261117 留校察看', '计入班级月扣分10分', 10.00, '1', '3', 1, NOW(), 103, 0, '000000'),
(2026111704000000005, 2025122318101409214, '202201362012', '金奕凯', 202512231307170015, '智能制造学院', 20251223133303094, '数字化设计与制造', 202512231409090214, '数字制造221',
2026111703000000005, '开除学籍', CONCAT(CURDATE(), ' 00:00:00'), 'TEST-20261117 开除学籍', '登记人次,班级扣分0', 0.00, '1', '3', 1, NOW(), 103, 0, '000000');