From 2c055d17eebac39842a75fdde8eb2eae437f9265 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 26 八月 2021 11:26:54 +0800
Subject: [PATCH] Merge branch 'master' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 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 e08fa77..1326b13a 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
@@ -811,7 +811,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -1106,7 +1106,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -1401,7 +1401,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -1696,7 +1696,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -1991,7 +1991,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -2289,7 +2289,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -2584,7 +2584,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -2879,7 +2879,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -3174,7 +3174,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -3469,7 +3469,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -3769,7 +3769,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -5786,7 +5786,7 @@
userTagList.forEach(userTag -> {
if (userTag != null) {
if (userTag.getSysFlag().equals(0)) {
- Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
+ Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName(),communityId);
otherSpecialVO.setSum(otherSpecialVO.getSum() + count);
} else {
if (StringUtils.isNotEmpty(userTag.getTagName())) {
@@ -5818,7 +5818,7 @@
} else {
IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
specialStatisticsVO.setTitle(userTag.getTagName());
- Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
+ Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName(),communityId);
specialStatisticsVO.setSum(count);
specialStatisticsVOList.add(specialStatisticsVO);
}
@@ -5999,7 +5999,7 @@
userTagList.forEach(userTag -> {
if (userTag != null) {
if (userTag.getSysFlag().equals(0)) {
- Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
+ Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName(),communityId);
otherSpecialVO.setSum(otherSpecialVO.getSum() + count);
} else {
if (StringUtils.isNotEmpty(userTag.getTagName())) {
@@ -6031,7 +6031,7 @@
} else {
IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
specialStatisticsVO.setTitle(userTag.getTagName());
- Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
+ Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName(),communityId);
specialStatisticsVO.setSum(count);
specialStatisticsVOList.add(specialStatisticsVO);
}
@@ -6099,7 +6099,7 @@
userTagList.forEach(userTag -> {
if (userTag != null) {
if (userTag.getSysFlag().equals(0)) {
- Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
+ Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName(),communityId);
otherSpecialVO.setSum(otherSpecialVO.getSum() + count);
} else {
if (StringUtils.isNotEmpty(userTag.getTagName())) {
@@ -6131,7 +6131,7 @@
} else {
IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
specialStatisticsVO.setTitle(userTag.getTagName());
- Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
+ Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName(),communityId);
specialStatisticsVO.setSum(count);
specialStatisticsVOList.add(specialStatisticsVO);
}
--
Gitblit v1.7.1