代码提交

This commit is contained in:
liang.chao 2025-09-28 16:50:03 +08:00
parent c6f2dbc29d
commit 2ce021fbe4
3 changed files with 32 additions and 4 deletions

View File

@ -27,6 +27,22 @@ public class TransferFileDto {
* 项目ID
*/
private String proId;
/**
* 项目名称
*/
private String proName;
/**
* 项目单向名称
*/
private String singleProName;
/**
* 项目单向名称
*/
private String contentName;
/**
* 项目单向名称
*/
private String parParentName;
/**
* 系统资源文件ID关联 da_ky_sys_file_source.id
@ -73,7 +89,6 @@ public class TransferFileDto {
*/
private String updateTime;
private String parParentName;
private String parentName;
}

View File

@ -63,6 +63,7 @@ public class TransferApplyServiceImpl implements TransferApplyService {
@Override
public TransferApplyDto getTransferApply(TransferApplyDto dto) {
dto.setTransferStatus("1");
TransferApplyDto transferApply = transferApplyMapper.getTransferApply(dto);
transferApply.setTransferFileDtos(transferApplyMapper.getTransferFile(dto));
return transferApply;

View File

@ -426,6 +426,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
CROSS JOIN da_ky_transfer_apply dkta
WHERE dkta.del_flag = '1'
AND dkta.id = #{id}
<if test="transferStatus != null and transferStatus != ''">
AND dkta.transfer_status = #{transferStatus}
</if>
AND dt.level = (SELECT MAX(level) FROM DeptTree)
</select>
<select id="getProSelect" resultType="com.bonus.web.domain.ProSelectDto">
@ -439,14 +442,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
del_flag = '1' and file_status = '1'
</select>
<select id="getTransferFile" resultType="com.bonus.web.domain.TransferFileDto">
SELECT
SELECT DISTINCT
dkp.pro_name AS proName,
dkp.single_pro_name AS singleProName,
dktf.file_name AS fileName,
dkpfc.content_name AS contentName,
concat(dkpfc3.content_name,'/',dkpfc2.content_name) AS parParentName,
dkpfc1.content_name AS parentName,
dktf.transfer_time AS transferTime,
dktf.receive_status AS receiveStatus
FROM da_ky_transfer_file dktf
FROM da_ky_pro_files_contents dkpfc
left join da_ky_pro_files_contents dkpfc1 on dkpfc.parent_id = dkpfc1.id
left join da_ky_pro_files_contents dkpfc2 on dkpfc1.parent_id = dkpfc2.id
left join da_ky_pro_files_contents dkpfc3 on dkpfc2.parent_id = dkpfc3.id
LEFT JOIN da_ky_sys_file_source dkfs ON dkpfc.id = dkfs.business_id
LEFT JOIN da_ky_transfer_file dktf ON dkfs.id = dktf.file_source_id
left join da_ky_project dkp on dkp.id = dktf.pro_id
where dktf.transfer_apply_id = #{id}
where dktf.transfer_apply_id = #{id}
</select>
<select id="getDeptSelect" resultType="com.bonus.common.core.domain.entity.SysDept">
SELECT dept_id AS deptId,