From fbf3e66484c7f0f3fb73b31e5cca472fd79b4531 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 07 七月 2023 16:35:11 +0800
Subject: [PATCH] 修改综治后台报错
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java
index 25b90f0..6d44c9e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java
@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service.impl;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
@@ -8,6 +9,8 @@
import com.google.common.collect.Lists;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.switchs.CommunitySwitchAllAppletsVO;
+import com.panzhihua.common.model.vos.community.switchs.StreetAllAppletsVO;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.ComStreetDO;
import org.springframework.beans.BeanUtils;
@@ -35,6 +38,10 @@
@Resource
private ComStreetDAO comStreetDAO;
+
+
+ @Resource
+ private ComActDAO comActDAO;
@Override
public R getProvince() {
@@ -76,9 +83,12 @@
@Override
public R getCityTreeByProvinceCode(Integer provinceAdcode,String areaCode) {
+ //省份
List<ComMngProvinceDO> provinceDOS = comMngProvinceDAO.selectList(
new QueryWrapper<ComMngProvinceDO>().lambda().eq(ComMngProvinceDO::getProvinceAdcode, provinceAdcode));
+ //市
List<ComMngCityDO> cityDOS = comMngCityDAO.selectList(new QueryWrapper<>());
+
List<ComMngDistrictDO> districtDOS = comMngDistrictDAO.selectList(new QueryWrapper<>());
List<ComMngAreaVO> vos = new ArrayList<>();
provinceDOS.forEach(p -> {
@@ -139,9 +149,21 @@
List<ComStreetDO> comStreetDOS = comStreetDAO.selectList(param);
comStreetDOS.forEach(dos ->
{
- ComMngAreaVO csd = new ComMngAreaVO(0, dos.getName(),dos.getStreetId()+"");
+ ComMngAreaVO csd = new ComMngAreaVO(0, dos.getName());
BeanUtils.copyProperties(dos, csd);
districtVo.getChildren().add(csd);
+
+ // 查询街道下社区列表
+ List<CommunitySwitchAllAppletsVO> communityList = comActDAO.getCommunityListByStreetId(dos.getStreetId());
+
+ communityList.forEach(commItem ->
+ {
+ ComMngAreaVO cssd = new ComMngAreaVO(0, commItem.getName(),commItem.getCommunityId()+"");
+ BeanUtils.copyProperties(commItem, cssd);
+ csd.getChildren().add(cssd);
+ });
+
+
});
--
Gitblit v1.7.1