代码提交

bonus-admin/src/main/java/com/bonus/web/controller/archive/FileTransferRecordController.java

@@ -74,7 +74,7 @@ public class FileTransferRecordController extends BaseController {
     }
     @ApiOperation(value = "修改档案移交清单文件名")
     @GetMapping("updateTransferRecordFile")
-    @SysLog(title = "修改档案移交清单文件名", module = "数据/档案移交->档案移交记录", businessType = OperaType.QUERY, details = "修改档案移交清单文件名", logType = 1)
+    @SysLog(title = "修改档案移交清单文件名", module = "数据/档案移交->档案移交记录", businessType = OperaType.UPDATE, details = "修改档案移交清单文件名", logType = 1)
     public AjaxResult updateTransferRecordFile(TransferFileDto dto) {
         try {
             return transferApplyService.updateTransferRecordFile(dto);

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

@@ -347,20 +347,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		ORDER BY dkta.create_time DESC
 	</select>
 	<select id="getTransferApply" resultType="com.bonus.web.domain.TransferApplyDto">
+		WITH RECURSIVE DeptTree AS (
+			SELECT
+				dept_id,
+				dept_name,
+				parent_id,
+				dept_name AS full_path,
+				0 AS level
+			FROM da_ky_sys_dept
+			WHERE dept_id = (SELECT dept_id FROM da_ky_transfer_apply WHERE id = #{id})
+
+			UNION ALL
+
+			SELECT
+				d.dept_id,
+				d.dept_name,
+				d.parent_id,
+				CONCAT(d.dept_name, ' / ', dt.full_path) AS full_path,
+				dt.level + 1
+			FROM da_ky_sys_dept d
+					 INNER JOIN DeptTree dt ON d.dept_id = dt.parent_id
+		)
 		SELECT
-			dept_name AS deptName,
+			dt.full_path AS deptName,
-			pro_name AS proName,
+			dkta.pro_name AS proName,
-			apply_user AS applyUser,
+			dkta.apply_user AS applyUser,
-			apply_time AS applyTime,
+			dkta.apply_time AS applyTime,
-			audit_user AS auditUser,
+			dkta.audit_user AS auditUser,
-			audit_time AS auditTime,
+			dkta.audit_time AS auditTime,
-			audit_opinion AS auditOpinion,
+			dkta.audit_opinion AS auditOpinion,
-		    case audit_status when '0' then '待审批'
+			CASE dkta.audit_status
-		    when '1' then '审批通过'
+				WHEN '0' THEN '待审批'
-		    when '2' then '审批驳回'
+				WHEN '1' THEN '审批通过'
-		    else '' end AS auditStatus
+				WHEN '2' THEN '审批驳回'
-		FROM da_ky_transfer_apply
+				ELSE ''
-		where del_flag = '1' and id = #{id}
+				END AS auditStatus
+		FROM DeptTree dt
+				 CROSS JOIN da_ky_transfer_apply dkta
+		WHERE dkta.del_flag = '1'
+		  AND dkta.id = #{id}
+		  AND dt.level = (SELECT MAX(level) FROM DeptTree)
 	</select>
 	<select id="getProSelect" resultType="com.bonus.web.domain.SelectDto">
 		SELECT