From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaDistrictServiceImpl.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaDistrictServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaDistrictServiceImpl.java
index 7462622..d80f98e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaDistrictServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaDistrictServiceImpl.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngStructAreaCityVO;
import com.panzhihua.common.model.vos.community.ComMngStructAreaDistrictVO;
+import com.panzhihua.common.model.vos.community.ComMngStructAreaProvinceVO;
import com.panzhihua.service_community.dao.ComMngStructAreaDistrictDAO;
import com.panzhihua.service_community.model.dos.ComMngStructAreaDistrictDO;
import com.panzhihua.service_community.service.ComMngStructAreaDistrictService;
@@ -33,6 +35,18 @@
*/
@Override
public R listAreaDistrict(Long cityAdcode) {
+ List<ComMngStructAreaProvinceVO> comMngStructAreaProvinceVOS=new ArrayList<>();
+ ComMngStructAreaProvinceVO comMngStructAreaProvinceVO=new ComMngStructAreaProvinceVO();
+ comMngStructAreaProvinceVO.setId(23);
+ comMngStructAreaProvinceVO.setProvinceAdcode(510000);
+ comMngStructAreaProvinceVO.setProvinceName("四川省");
+ List<ComMngStructAreaCityVO> comMngStructAreaCityVOS=new ArrayList<>();
+ ComMngStructAreaCityVO comMngStructAreaCityVO=new ComMngStructAreaCityVO();
+ comMngStructAreaCityVO.setCityAdcode(510400);
+ comMngStructAreaCityVO.setCityName("攀枝花市");
+ comMngStructAreaCityVO.setId(256);
+ comMngStructAreaCityVO.setProvinceAdcode(510000);
+ comMngStructAreaCityVO.setProvinceId(23);
List<ComMngStructAreaDistrictDO> comMngStructAreaDistrictDOS = comMngStructAreaDistrictDAO.selectList(new QueryWrapper<ComMngStructAreaDistrictDO>().lambda().eq(ComMngStructAreaDistrictDO::getCityAdcode, cityAdcode));
List<ComMngStructAreaDistrictVO>comMngStructAreaDistrictVOS=new ArrayList<>();
if (!ObjectUtils.isEmpty(comMngStructAreaDistrictDOS)) {
@@ -42,6 +56,12 @@
comMngStructAreaDistrictVOS.add(comMngStructAreaDistrictVO);
});
}
+ comMngStructAreaCityVO.setComMngStructAreaDistrictVOS(comMngStructAreaDistrictVOS);
+ comMngStructAreaCityVOS.add(comMngStructAreaCityVO);
+ comMngStructAreaProvinceVO.setComMngStructAreaCityVOS(comMngStructAreaCityVOS);
+ comMngStructAreaProvinceVOS.add(comMngStructAreaProvinceVO);
return R.ok(comMngStructAreaDistrictVOS);
}
+
+
}
--
Gitblit v1.7.1