From 04e95de50673bd8ad67a34535be29cdf5b712bb7 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Wed, 7 Jan 2026 15:24:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=89=80=E6=9C=89=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E9=83=A8=E9=97=A8=E6=A0=91=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=B1=BB=E5=9E=8B=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/info/web/DepartmentController.java | 10 +++++-- .../command/query/DepartmentQueryExe.java | 26 +++++++++++++----- .../info/service/DepartmentServiceImpl.java | 11 ++++++-- .../basic/info/api/DepartmentServiceI.java | 3 ++- .../persistence/mapper/DepartmentMapper.java | 4 ++- .../repository/DepartmentRepository.java | 4 ++- .../impl/DepartmentRepositoryImpl.java | 9 +++++-- .../resources/mapper/DepartmentMapper.xml | 27 ++++++++++--------- 8 files changed, 67 insertions(+), 27 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java index 1601bc4a..68ea93d0 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java @@ -87,8 +87,14 @@ public class DepartmentController { } @ApiOperation("所有企业下部门树状所有数据") @PostMapping("/listAllTree") - public MultiResponse listAllTree( @RequestBody DepartmentTreeQry qry) { - return MultiResponse.of(departmentService.listAllTree(qry)); + public MultiResponse listAllTree() { + return MultiResponse.of(departmentService.listAllTree()); + } + + @ApiOperation("所有企业下部门树状所有数据根据企业类型") + @PostMapping("/listAllTreeByCorpType") + public MultiResponse listAllTreeByCorpType( @RequestBody DepartmentTreeQry qry) { + return MultiResponse.of(departmentService.listAllTreeByCorpType(qry)); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java index 4bb10960..73596c49 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java @@ -151,13 +151,16 @@ public class DepartmentQueryExe { return departmentCoConvertor.converDOsToCOs(list); } - public List listAllTree(DepartmentTreeQry departmentQry) { - Map parmas = PageQueryHelper.toHashMap(departmentQry); - - List pageResponse = departmentRepository.listAllTree(parmas); + public List listAllTree() { + List pageResponse = departmentRepository.listAllTree(); if (CollUtil.isEmpty(pageResponse)) { return Collections.emptyList(); } + List result2 = getDepartmentAllTree(pageResponse); + return result2; + } + + private List getDepartmentAllTree(List pageResponse) { List examCenterCOS = departmentCoConvertor.converDOsToInfoCOs(pageResponse); Map corpinfoMap = corpInfoRepository.getCorpinfoNameByCorpinfoId(examCenterCOS.stream().map(DepartmentTreeInfoCO::getCorpinfoId).distinct().collect(Collectors.toList())); if (CollUtil.isNotEmpty(corpinfoMap)) { @@ -180,9 +183,20 @@ public class DepartmentQueryExe { result2.addAll(departmentTreeInfoCOS); } }); - - return result2; } + + public Collection listAllTreeByCorpType(DepartmentTreeQry qry) { + Map parmas = PageQueryHelper.toHashMap(qry); + + List pageResponse = departmentRepository.listAllTreeByCorpType(parmas); + if (CollUtil.isEmpty(pageResponse)) { + return Collections.emptyList(); + } + List result2 = getDepartmentAllTree(pageResponse); + return result2; + } + + } diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java index b6e6c298..ebb6a3a0 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java @@ -85,9 +85,16 @@ public class DepartmentServiceImpl implements DepartmentServiceI { } @Override - public List listAllTree(DepartmentTreeQry qry) { - return departmentQueryExe.listAllTree(qry); + public List listAllTree() { + return departmentQueryExe.listAllTree(); } + + @Override + public Collection listAllTreeByCorpType(DepartmentTreeQry qry) { + return departmentQueryExe.listAllTreeByCorpType(qry); + + } + @Override @Cacheable(value = "deptAllNameCache", key="'deptId:'+#deptId") public String getFullNameForList(Long deptId, List list) { diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java index 81de1888..a03e74ee 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java @@ -38,10 +38,11 @@ public interface DepartmentServiceI { List getDeptList(); - List listAllTree(DepartmentTreeQry qry); + List listAllTree(); String getFullNameForList(Long deptId, List list); + Collection listAllTreeByCorpType(DepartmentTreeQry qry); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/DepartmentMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/DepartmentMapper.java index b847e524..3907b4da 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/DepartmentMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/DepartmentMapper.java @@ -25,7 +25,9 @@ import java.util.Map; }) public interface DepartmentMapper extends BaseMapper { - List listAllTree(Map parmas); + List listAllTree(); IPage selectDeptPage(IPage iPage, @Param("ew") QueryWrapper queryWrapper, String menuPerms); + + List listAllTreeByCorpType(Map parmas); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/DepartmentRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/DepartmentRepository.java index 5e7040d1..4cec0e37 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/DepartmentRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/DepartmentRepository.java @@ -33,8 +33,10 @@ public interface DepartmentRepository extends BaseRepository { void updateInfoById(DepartmentDO departmentDO); - List listAllTree(Map parmas); + List listAllTree(); boolean existsByName(@NotEmpty(message = "名称不能为空") String name); + + List listAllTreeByCorpType(Map parmas); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java index 9e52995a..25ed0d24 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java @@ -126,8 +126,13 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl listAllTree(Map parmas) { - return departmentMapper.listAllTree(parmas); + public List listAllTree() { + return departmentMapper.listAllTree(); + } + + @Override + public List listAllTreeByCorpType(Map parmas) { + return departmentMapper.listAllTreeByCorpType(parmas); } @Override diff --git a/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml b/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml index e19bf30d..79678a34 100644 --- a/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml @@ -5,23 +5,26 @@ +