🐛 修复收款流水继续认领与付款可付口径,并改用OA登录名提交流程

收款流水部分认领预填关联结算单并修正认领完成判定;正式结算尾款扣减预付占用;预付驳回重提纠正结算引用;临时额度取消强制项目额度校验;用户增加OA登录名供MK流程使用。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-10-19 17:12:22 +08:00
parent 68a5d581f3
commit fce582e80b
15 changed files with 337 additions and 84 deletions
@@ -0,0 +1,18 @@
-- 用户表:新增 OA 登录名,支持用户管理后台维护
-- 排序规则 utf8mb4_general_ci
ALTER TABLE `blade_user`
ADD COLUMN `oa_login_id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'OA登录名' AFTER `is_oa`;
-- 从用户部门关联表回填已有 OA 登录账号
UPDATE `blade_user` bu
INNER JOIN (
SELECT `user_id`, MAX(`oa_login_id`) AS `oa_login_id`
FROM `blade_user_dept`
WHERE `is_deleted` = 0
AND `oa_login_id` IS NOT NULL
AND `oa_login_id` <> ''
GROUP BY `user_id`
) bud ON bud.`user_id` = bu.`id`
SET bu.`oa_login_id` = bud.`oa_login_id`
WHERE bu.`oa_login_id` IS NULL OR bu.`oa_login_id` = '';