fix(leave/dorm): 打回重提、审批摘要与待办标题优化

修复请假/销假打回后空 flowCode 导致启动失败;审批弹窗展示请假摘要并去掉附件;待办标题短显请假/销假;点名 todaySummary 与楼栋关联脚本一并同步。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
“wuzhen”andCursor committed 2026-10-21 11:24:48 +08:00
1 parent de223a1f5a
commit 15ed3ec9fb
20 files changed
+1136 -320

No files matched your search

@@ -0,0 +1,64 @@
-- ============================================================
-- 补建:管理员宿舍楼权限关系表 xg_dorm_manager_building
-- 背景:宿舍点名今日汇总(todaySummary)查询未点名寝室时依赖本表,
-- 开发/部分环境库缺失导致 SQLSyntaxErrorException。
-- 执行库:hzdyjs_xg(先开发后生产)
-- 日期:2026-10-20
-- ============================================================
-- 1. 建表(幂等)
CREATE TABLE IF NOT EXISTS `xg_dorm_manager_building` (
`id` bigint(20) NOT NULL COMMENT '主键ID',
`manager_id` bigint(20) NOT NULL COMMENT '管理员ID(xg_dorm_manager.id)',
`building_id` bigint(20) NOT NULL COMMENT '宿舍楼ID(xg_dorm_building.id)',
`status` char(1) DEFAULT '0' COMMENT '状态(0有效 1已撤销)',
`deleted` char(1) DEFAULT '0' COMMENT '删除标志(0代表存在 1代表删除)',
`tenant_id` bigint(20) DEFAULT '0' COMMENT '租户编号',
`create_by` bigint(20) DEFAULT NULL COMMENT '创建者',
`create_dept` bigint(20) DEFAULT NULL COMMENT '创建部门',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` bigint(20) DEFAULT NULL COMMENT '更新者',
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
`remark` varchar(500) DEFAULT NULL COMMENT '备注',
PRIMARY KEY (`id`) USING BTREE,
KEY `idx_manager_id` (`manager_id`) USING BTREE,
KEY `idx_building_id` (`building_id`) USING BTREE,
KEY `idx_manager_building` (`manager_id`, `building_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='管理员宿舍楼权限关系表';
-- 2. 从授权来源表回填「楼栋级」权限(auth_type=4)
-- 使用 source.id 作为主键,避免重复执行产生重复数据
INSERT INTO `xg_dorm_manager_building` (
`id`, `manager_id`, `building_id`, `status`, `deleted`,
`tenant_id`, `create_by`, `create_dept`, `create_time`,
`update_by`, `update_time`, `remark`
)
SELECT
s.`id`,
s.`manager_id`,
s.`auth_source` AS `building_id`,
IFNULL(s.`status`, '0'),
IFNULL(s.`deleted`, '0'),
IFNULL(s.`tenant_id`, 0),
s.`create_by`,
s.`create_dept`,
IFNULL(s.`create_time`, NOW()),
s.`update_by`,
s.`update_time`,
IFNULL(s.`remark`, '从 xg_dorm_manager_source(auth_type=4) 回填')
FROM `xg_dorm_manager_source` s
WHERE IFNULL(s.`deleted`, '0') = '0'
AND s.`auth_type` = '4'
AND s.`auth_source` IS NOT NULL
AND NOT EXISTS (
SELECT 1
FROM `xg_dorm_manager_building` b
WHERE b.`id` = s.`id`
OR (b.`manager_id` = s.`manager_id` AND b.`building_id` = s.`auth_source` AND IFNULL(b.`deleted`, '0') = '0')
);
-- 3. 验收
SELECT
(SELECT COUNT(*) FROM `xg_dorm_manager_building` WHERE IFNULL(deleted, '0') = '0') AS building_perm_count,
(SELECT COUNT(*) FROM `xg_dorm_manager_source`
WHERE IFNULL(deleted, '0') = '0' AND auth_type = '4' AND auth_source IS NOT NULL) AS source_building_count;
@@ -0,0 +1,336 @@
-- =============================================================================
-- 请假打回后无法再审批:排查 + 场景化修复
-- 学号:202513063048(朱晟睿,今早请假;班主任吴旭萍打回)
-- 日期:2026-10-21
-- 现象:打回修改后再提交审不了;审批记录「申请人」待办办理人显示成班主任
--
-- 判断要点(先只跑 SELECT,确认场景后再解开对应 UPDATE):
-- 场景 A:实例 waiting + 业务仍 draft/back → 同步业务状态(昨天上线同类问题)
-- 场景 B:实例 back + 待办停在「申请人」 → 正常等学生重提;核对办理人应为学生
-- 场景 C:同一实例多条残留 flow_task → 清理残留,只留目标节点最新一条
-- 场景 D:实例 waiting + 待办在「班主任审批」但办理人不是班主任 → 改 flow_user
--
-- 注意:
-- 1) 审批记录把「申请人」显示成班主任,多为展示层用当前登录人覆盖,不代表库内办错人
-- 2) 禁止用 SQL 强行把「申请人」节点 skip 到「班主任审批」(易造成历史断层)
-- 3) 所有 UPDATE 默认注释,核对 leave_id / task_id / user_id 后再执行
-- =============================================================================
SET @student_no = '202513063048';
-- -----------------------------------------------------------------------------
-- 一、请假单 + 流程实例(核心对照:业务状态 vs 引擎状态)
-- -----------------------------------------------------------------------------
SELECT
l.id AS leave_id,
l.student_name,
l.student_no,
l.class_id,
l.class_name,
l.leave_type_name,
l.leave_reason,
l.approval_status AS leave_approval_status,
l.start_time,
l.end_time,
l.create_by AS leave_create_by,
l.create_time,
l.update_time,
i.id AS instance_id,
i.flow_status AS instance_flow_status,
i.node_code,
i.node_name,
i.create_by AS instance_create_by,
fd.flow_code,
fd.flow_name,
CASE
WHEN i.id IS NULL THEN '无流程实例'
WHEN i.flow_status = 'waiting' AND IFNULL(l.approval_status, '') <> 'waiting'
THEN '场景A:引擎waiting、业务未waiting → 可修业务状态'
WHEN i.flow_status = 'back' AND i.node_name LIKE '%申请%'
THEN '场景B:已退回申请人 → 应学生重提,老师暂不能审'
WHEN i.flow_status = 'waiting' AND i.node_name LIKE '%班主任%'
THEN '待办应在班主任 → 再查办理人是否正确'
ELSE CONCAT('其它:instance=', IFNULL(i.flow_status, 'null'),
', leave=', IFNULL(l.approval_status, 'null'),
', node=', IFNULL(i.node_name, 'null'))
END AS diagnose_hint
FROM xg_student_leave l
LEFT JOIN flow_instance i
ON i.business_id = CAST(l.id AS CHAR)
AND IFNULL(i.del_flag, '0') = '0'
LEFT JOIN flow_definition fd
ON fd.id = i.definition_id
AND IFNULL(fd.del_flag, '0') = '0'
WHERE l.deleted = 0
AND l.student_no = @student_no
ORDER BY l.create_time DESC;
-- -----------------------------------------------------------------------------
-- 二、当前运行待办 + 真实办理人(以 flow_user 为准,不是审批记录 UI)
-- -----------------------------------------------------------------------------
SELECT
l.id AS leave_id,
i.id AS instance_id,
i.flow_status AS instance_flow_status,
i.node_name AS instance_node_name,
i.create_by AS instance_create_by,
t.id AS task_id,
t.node_code,
t.node_name,
t.flow_status AS task_flow_status,
t.create_time AS task_create_time,
u.id AS flow_user_id,
u.type AS flow_user_type,
u.processed_by AS assignee_user_id,
su.user_name AS assignee_user_name,
su.nick_name AS assignee_nick_name,
su.phonenumber AS assignee_phone,
CASE
WHEN t.node_name LIKE '%申请%'
AND CAST(u.processed_by AS CHAR) = CAST(i.create_by AS CHAR)
THEN 'OK:申请人待办挂在发起人'
WHEN t.node_name LIKE '%申请%'
AND CAST(u.processed_by AS CHAR) <> CAST(i.create_by AS CHAR)
THEN '异常:申请人待办办理人不是发起人 → 场景B修复'
WHEN t.node_name LIKE '%班主任%'
THEN '班主任待办:对照第三节 class_teacher_id'
ELSE '请人工判断'
END AS assignee_hint
FROM xg_student_leave l
INNER JOIN flow_instance i
ON i.business_id = CAST(l.id AS CHAR)
AND IFNULL(i.del_flag, '0') = '0'
INNER JOIN flow_task t
ON t.instance_id = i.id
AND IFNULL(t.del_flag, '0') = '0'
LEFT JOIN flow_user u
ON u.associated = t.id
AND IFNULL(u.del_flag, '0') = '0'
LEFT JOIN sys_user su
ON su.user_id = CAST(u.processed_by AS UNSIGNED)
WHERE l.deleted = 0
AND l.student_no = @student_no
ORDER BY l.create_time DESC, t.create_time DESC;
-- -----------------------------------------------------------------------------
-- 三、班级班主任(对照 bzrspr / 待办办理人)
-- -----------------------------------------------------------------------------
SELECT
l.id AS leave_id,
l.student_name,
l.class_id,
c.class_name,
c.class_teacher_id,
c.class_teacher_name,
su.user_name,
su.nick_name,
su.phonenumber
FROM xg_student_leave l
LEFT JOIN xg_class_msg c
ON c.id = l.class_id
AND c.deleted = 0
LEFT JOIN sys_user su
ON su.user_id = c.class_teacher_id
WHERE l.deleted = 0
AND l.student_no = @student_no
ORDER BY l.create_time DESC;
-- -----------------------------------------------------------------------------
-- 四、历史任务时间线(对照截图:申请人通过 → 班主任退回 → 当前申请人)
-- -----------------------------------------------------------------------------
SELECT
h.id,
h.task_id,
h.node_name,
h.target_node_name,
h.skip_type,
h.flow_status,
h.approver,
su.nick_name AS approver_name,
su.phonenumber AS approver_phone,
h.message,
h.create_time AS start_time,
h.update_time AS end_time
FROM xg_student_leave l
INNER JOIN flow_instance i
ON i.business_id = CAST(l.id AS CHAR)
AND IFNULL(i.del_flag, '0') = '0'
INNER JOIN flow_his_task h
ON h.instance_id = i.id
AND IFNULL(h.del_flag, '0') = '0'
LEFT JOIN sys_user su
ON su.user_id = CAST(h.approver AS UNSIGNED)
WHERE l.deleted = 0
AND l.student_no = @student_no
ORDER BY h.create_time ASC, h.id ASC;
-- -----------------------------------------------------------------------------
-- 五、残留待办检测(同一 instance 多条 flow_task 会导致重提取错 taskId)
-- -----------------------------------------------------------------------------
SELECT
i.id AS instance_id,
COUNT(*) AS open_task_cnt,
GROUP_CONCAT(CONCAT(t.id, ':', t.node_name, ':', t.flow_status)
ORDER BY t.create_time DESC SEPARATOR ' | ') AS task_summary
FROM xg_student_leave l
INNER JOIN flow_instance i
ON i.business_id = CAST(l.id AS CHAR)
AND IFNULL(i.del_flag, '0') = '0'
INNER JOIN flow_task t
ON t.instance_id = i.id
AND IFNULL(t.del_flag, '0') = '0'
WHERE l.deleted = 0
AND l.student_no = @student_no
GROUP BY i.id
HAVING COUNT(*) > 1;
-- -----------------------------------------------------------------------------
-- 六、学生账号(发起人 user_id,用于核对/修复申请人办理人)
-- -----------------------------------------------------------------------------
SELECT
l.id AS leave_id,
l.student_id,
l.student_no,
l.student_name,
i.create_by AS instance_create_by,
su.user_id,
su.user_name,
su.nick_name,
su.phonenumber
FROM xg_student_leave l
LEFT JOIN flow_instance i
ON i.business_id = CAST(l.id AS CHAR)
AND IFNULL(i.del_flag, '0') = '0'
LEFT JOIN sys_user su
ON su.user_id = CAST(i.create_by AS UNSIGNED)
OR su.user_name = l.student_no
WHERE l.deleted = 0
AND l.student_no = @student_no
ORDER BY l.create_time DESC;
-- =============================================================================
-- 以下为修复(全部注释)。先把上面 SELECT 结果贴出来对照,再按场景解开执行。
-- 请把 @leave_id / @instance_id / @keep_task_id 换成第一步查出的真实值。
-- =============================================================================
-- SET @leave_id = 0; -- 第一步 leave_id
-- SET @instance_id = 0; -- 第一步 instance_id
-- SET @keep_task_id = 0; -- 要保留的 task_id(通常最新申请人或班主任任务)
-- -----------------------------------------------------------------------------
-- 修复 A:引擎 waiting,业务仍 draft/back(老师办理页无审批按钮)
-- 条件:第一节 diagnose_hint = 场景A
-- -----------------------------------------------------------------------------
-- UPDATE xg_student_leave l
-- INNER JOIN flow_instance i
-- ON i.business_id = CAST(l.id AS CHAR)
-- AND IFNULL(i.del_flag, '0') = '0'
-- SET l.approval_status = 'waiting',
-- l.update_time = NOW()
-- WHERE l.deleted = 0
-- AND l.id = @leave_id
-- AND i.flow_status = 'waiting'
-- AND IFNULL(l.approval_status, '') <> 'waiting';
-- 核对:
-- SELECT id, approval_status, update_time FROM xg_student_leave WHERE id = @leave_id;
-- -----------------------------------------------------------------------------
-- 修复 B1:实例 back,业务不是 back(展示混乱)→ 业务对齐 back
-- 条件:实例 flow_status=back,待办在申请人
-- -----------------------------------------------------------------------------
-- UPDATE xg_student_leave l
-- INNER JOIN flow_instance i
-- ON i.business_id = CAST(l.id AS CHAR)
-- AND IFNULL(i.del_flag, '0') = '0'
-- SET l.approval_status = 'back',
-- l.update_time = NOW()
-- WHERE l.deleted = 0
-- AND l.id = @leave_id
-- AND i.flow_status = 'back'
-- AND IFNULL(l.approval_status, '') <> 'back';
-- -----------------------------------------------------------------------------
-- 修复 B2:申请人待办办理人不是发起人 → 改回 instance.create_by(学生)
-- 条件:第二节 assignee_hint = 异常
-- 先查再改:
-- -----------------------------------------------------------------------------
-- SELECT u.id, u.associated, u.processed_by, i.create_by
-- FROM flow_user u
-- INNER JOIN flow_task t ON t.id = u.associated AND IFNULL(t.del_flag,'0')='0'
-- INNER JOIN flow_instance i ON i.id = t.instance_id
-- WHERE i.id = @instance_id
-- AND t.node_name LIKE '%申请%'
-- AND IFNULL(u.del_flag,'0') = '0';
-- UPDATE flow_user u
-- INNER JOIN flow_task t
-- ON t.id = u.associated
-- AND IFNULL(t.del_flag, '0') = '0'
-- INNER JOIN flow_instance i
-- ON i.id = t.instance_id
-- AND IFNULL(i.del_flag, '0') = '0'
-- SET u.processed_by = CAST(i.create_by AS CHAR),
-- u.update_time = NOW()
-- WHERE i.id = @instance_id
-- AND t.node_name LIKE '%申请%'
-- AND IFNULL(u.del_flag, '0') = '0'
-- AND CAST(u.processed_by AS CHAR) <> CAST(i.create_by AS CHAR);
-- -----------------------------------------------------------------------------
-- 修复 C:清理残留待办(只保留 @keep_task_id,其余逻辑删除)
-- 条件:第五节 open_task_cnt > 1;keep 选「目标节点最新一条」
-- -----------------------------------------------------------------------------
-- 预览将删除的任务:
-- SELECT id, node_name, flow_status, create_time
-- FROM flow_task
-- WHERE instance_id = @instance_id
-- AND IFNULL(del_flag, '0') = '0'
-- AND id <> @keep_task_id;
-- UPDATE flow_user
-- SET del_flag = '1', update_time = NOW()
-- WHERE associated IN (
-- SELECT id FROM (
-- SELECT id FROM flow_task
-- WHERE instance_id = @instance_id
-- AND IFNULL(del_flag, '0') = '0'
-- AND id <> @keep_task_id
-- ) x
-- )
-- AND IFNULL(del_flag, '0') = '0';
-- UPDATE flow_task
-- SET del_flag = '1', update_time = NOW()
-- WHERE instance_id = @instance_id
-- AND IFNULL(del_flag, '0') = '0'
-- AND id <> @keep_task_id;
-- -----------------------------------------------------------------------------
-- 修复 D:待办已在「班主任审批」且实例 waiting,但办理人不是班主任
-- 条件:第二节 node=班主任审批,processed_by ≠ 第三节 class_teacher_id
-- -----------------------------------------------------------------------------
-- SET @teacher_user_id = 0; -- 第三节 class_teacher_id
-- SET @bzr_task_id = 0; -- 第二节班主任任务 task_id
-- UPDATE flow_user
-- SET processed_by = CAST(@teacher_user_id AS CHAR),
-- update_time = NOW()
-- WHERE associated = @bzr_task_id
-- AND IFNULL(del_flag, '0') = '0'
-- AND type = '1';
-- 同步业务 waiting(若仍不是):
-- UPDATE xg_student_leave
-- SET approval_status = 'waiting', update_time = NOW()
-- WHERE id = @leave_id
-- AND deleted = 0
-- AND IFNULL(approval_status, '') <> 'waiting';
-- -----------------------------------------------------------------------------
-- 修复后复查(建议整段再跑一遍)
-- -----------------------------------------------------------------------------
-- 重跑:一、二、四、五
-- 期望:
-- - 若仍 back+申请人:学生账号打开请假单应有「提交」,提交后 instance→waiting、node→班主任审批
-- - 若 waiting+班主任:flow_user.processed_by = 班主任 user_id,老师待办可审
@@ -0,0 +1,25 @@
-- =============================================================================
-- 今日点名人数汇总 · 开发库演示数据
-- 日期:2026-10-21
-- 批次:RC_TEST_20261021_DEMO
-- 范围:临安6号楼 6102/6103/6104(各 6 人:3在寝+1请假+1异常+1假期留宿)
--
-- 期望(插入后、当日):
-- 列表页全校:总人数≈558,已点名=18,请假=3,假期留宿=3,异常=3
-- 选房页临安6号楼:总人数≈333,已点=18,请假/留宿/异常=3/3/3(可点名单)
--
-- 清理:
-- DELETE FROM xg_dorm_roll_call_detail
-- WHERE roll_call_id IN (SELECT id FROM xg_dorm_roll_call WHERE batch_no='RC_TEST_20261021_DEMO');
-- DELETE FROM xg_dorm_roll_call WHERE batch_no='RC_TEST_20261021_DEMO';
-- =============================================================================
-- 本文件仅作说明与清理;造数已由脚本写入开发库。
-- 若需重造:联系开发用 Python 造数脚本重跑,或手工点名覆盖。
SELECT
r.id, r.batch_no, r.building_name, r.room_name,
r.present_count, r.leave_count, r.holiday_stay_count, r.absent_count, r.check_date
FROM xg_dorm_roll_call r
WHERE r.batch_no = 'RC_TEST_20261021_DEMO'
ORDER BY r.room_name;
@@ -0,0 +1,44 @@
# 请假一年级代理学院 - 开发环境测试账号
> 已写入开发库 `47.99.164.66 / hzdyjs_xg`
> 统一密码:`Hzdyjs123456!@#`
> 系统参数:`xg.studentLeave.freshmanProxyCollegeId = 202512231307170003`(人文学院)
> 学年规则:每年 9 月 1 日切届;当前(2026-09)入学年 **2026=一年级**,**2025=二年级及以上**
## 学生账号
| 用户名 | 姓名 | 说明 | 期望 |
|--------|------|------|------|
| `qjtest_stu_y1` | 请假测试一年级 | 数字信息学院 / 测试班级11 / 入学年 2026 | 学院审批、分管领导 → **人文学院**测试账号 |
| `qjtest_stu_y2` | 请假测试二年级 | 数字信息学院 / 电子商务251 / 入学年 2025 | 学院审批、分管领导 → **数字信息学院**测试账号 |
| `qjtest_stu_noey` | 请假测试无入学年 | 无班级、无入学年 | 提交请假应被拒绝(入学年不完整) |
## 审批账号
| 用户名 | 姓名 | 角色 | 用途 |
|--------|------|------|------|
| `qjtest_bzr` | 请假测试班主任 | 班主任 | 一年级班班主任(测试班级11已挂此班主任) |
| `qjtest_rw_ejxy` | 请假测试人文院审 | 请假二级学院审批人 | 一年级应走到此人 |
| `qjtest_rw_fgld` | 请假测试人文分管 | 请假分管院领导 + xg_college_leader | 一年级长假分管领导应走到此人 |
| `qjtest_sz_ejxy` | 请假测试数信院审 | 请假二级学院审批人 | **对照**:二年级应走此人,一年级不应走 |
| `qjtest_sz_fgld` | 请假测试数信分管 | 分管领导 + xg_college_leader | **对照**:二年级长假应走此人 |
| `qjtest_xsc` | 请假测试学生处 | 请假学生处审批人 | 请假天数 >3 时学生处节点(角色办理) |
## 建议测试步骤
1. 重启后端(或刷新参数缓存),确保读到 `sys_config`。
2. 用 `qjtest_stu_y1` 登录,申请 **>1 天** 请假并提交;待办应出现在 `qjtest_rw_ejxy`,而不是 `qjtest_sz_ejxy`。
3. 用 `qjtest_stu_y2` 同样操作;待办应在 `qjtest_sz_ejxy`。
4. 用 `qjtest_stu_noey` 提交;应提示入学年不完整、无法提交。
5. 可选:一年级申请 **>7 天**,分管领导待办应在 `qjtest_rw_fgld`。
## 清理(如需)
```sql
DELETE FROM sys_user_role WHERE user_id BETWEEN 2090161608000000001 AND 2090161608000000013;
DELETE FROM sys_user WHERE user_name LIKE 'qjtest%';
DELETE FROM xg_student_msg WHERE student_no LIKE 'qjtest%';
DELETE FROM xg_college_leader WHERE remark = '请假一年级代理测试数据';
DELETE FROM sys_config WHERE config_key = 'xg.studentLeave.freshmanProxyCollegeId';
-- 如需恢复测试班级11原班主任,请按业务另行改回
```