DeXun/fad_oa
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

推送项目重构代码

Browse Source
This commit is contained in:
wangyu
2026-05-29 19:52:32 +08:00
parent 95141d0e1f
commit 3dafaceef2
65 changed files with 3762 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-oa/src/main/resources/mapper/oa/OaRequirementsMapper.xml
View File

@@ -27,7 +27,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
r.*,
u1.nick_name AS requester_nick_name,
u2.nick_name AS owner_nick_name,
p.project_name
p.project_name,
(
SELECT GROUP_CONCAT(CONCAT_WS('|', o.oss_id, COALESCE(o.original_name, o.file_name), o.url)
ORDER BY FIND_IN_SET(o.oss_id, r.accessory) SEPARATOR ',,')
FROM sys_oss o
WHERE r.accessory IS NOT NULL AND r.accessory <> ''
AND FIND_IN_SET(o.oss_id, r.accessory)
) AS accessory_files
FROM oa_requirements r
LEFT JOIN sys_user u1 ON r.requester_id = u1.user_id
LEFT JOIN sys_user u2 ON r.owner_id = u2.user_id
@@ -40,7 +47,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
r.*,
u1.nick_name AS requester_nick_name,
u2.nick_name AS owner_nick_name,
p.project_name
p.project_name,
(
SELECT GROUP_CONCAT(CONCAT_WS('|', o.oss_id, COALESCE(o.original_name, o.file_name), o.url)
ORDER BY FIND_IN_SET(o.oss_id, r.accessory) SEPARATOR ',,')
FROM sys_oss o
WHERE r.accessory IS NOT NULL AND r.accessory <> ''
AND FIND_IN_SET(o.oss_id, r.accessory)
) AS accessory_files
FROM oa_requirements r
LEFT JOIN sys_user u1 ON r.requester_id = u1.user_id
LEFT JOIN sys_user u2 ON r.owner_id = u2.user_id