From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
index 61d8044..068ea18 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
@@ -11,11 +11,13 @@
import com.panzhihua.common.model.dtos.grid.ComMngVillageListAppDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngVillageBuildHouseAppDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngVillageListExportAdminDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
import com.panzhihua.common.model.vos.grid.ComMngVillageBuildingHouseVO;
import com.panzhihua.common.model.vos.grid.ComMngVillageBuildingVO;
+import com.panzhihua.common.model.vos.grid.admin.ComMngVillageStatisticsVO;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActDAO;
@@ -89,6 +91,16 @@
List<ComMngVillageDO> comMngVillageDOS = comActVillageDAO.selectList(param);
BeanUtils.copyProperties(vos, comMngVillageDOS);
return R.ok(vos);
+ }
+
+ @Override
+ public R getVillageById(Long villageId) {
+ ComMngVillageDO comMngVillageDO = new ComMngVillageDO();
+ comMngVillageDO = comActVillageDAO.selectById(villageId);
+ if (comMngVillageDO != null) {
+ return R.ok(comMngVillageDO);
+ }
+ return R.fail();
}
@@ -267,13 +279,44 @@
villageBuildingList.forEach(villageBuilding -> {
if(!villageBuilding.getFloor().contains("栋")){
villageBuilding.setFloorString(villageBuilding.getFloor() + "栋");
+ }else{
+ villageBuilding.setFloorString(villageBuilding.getFloor());
}
if(!villageBuilding.getUnitNo().contains("单元")){
villageBuilding.setUnitNoString(villageBuilding.getUnitNo() + "单元");
+ }else{
+ villageBuilding.setUnitNoString(villageBuilding.getUnitNo());
}
});
}
return R.ok(villageBuildingList);
}
+ @Override
+ public R delGridVillage(List<Long> villageIds){
+
+ if(villageIds.isEmpty()){
+ return R.fail("请选择需要删除的小区");
+ }
+ //查询需要删除的小区下面是否绑定的有房屋
+ Integer count = this.baseMapper.getVillageHouseCount(villageIds);
+ if(count > 0){
+ return R.fail("您选择的小区已被引用，无法删除");
+ }
+ if(this.baseMapper.deleteBatchIds(villageIds) > 0){
+ return R.ok();
+ }
+ return R.fail("删除失败");
+ }
+
+ @Override
+ public R getGridVillageStatistics(){
+ return R.ok(this.baseMapper.getGridVillageStatistics());
+ }
+
+ @Override
+ public R getGridVillageListExport(ComMngVillageListExportAdminDTO villageListAppDTO){
+ return R.ok(this.baseMapper.getGridVillageLists(villageListAppDTO));
+ }
+
}
--
Gitblit v1.7.1