代码提交

blade-service/blade-system/src/main/java/org/springblade/system/controller/TransferApplyController.java

@@ -56,7 +56,7 @@ public class TransferApplyController extends BaseController {
 
     @PostMapping("getProSelect")
     @SysLog(title = "获取工程下拉", module = "数据/档案移交->档案移交申请", businessType = OperaType.QUERY, details = "获取工程下拉", logType = 1)
-    public AjaxResult getProSelect(TransferApplyDto dto) {
+    public AjaxResult getProSelect(@RequestBody TransferApplyDto dto) {
         try {
             List<ProSelectDto> list = transferApplyService.getProSelect(dto);
             return AjaxResult.success(list);

blade-service/blade-system/src/main/java/org/springblade/system/domain/ArchivalCatalogueDto.java

@@ -46,6 +46,7 @@ public class ArchivalCatalogueDto extends PageDomain {
     private String updateUserId;
     private String updateUserName;
     private String delFlag;
+    private String path;
     // 子节点列表（用于构建树）
     private List<ArchivalCatalogueDto> children = new ArrayList<>();
 }

blade-service/blade-system/src/main/java/org/springblade/system/mapper/ArchiveMapper.xml

@@ -97,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		SELECT
 		dkfc.id,
 		dkfc.content_name AS contentName,
+		concat(dkfc2.content_name, '/', dkfc1.content_name) AS path,
 		dkfc.parent_id AS parentId,
 		dkfc.`level` AS level,
 		dkfc.sort,
@@ -114,6 +115,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		dkfc.update_user_name AS updateUserName
 		FROM
 		da_ky_files_contents dkfc
+		    left join da_ky_files_contents dkfc1 on dkfc.parent_id = dkfc1.id
+		    left join da_ky_files_contents dkfc2 on dkfc1.parent_id = dkfc2.id
 		left join da_ky_files_classify_mark dkfcm on dkfcm.id = dkfc.classify_mark
 		WHERE
 		dkfc.del_flag = '1' and dkfc.parent_id = #{parentId} and dkfc.level = 4

blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferProblemMapper.xml

@@ -59,26 +59,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		dkti.single_pro_name AS singleProName,
 		DATE_FORMAT(dkti.transfer_time, '%Y-%m-%d') AS transferTime,
 		dkti.dept_id AS deptId,
-		( SELECT CASE
+        (SELECT
-		WHEN
+        IF(
-		d.ancestors IS NULL
+        d.ancestors IS NULL
-		OR d.ancestors = '' THEN
+        OR d.ancestors = ''
-		d.dept_name ELSE CONCAT(
+        OR d.ancestors = '0',
-		(SELECT
+        d.dept_name,
-		GROUP_CONCAT(
+        CONCAT((
-		dt.dept_name
+        SELECT
-		ORDER BY
+        GROUP_CONCAT( dt.dept_name SEPARATOR ' / ' )
-		INSTR(
+        FROM
-		CONCAT( ',', d.ancestors, ',' ),
+        da_ky_sys_dept dt
-		CONCAT( ',', dt.dept_id, ',' )) SEPARATOR ' / ')
+        WHERE
-		FROM
+        FIND_IN_SET( dt.dept_id, d.ancestors )),
-		da_ky_sys_dept dt
+        ' / ',
-		WHERE
+        d.dept_name
-		FIND_IN_SET( dt.dept_id, d.ancestors )),
+        ))) AS deptName,
-		' / ',
-		d.dept_name)
-		END
-		) AS deptName,
 		dkti.transfer_issue AS transferIssue,
 		dkti.create_time AS createTime,
 		dkti.update_time AS updateTime,

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/ArchivedSettingServiceImpl.java

@@ -1,5 +1,6 @@
 package org.springblade.system.service.impl;
 
+import jakarta.annotation.Resource;
 import org.springblade.common.core.domain.AjaxResult;
 import org.springblade.system.config.CronExpressionGenerator;
 import org.springblade.system.domain.ArchivedSettingDto;
@@ -8,13 +9,7 @@ import org.springblade.system.service.ArchivedSettingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
-import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @Author：liang.chao
@@ -22,7 +17,7 @@ import java.util.stream.Collectors;
  */
 @Service
 public class ArchivedSettingServiceImpl implements ArchivedSettingService {
-    @Autowired
+    @Resource
     private ArchivedSettingMapper archivedSettingMapper;
 
     @Override

blade-service/blade-system/src/main/java/org/springblade/system/util/WebFileUtils.java

@@ -106,7 +106,7 @@ public class WebFileUtils {
             bean.setFilePath(relativePath);
             bean.setFileName(fileName);
             bean.setSourceFileName(sourceFileName);
-            bean.setFileSize(new BigDecimal(file.getSize()));
+			bean.setFileSize(new BigDecimal(sizeInMB));
             bean.setSuffixName(fileExtension);
             return bean;
         } else {