From 495169f34a4592bd6b1c89d6daaf3424f1906726 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 13 四月 2021 09:45:23 +0800
Subject: [PATCH] 管理后台社区动态bug修复
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 222beac..0770984 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
@@ -13,9 +13,11 @@
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComActVillageDAO;
+import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.dao.ComMngVolunteerMngDAO;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.model.dos.ComActDiscussDO;
+import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
import com.panzhihua.service_community.model.dos.ComMngVillageDO;
import com.panzhihua.service_community.service.ComMngVillageService;
import org.springframework.beans.BeanUtils;
@@ -38,6 +40,8 @@
ComActVillageDAO comActVillageDAO;
@Resource
ComActDAO comActDAO;
+ @Resource
+ ComMngPopulationDAO populationDAO;
@Override
public R addComActVillage(ComMngVillageVO comMngVillageVO) {
@@ -45,6 +49,7 @@
LambdaQueryWrapper<ComMngVillageDO> param = new QueryWrapper<ComMngVillageDO>().lambda();
param.eq(ComMngVillageDO::getCommunityId, comMngVillageVO.getCommunityId());
param.eq(ComMngVillageDO::getAlley, comMngVillageVO.getAlley());
+ param.eq(ComMngVillageDO::getHouseNum, comMngVillageVO.getHouseNum());
Integer resultCount = comActVillageDAO.selectCount(param);
if (resultCount > 0) {
return R.fail("实有房屋已经存在");
@@ -93,12 +98,18 @@
userLambdaQueryWrapper.like(ComMngVillageDO::getAlley, pageComMngVillageDTO.getAlley());
}
Page userPage = new Page(pageNum, pageSize);
- IPage<ComMngVillageDO> doPager = comActVillageDAO.selectPage(userPage, userLambdaQueryWrapper);
+ IPage<ComMngVillageDO> doPager = comActVillageDAO.selectPage(userPage, userLambdaQueryWrapper.orderByDesc(ComMngVillageDO::getCreateAt));
return R.ok(doPager);
}
@Override
public R delecComActVillage(List<Long> Ids) {
+ LambdaQueryWrapper<ComMngPopulationDO> paramWrapper = Wrappers.lambdaQuery();
+ paramWrapper.in(ComMngPopulationDO::getVillageId, Ids);
+ ComMngPopulationDO mngPopulationDO = populationDAO.selectOne(paramWrapper);
+ if (mngPopulationDO != null) {
+ return R.fail("无法删除，已绑定实有人口!");
+ }
int delete = comActVillageDAO.deleteBatchIds(Ids);
if (delete > 0) {
return R.ok();
@@ -122,9 +133,9 @@
return R.fail("街路巷第" + index + "行为空!");
}
//判断DB和exel数据重复判断
- boolean result = comMngVillageDOs.stream().allMatch(village -> village.getAlley().equals(vo.getAlley()) && village.getHouseNum().equals(vo.getHouseNum()));
+ boolean result = comMngVillageDOs.stream().anyMatch(village -> village.getAlley().equals(vo.getAlley()) && village.getHouseNum().intValue() == vo.getHouseNum().intValue());
if (result) {
- return R.fail("导入街路巷已存在(" + vo.getAlley()+")");
+ return R.fail("导入街路巷已存在(" + vo.getAlley() + ")");
}
index++;
}
--
Gitblit v1.7.1