From 56da788e2b070464642c7fb38465def9b3b31792 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Sat, 6 May 2023 17:10:35 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E6=9B=BF=E6=8D=A2=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/GroupManagementServiceImpl.java | 28 +++++++++++-------- .../user/controller/UserController.java | 14 +++++++--- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java index 0cf058c5..165bf7ac 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java @@ -6,21 +6,23 @@ import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.TreeNode; import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.json.JSONUtil; -import com.dxhy.order.constant.ConfigureConstant; -import com.dxhy.order.constant.OrderInfoEnum; -import com.dxhy.order.constant.OrderManagementConstant; -import com.dxhy.order.model.R; -import com.dxhy.order.utils.DistributedKeyMaker; import com.dxhy.order.baseservice.module.groupmanagement.dao.GroupManagementMapper; import com.dxhy.order.baseservice.module.groupmanagement.model.GroupDataStatusUpdate; import com.dxhy.order.baseservice.module.groupmanagement.model.GroupManagementEntity; import com.dxhy.order.baseservice.module.groupmanagement.model.GroupManagementQuery; import com.dxhy.order.baseservice.module.groupmanagement.model.GroupTreeVO; import com.dxhy.order.baseservice.module.groupmanagement.service.GroupManagementService; +import com.dxhy.order.baseservice.module.thirdservice.user.model.DeptEntity; import com.dxhy.order.baseservice.module.thirdservice.user.model.TaxPlayerCodeDept; import com.dxhy.order.baseservice.module.thirdservice.user.model.UserEntity; import com.dxhy.order.baseservice.module.thirdservice.user.model.bo.UserInfoQuery; import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService; +import com.dxhy.order.constant.ConfigureConstant; +import com.dxhy.order.constant.OrderInfoEnum; +import com.dxhy.order.constant.OrderManagementConstant; +import com.dxhy.order.model.R; +import com.dxhy.order.utils.DistributedKeyMaker; +import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; @@ -209,9 +211,9 @@ public class GroupManagementServiceImpl implements GroupManagementService { */ public List buildGroupTree(List taxplayercodeDeptList) { //查找出level最小的节点 - TaxPlayerCodeDept taxPlayerCodeDeptMinLevel = taxplayercodeDeptList.stream().min(Comparator.comparing(TaxPlayerCodeDept::getLevel)).get(); - String parentId = StringUtils.isBlank(taxPlayerCodeDeptMinLevel.getParentId()) ? "0" : taxPlayerCodeDeptMinLevel.getParentId(); - +// TaxPlayerCodeDept taxPlayerCodeDeptMinLevel = taxplayercodeDeptList.stream().min(Comparator.comparing(TaxPlayerCodeDept::getLevel)).get(); +// String parentId = StringUtils.isBlank(taxPlayerCodeDeptMinLevel.getParentId()) ? "0" : taxPlayerCodeDeptMinLevel.getParentId(); + List parentIdList = taxplayercodeDeptList.stream().map(DeptEntity::getParentId).collect(Collectors.toList()); List> nodeList = CollUtil.newArrayList(); taxplayercodeDeptList.forEach(taxPlayerCodeDept -> { TreeNode treeNode; @@ -228,9 +230,13 @@ public class GroupManagementServiceImpl implements GroupManagementService { treeNode.setExtra(extra); nodeList.add(treeNode); }); - - List> treeList = TreeUtil.build(nodeList, parentId); - return transGroupTreeVo(treeList); + List tree = Lists.newArrayList(); + for (String parentId : parentIdList) { + List> treeList = TreeUtil.build(nodeList, parentId); + List treeVOS = transGroupTreeVo(treeList); + tree.addAll(treeVOS); + } + return tree; } /** diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java index d96df043..8083bae0 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java @@ -101,10 +101,13 @@ public class UserController { || !StringUtils.equals(taxPlayerCodeDept.getTaxpayerAccount(), groupManagementEntity.getXhfZh()) || !StringUtils.equals(taxPlayerCodeDept.getDeptId(), groupManagementEntity.getEntId())) { + + String repl = "(" + taxPlayerCodeDept.getEnterpriseNumbers() + ")"; + String replace = taxPlayerCodeDept.getName().replace(repl, ""); + taxPlayerCodeDept.setName(replace); groupManagementEntity.setGroupName(taxPlayerCodeDept.getName()); groupManagementEntity.setXhfNsrsbh(taxPlayerCodeDept.getTaxpayerCode()); - String repl = "(" + taxPlayerCodeDept.getEnterpriseNumbers() + ")"; - groupManagementEntity.setXhfMc(taxPlayerCodeDept.getName().replace(repl,"")); + groupManagementEntity.setXhfMc(taxPlayerCodeDept.getName()); groupManagementEntity.setXhfDz(taxPlayerCodeDept.getTaxpayerAddress()); groupManagementEntity.setXhfDh(taxPlayerCodeDept.getTaxpayerPhone()); groupManagementEntity.setXhfYh(taxPlayerCodeDept.getTaxpayerBank()); @@ -139,12 +142,15 @@ public class UserController { GroupManagementEntity groupManagementEntity = new GroupManagementEntity(); groupManagementEntity.setId(DistributedKeyMaker.generateShotKey()); groupManagementEntity.setGroupId(taxPlayerCodeDept.getDeptId()); + + String repl = "(" + taxPlayerCodeDept.getEnterpriseNumbers() + ")"; + String replace = taxPlayerCodeDept.getName().replace(repl, ""); + taxPlayerCodeDept.setName(replace); groupManagementEntity.setGroupName(taxPlayerCodeDept.getName()); groupManagementEntity.setGroupType(OrderInfoEnum.ORDER_KPZZGL_ZZLX_1.getKey()); groupManagementEntity.setXhfNsrsbh(taxPlayerCodeDept.getTaxpayerCode()); - String repl = "(" + taxPlayerCodeDept.getEnterpriseNumbers() + ")"; - groupManagementEntity.setXhfMc(taxPlayerCodeDept.getName().replace(repl,"")); + groupManagementEntity.setXhfMc(taxPlayerCodeDept.getName()); // groupManagementEntity.setXhfMc(taxPlayerCodeDept.getName()); groupManagementEntity.setXhfDz(taxPlayerCodeDept.getTaxpayerAddress()); groupManagementEntity.setXhfDh(taxPlayerCodeDept.getTaxpayerPhone());