From 26cd8c7b2bc7a725a3de28d3ed883a6f54da84f1 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 20 四月 2021 16:59:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 52 +++++++---------------------------------------------
1 files changed, 7 insertions(+), 45 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index 0b07a35..6a879ca 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -13,6 +13,7 @@
import com.panzhihua.common.model.dtos.community.PageComActDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.user.ComHouseMemberVo;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.service_community.dao.ComActActivityDAO;
import com.panzhihua.service_community.dao.ComActDAO;
@@ -118,8 +119,8 @@
ComMngPopulationVO comMngPopulationVO = new ComMngPopulationVO();
BeanUtils.copyProperties(comMngPopulationDO, comMngPopulationVO);
- //查询家庭成员信息
- List<ComMngFamilyInfoVO> comMngFamilyInfoVOS = populationDAO.listFamilyByUserId(comMngPopulationDO.getId());
+ //查询房屋成员信息
+ List<ComHouseMemberVo> comMngFamilyInfoVOS = populationDAO.listHouseMermberByUserId(comMngPopulationDO);
if (!comMngFamilyInfoVOS.isEmpty()) {
comMngPopulationVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
}
@@ -190,50 +191,9 @@
}
List<ComMngPopulationDO> comMngPopulationDOS = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId, communityId));
//查询该社区所有(实有房屋)小区
- List<ComMngVillageDO> villageDOList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId, communityId));
+// List<ComMngVillageDO> villageDOList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId, communityId));
int index = 2;
for (ComMngPopulationServeExcelVO vo : list) {
- if (vo.getName() == null) {
- return R.fail("家庭成员（姓名）第" + index + "行为空!");
- }
- if (vo.getSex() == null) {
- return R.fail("性别第" + index + "行为空!");
- }
- if (vo.getAge() == null) {
- return R.fail("年龄" + index + "行为空!");
- }
-
- if (vo.getIsRent() == null) {
- return R.fail("是否租住，第" + index + "行为空!");
- }
- if (vo.getRoad() == null) {
- return R.fail("街路巷，第" + index + "行为空!");
- }
- if (vo.getDoorNo() == null) {
- return R.fail("门牌号，第" + index + "行为空!");
- }
-
- if (vo.getFloor() == null) {
- return R.fail("楼排号，第" + index + "行为空!");
- }
- if (vo.getUnitNo() == null) {
- return R.fail("单元号，第" + index + "行为空!");
- }
- if (vo.getHouseNo() == null) {
- return R.fail("户室，第" + index + "行为空!");
- }
- if (vo.getNation() == null) {
- return R.fail("民族，第" + index + "行为空!");
- }
- if (vo.getPoliticalOutlook() == null) {
- return R.fail("政治面貌，第" + index + "行为空!");
- }
- if (vo.getCardNo() == null) {
- return R.fail("身份证号码，第" + index + "行为空!");
- }
- if (vo.getPhone() == null) {
- return R.fail("联系方式，第" + index + "行为空!");
- }
//判断DB和exel数据重复判断
boolean result = comMngPopulationDOS.stream().anyMatch(population -> population.getCardNo().equals(vo.getCardNo()));
if (result) {
@@ -245,7 +205,9 @@
ArrayList<ComMngPopulationDO> populationDOList = Lists.newArrayList();
list.forEach(vo -> {
ComMngPopulationDO comMngPopulationDO = new ComMngPopulationDO();
- ComMngVillageDO comMngVillageDO = villageDOList.stream().filter(village -> village.getAlley().equals(vo.getRoad()) && village.getHouseNum().equals(Integer.valueOf(vo.getDoorNo()))).findFirst().orElse(null);
+ //查询街路巷是否存在
+ ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().eq("alley",vo.getRoad()).eq("house_num",vo.getDoorNo()).eq("community_id",communityId));
+// ComMngVillageDO comMngVillageDO = villageDOList.stream().filter(village -> village.getAlley().equals(vo.getRoad()) && village.getHouseNum().equals(Integer.valueOf(vo.getDoorNo()))).findFirst().orElse(null);
BeanUtils.copyProperties(vo, comMngPopulationDO);
if (comMngVillageDO == null) {
throw new ServiceException("街道巷:" + vo.getRoad() + "不存在！");
--
Gitblit v1.7.1