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

修复文件ossbug全部改用ossId二次请求方式

Browse Source
This commit is contained in:
hdka
2025-05-21 11:55:43 +08:00
parent 1715aa3639
commit 69de2b28cf
21 changed files with 73 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskMapper.xml
View File

@@ -31,28 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="endTime" column="itemEndTime"/>
<result property="remark" column="itemRemark"/>
<result property="completedTime" column="itemCompletedTime"/>
<!-- ========== 附件列表：多对一 折叠 ========= -->
<collection property="itemFileList"
ofType="com.ruoyi.system.domain.SysOss"
javaType="java.util.ArrayList">
<result property="ossId" column="item_oss_id"/>
<result property="url" column="item_attach_url"/>
<result property="fileName" column="item_attach_file_name"/>
<result property="createBy" column="item_create_by"/>
<result property="isPublic" column="item_is_public"/>
<result property="ownerId" column="item_owner_id"/>
</collection>
</collection>
<!-- ========== 附件列表：多对一 折叠 ========= -->
<collection property="fileList"
ofType="com.ruoyi.system.domain.SysOss"
javaType="java.util.ArrayList">
<result property="ossId" column="oss_id"/>
<result property="url" column="attach_url"/>
<result property="fileName" column="attach_file_name"/>
<result property="createBy" column="create_by"/>
<result property="isPublic" column="is_public"/>
<result property="ownerId" column="owner_id"/>
</collection>
</resultMap>
@@ -159,10 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
su1.nick_name AS createUserNickName,
su2.nick_name AS workerNickName,
(SELECT GROUP_CONCAT(so.url SEPARATOR ',')
FROM sys_oss so
WHERE FIND_IN_SET(so.oss_id, sot.accessory) > 0) AS accessory,
sot.accessory,
sot.rank_number,
sot.remark,
sot.task_rank,
@@ -201,24 +177,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
ELSE 0
END AS overDays,
so.oss_id AS oss_id,
so.url AS attach_url,
so.original_name AS attach_file_name, -- 如有需要
so.create_by,
so.is_public,
so.owner_id,
so2.oss_id AS item_oss_is,
so2.url AS item_attach_url,
so2.original_name AS item_attach_file_name, -- 如有需要
so2.create_by as item_create_by,
so2.is_public as item_is_public,
so2.owner_id as item_owner_id
soti.files
FROM sys_oa_task sot
LEFT JOIN sys_user su1
ON su1.user_id = sot.create_user_id
LEFT JOIN sys_user su2 ON su2.user_id = sot.worker_id
LEFT JOIN sys_oa_project sop ON sop.project_id = sot.project_id
LEFT JOIN sys_oss so ON FIND_IN_SET(so.oss_id, sot.accessory)
LEFT JOIN sys_oa_task_item soti ON soti.task_id = sot.task_id
LEFT JOIN sys_oss so2 ON FIND_IN_SET(so2.oss_id, soti.files)
WHERE
@@ -337,12 +301,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sot.postponements,
sot.completed_time,
sot.content,
(
SELECT GROUP_CONCAT(so.url SEPARATOR ',')
FROM sys_oss so
WHERE FIND_IN_SET(so.oss_id, sot.accessory) > 0
) AS accessory,
sot.accessory,
sot.rank_number,
sot.remark,
sot.task_rank,
@@ -365,11 +324,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
THEN DATEDIFF(NOW(), COALESCE(sot.finish_time, soti.end_time))
ELSE 0
END AS overDays,
(
SELECT GROUP_CONCAT(so.url SEPARATOR ',')
FROM sys_oss so
WHERE FIND_IN_SET(so.oss_id, soti.files) > 0
) AS files
soti.files
FROM sys_oa_task_user sotu
left join sys_oa_task sot on sot.task_id = sotu.task_id
@@ -390,18 +345,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
sot.create_user_id,
sot.worker_id,
(
SELECT GROUP_CONCAT(so.url SEPARATOR ',')
FROM sys_oss so
WHERE FIND_IN_SET(so.oss_id, sot.accessory) > 0
) AS accessory,
sop.accessory,
su1.nick_name AS createUserNickName,
su2.nick_name AS workerNickName,
(
SELECT GROUP_CONCAT(so.url SEPARATOR ',')
FROM sys_oss so
WHERE FIND_IN_SET(so.oss_id, soti.files) > 0
) AS files
soti.files
FROM sys_oa_task sot
LEFT JOIN sys_user su1 ON su1.user_id = sot.create_user_id
LEFT JOIN sys_user su2 ON su2.user_id = sot.worker_id
@@ -410,18 +358,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE
sot.project_id = #{projectId}
AND sot.del_flag = '0'
AND (
IFNULL((
SELECT GROUP_CONCAT(so.url SEPARATOR ',')
FROM sys_oss so
WHERE FIND_IN_SET(so.oss_id, sot.accessory) > 0
), '') != ''
OR IFNULL((
SELECT GROUP_CONCAT(so.url SEPARATOR ',')
FROM sys_oss so
WHERE FIND_IN_SET(so.oss_id, soti.files) > 0
), '') != ''
)
</select>