diff --git a/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java b/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java index 1cbdb9b..c179b13 100644 --- a/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java +++ b/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java @@ -38,6 +38,7 @@ public class DaKyProFilesContentsDto { private String parentId; private String parentName; + private String parParentName; /** * 所属专业 */ diff --git a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml index 83180f4..6fca45c 100644 --- a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml +++ b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml @@ -414,6 +414,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dkpfc.sort AS sort, dkpfc.mark_code AS markCode, dkpfc.term AS term, + concat(dkpfc3.content_name,'/',dkpfc2.content_name) AS parParentName, + dkpfc1。content_name AS parentName, dkpfc.unit_name AS unitName, CASE @@ -431,6 +433,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dkfs.create_user_name AS createUserName 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 fs ON dkfs.id = fs.file_source_id WHERE @@ -439,8 +444,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND dkpfc.pro_id = #{proId} AND dkpfc.LEVEL = 5 AND NOT EXISTS ( SELECT 1 FROM da_ky_transfer_file tf WHERE tf.file_source_id = dkfs.id ) - ORDER BY - dkpfc.create_time DESC