From d0f8fc12f2643352b90022729fd6532bcab26a40 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 18 Sep 2025 17:12:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../archive/FileTransferRecordController.java | 34 +++++++++++++- .../archive/TransferApplyController.java | 3 +- .../web/controller/tool/TreeBuilder.java | 34 ++++++++++++++ .../bonus/web/mapper/TransferApplyMapper.java | 3 +- .../web/service/TransferApplyService.java | 3 +- .../impl/TransferApplyServiceImpl.java | 10 ++++- .../resources/mapper/TransferApplyMapper.xml | 44 +++++++++++-------- 7 files changed, 106 insertions(+), 25 deletions(-) diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileTransferRecordController.java b/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileTransferRecordController.java index 1bf5856..ee5e1b5 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileTransferRecordController.java +++ b/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileTransferRecordController.java @@ -1,10 +1,42 @@ package com.bonus.web.controller.archive; +import com.bonus.common.annotation.RequiresPermissions; +import com.bonus.common.annotation.SysLog; +import com.bonus.common.core.controller.BaseController; +import com.bonus.common.core.page.TableDataInfo; +import com.bonus.common.enums.OperaType; +import com.bonus.web.domain.TransferApplyDto; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.List; + /** * @Author：liang.chao * @Date：2025/9/18 - 16:06 */ -public class FileTransferRecordController { +@RestController +@RequestMapping("/transferRecord") +@Slf4j +public class FileTransferRecordController extends BaseController { +// @ApiOperation(value = "档案移交申请列表") +// @GetMapping("getTransferRecordList") +// @SysLog(title = "档案移交申请列表", module = "数据/档案移交->档案移交申请", businessType = OperaType.QUERY, details = "档案移交申请列表", logType = 1) +// @RequiresPermissions("transfer:record:list") +// public TableDataInfo getTransferRecordList(TransferApplyDto dto) { +// try { +// startPage(); +// List list = transferApplyService.list(dto); +// return getDataTable(list); +// } catch (Exception e) { +// log.error(e.toString(), e); +// return getDataTable(new ArrayList<>()); +// } +// } } diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/archive/TransferApplyController.java b/bonus-admin/src/main/java/com/bonus/web/controller/archive/TransferApplyController.java index 145f6cb..4e520da 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/archive/TransferApplyController.java +++ b/bonus-admin/src/main/java/com/bonus/web/controller/archive/TransferApplyController.java @@ -4,6 +4,7 @@ import com.bonus.common.annotation.RequiresPermissions; import com.bonus.common.annotation.SysLog; import com.bonus.common.core.controller.BaseController; import com.bonus.common.core.domain.AjaxResult; +import com.bonus.common.core.domain.entity.SysDept; import com.bonus.common.core.page.TableDataInfo; import com.bonus.common.enums.OperaType; import com.bonus.web.domain.SelectDto; @@ -61,7 +62,7 @@ public class TransferApplyController extends BaseController { @SysLog(title = "获取部门下拉", module = "数据/档案移交->档案移交申请", businessType = OperaType.QUERY, details = "获取部门下拉", logType = 1) public AjaxResult getDeptSelect(TransferApplyDto dto) { try { - List list = transferApplyService.getDeptSelect(dto); + List list = transferApplyService.getDeptSelect(dto); return AjaxResult.success(list); } catch (Exception e) { log.error(e.toString(), e); diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/tool/TreeBuilder.java b/bonus-admin/src/main/java/com/bonus/web/controller/tool/TreeBuilder.java index 52a3eb2..01e07b6 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/tool/TreeBuilder.java +++ b/bonus-admin/src/main/java/com/bonus/web/controller/tool/TreeBuilder.java @@ -1,5 +1,6 @@ package com.bonus.web.controller.tool; +import com.bonus.common.core.domain.entity.SysDept; import com.bonus.web.domain.ArchivalCatalogueDto; import com.bonus.web.domain.DaKyProFilesContentsDto; @@ -80,4 +81,37 @@ public class TreeBuilder { return roots; } + public static List buildDeptTree(List list) { + // 过滤已删除的数据（del_flag = '0' 表示已删除） + List validList = list.stream() + .filter(item -> "0".equals(item.getDelFlag())) + .filter(item -> "0".equals(item.getStatus())) + .collect(Collectors.toList()); + + // 使用 Map 提升查找效率 + Map map = new HashMap<>(); + List roots = new ArrayList<>(); + + // 第一步：将所有节点放入 map + for (SysDept item : validList) { + map.put(item.getDeptId(), item); + } + + // 第二步：构建父子关系 + for (SysDept item : validList) { + Long parentId = item.getParentId(); + // 如果 parent_id 为 null，则为根节点 + if (parentId == null) { + roots.add(item); + } else { + SysDept parent = map.get(parentId); + if (parent != null) { + parent.getChildren().add(item); + } + } + } + + return roots; + } + } diff --git a/bonus-admin/src/main/java/com/bonus/web/mapper/TransferApplyMapper.java b/bonus-admin/src/main/java/com/bonus/web/mapper/TransferApplyMapper.java index 609d8f5..b06a262 100644 --- a/bonus-admin/src/main/java/com/bonus/web/mapper/TransferApplyMapper.java +++ b/bonus-admin/src/main/java/com/bonus/web/mapper/TransferApplyMapper.java @@ -1,6 +1,7 @@ package com.bonus.web.mapper; import com.bonus.common.core.domain.AjaxResult; +import com.bonus.common.core.domain.entity.SysDept; import com.bonus.web.domain.SelectDto; import com.bonus.web.domain.TransferApplyDto; import com.bonus.web.domain.TransferFileDto; @@ -33,7 +34,7 @@ public interface TransferApplyMapper { Integer addTransferAuditRecord(TransferApplyDto dto); - List getDeptSelect(TransferApplyDto dto); + List getDeptSelect(TransferApplyDto dto); List getProSelect(TransferApplyDto dto); } diff --git a/bonus-admin/src/main/java/com/bonus/web/service/TransferApplyService.java b/bonus-admin/src/main/java/com/bonus/web/service/TransferApplyService.java index cf7d30a..fed3c86 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/TransferApplyService.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/TransferApplyService.java @@ -1,6 +1,7 @@ package com.bonus.web.service; import com.bonus.common.core.domain.AjaxResult; +import com.bonus.common.core.domain.entity.SysDept; import com.bonus.web.domain.SelectDto; import com.bonus.web.domain.TransferApplyDto; @@ -23,7 +24,7 @@ public interface TransferApplyService { AjaxResult audit(TransferApplyDto dto); - List getDeptSelect(TransferApplyDto dto); + List getDeptSelect(TransferApplyDto dto); List getProSelect(TransferApplyDto dto); } diff --git a/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java b/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java index 969e0ba..ed6d08d 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java @@ -1,6 +1,9 @@ package com.bonus.web.service.impl; import com.bonus.common.core.domain.AjaxResult; +import com.bonus.common.core.domain.entity.SysDept; +import com.bonus.web.controller.tool.TreeBuilder; +import com.bonus.web.domain.ArchivalCatalogueDto; import com.bonus.web.domain.SelectDto; import com.bonus.web.domain.TransferApplyDto; import com.bonus.web.domain.TransferFileDto; @@ -98,8 +101,11 @@ public class TransferApplyServiceImpl implements TransferApplyService { } @Override - public List getDeptSelect(TransferApplyDto dto) { - return transferApplyMapper.getDeptSelect(dto); + public List getDeptSelect(TransferApplyDto dto) { + List deptSelect = transferApplyMapper.getDeptSelect(dto); + // 构建树 + List tree = TreeBuilder.buildDeptTree(deptSelect); + return tree; } @Override diff --git a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml index 1f4a054..7c66911 100644 --- a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml +++ b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml @@ -323,25 +323,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM da_ky_transfer_apply where del_flag = '1' and id = #{id} - - + +