代码提交

bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml

@@ -481,6 +481,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			dkpfc.sort AS sort,
 			dkpfc.mark_code AS markCode,
 			dkpfc.term AS term,
+			tfs.pro_name AS proName,
+			tfs.single_pro_name AS singleProName,
 			concat(dkpfc3.content_name,'/',dkpfc2.content_name) AS parParentName,
 			dkpfc1.content_name AS parentName,
 			dkpfc.unit_name AS unitName,
@@ -506,6 +508,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				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
+				left join da_ky_transfer_apply tfs on tfs.id = fs.transfer_apply_id
 		WHERE
 			dkpfc.del_flag = '1' and
 			fs.transfer_apply_id = #{id}

bonus-admin/src/main/resources/mapper/TransferProblemMapper.xml

@@ -53,21 +53,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</delete>
 	<select id="list" resultType="com.bonus.web.domain.TransferProblemDto">
 		SELECT
-			id,
-			pro_id AS proId,
-			pro_name AS proName,
-			single_pro_name AS singleProName,
-			transfer_time AS transferTime,
-			dept_id AS deptId,
-			dept_name AS deptName,
-			transfer_issue AS transferIssue,
-			create_time AS createTime,
-			update_time AS updateTime,
-			create_user_id AS createUserId,
-			create_user_name AS createUserName,
-			update_user_id AS updateUserId,
-			update_user_name AS updateUserName,
-			del_flag AS delFlag
+		dkti.id,
+		dkti.pro_id AS proId,
+		dkti.pro_name AS proName,
+		dkti.single_pro_name AS singleProName,
+		dkti.transfer_time AS transferTime,
+		dkti.dept_id AS deptId,
+		dkti.dept_name AS deptName,
+		dkti.transfer_issue AS transferIssue,
+		dkti.create_time AS createTime,
+		dkti.update_time AS updateTime,
+		dkti.create_user_id AS createUserId,
+		dkti.create_user_name AS createUserName,
+		dkti.update_user_id AS updateUserId,
+		dkti.update_user_name AS updateUserName,
+		dkti.del_flag AS delFlag
 		FROM
 			da_ky_transfer_issue dkti
 		left join da_ky_project dkp ON dkti.pro_id = dkp.id
@@ -86,6 +86,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		  dkti.create_time DESC
 	</select>
 	<select id="getTransferProblemById" resultType="com.bonus.web.domain.TransferProblemDto">
-
+		SELECT
+			dkti.id,
+			dkti.pro_id AS proId,
+			dkti.pro_name AS proName,
+			dkti.single_pro_name AS singleProName,
+			dkti.transfer_time AS transferTime,
+			dkti.dept_id AS deptId,
+			dkti.dept_name AS deptName,
+			dkti.transfer_issue AS transferIssue,
+			dkti.create_time AS createTime,
+			dkti.update_time AS updateTime,
+			dkti.create_user_id AS createUserId,
+			dkti.create_user_name AS createUserName,
+			dkti.update_user_id AS updateUserId,
+			dkti.update_user_name AS updateUserName,
+			dkti.del_flag AS delFlag
+		FROM
+		da_ky_transfer_issue dkti
+		WHERE
+			dkti.id = #{id}
 	</select>
 </mapper>