From 2e64c232ab6b51b2cecf1ee96e1e9b709234f326 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 21 八月 2021 16:35:14 +0800
Subject: [PATCH] 随手拍改版接口开发
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 fe6cb8f..60f59a4 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
@@ -649,6 +649,12 @@
populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
ComMngPopulationDO updatePopulationDO = updatePopulationDO(vo,populationDO,labelList);
updateList.add(updatePopulationDO);
+
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ BeanUtils.copyProperties(vo,mistake);
+ setMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在，执行更新，社区id：："+ populationDO.getActId());
+ mistakes.add(mistake);
}else{
//不存在实有人口,则新增
populationDO = savePopulationDO(vo, populationActVO, comMngVillageDO,labelList);
@@ -3074,6 +3080,7 @@
comRehabilitationPopulationDO.setStreetId(populationDO.getStreetId());
comRehabilitationPopulationDAO.insert(comRehabilitationPopulationDO);
}
+
return populationDO;
}
@@ -4564,7 +4571,8 @@
}
} else {
//新增
- Integer count = comMngUserTagDAO.selectCount(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName()));
+ Integer count = comMngUserTagDAO.selectCount(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName())
+ .eq(ComMngUserTagDO::getCommunityId, comMngTagVO.getCommunityId()));
if (count > 0) {
return R.fail("该标签已存在，标签名称重复");
}
@@ -5103,9 +5111,9 @@
}
comActPopulationScreenVO.setSpecialNum(specialNum.longValue());
//统计已使用社区通人数
-// Long count = populationDAO.countUsedCommunityPopulation(communityId);
-// comActPopulationScreenVO.setUsedCommunityNum(count == null ? 0 : count);
- comActPopulationScreenVO.setUsedCommunityNum(1183L);
+ Long count = populationDAO.countUsedCommunityPopulation(communityId);
+ comActPopulationScreenVO.setUsedCommunityNum(count == null ? 0 : count);
+// comActPopulationScreenVO.setUsedCommunityNum(1183L);
//统计性别
Map<String, Long> sexMap = populationDAO.countBySex(communityId);
--
Gitblit v1.7.1