From c161f8538c248a6bd01054b8e5b79a1b2d5dd476 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 26 八月 2021 13:48:57 +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/ComMngPopulationServiceImpl.java | 520 ++++++++++++++++++++++++++++----------------------------
1 files changed, 260 insertions(+), 260 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..c5020c4 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
@@ -751,29 +751,29 @@
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCreateBy(userId);
savePopulationCommunityList.add(cpopulationCommunityTagsDO);
- }
- } else {
- // 实有人口存在于当前社区，则更新
- ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
- (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
- List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
- .collect(Collectors.toList());
- // 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
- Iterator<String> iterator = userTag.iterator();
- while (iterator.hasNext()) {
- String s = iterator.next();
- if (!labelList.contains(s))
- iterator.remove();
- }
- comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
- comMngPopulationCommunityTagsDO.setUpdateBy(userId);
- updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
+ }else {
+ // 实有人口存在于当前社区，则更新
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
+ (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
+ List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
+ .collect(Collectors.toList());
+ // 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
+ Iterator<String> iterator = userTag.iterator();
+ while (iterator.hasNext()) {
+ String s = iterator.next();
+ if (!labelList.contains(s))
+ iterator.remove();
+ }
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ comMngPopulationCommunityTagsDO.setUpdateBy(userId);
+ updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
- ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
- BeanUtils.copyProperties(vo, mistake);
- setMistake(mistake, vo);
- mistake.setMistake("该实有人口已存在于该社区，执行更新");
- mistakes.add(mistake);
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在于该社区，执行更新");
+ mistakes.add(mistake);
+ }
}
log.info("查询实有人口存在社区信息完成");
}
@@ -811,7 +811,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -1046,29 +1046,29 @@
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCreateBy(userId);
savePopulationCommunityList.add(cpopulationCommunityTagsDO);
- }
- } else {
- // 实有人口存在于当前社区，则更新
- ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
- (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
- List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
- .collect(Collectors.toList());
- // 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
- Iterator<String> iterator = userTag.iterator();
- while (iterator.hasNext()) {
- String s = iterator.next();
- if (!labelList.contains(s))
- iterator.remove();
- }
- comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
- comMngPopulationCommunityTagsDO.setUpdateBy(userId);
- updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
+ }else {
+ // 实有人口存在于当前社区，则更新
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
+ (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
+ List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
+ .collect(Collectors.toList());
+ // 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
+ Iterator<String> iterator = userTag.iterator();
+ while (iterator.hasNext()) {
+ String s = iterator.next();
+ if (!labelList.contains(s))
+ iterator.remove();
+ }
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ comMngPopulationCommunityTagsDO.setUpdateBy(userId);
+ updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
- ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
- BeanUtils.copyProperties(vo, mistake);
- setDrugMistake(mistake, vo);
- mistake.setMistake("该实有人口已存在于该社区，执行更新");
- mistakes.add(mistake);
+ ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setDrugMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在于该社区，执行更新");
+ mistakes.add(mistake);
+ }
}
log.info("查询实有人口存在社区信息完成");
}
@@ -1106,7 +1106,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -1341,29 +1341,29 @@
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCreateBy(userId);
savePopulationCommunityList.add(cpopulationCommunityTagsDO);
- }
- } else {
- // 实有人口存在于当前社区，则更新
- ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
- (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
- List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
- .collect(Collectors.toList());
- // 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
- Iterator<String> iterator = userTag.iterator();
- while (iterator.hasNext()) {
- String s = iterator.next();
- if (!labelList.contains(s))
- iterator.remove();
- }
- comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
- comMngPopulationCommunityTagsDO.setUpdateBy(userId);
- updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
+ }else {
+ // 实有人口存在于当前社区，则更新
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
+ (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
+ List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
+ .collect(Collectors.toList());
+ // 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
+ Iterator<String> iterator = userTag.iterator();
+ while (iterator.hasNext()) {
+ String s = iterator.next();
+ if (!labelList.contains(s))
+ iterator.remove();
+ }
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ comMngPopulationCommunityTagsDO.setUpdateBy(userId);
+ updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
- ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
- BeanUtils.copyProperties(vo, mistake);
- setCorrectMistake(mistake, vo);
- mistake.setMistake("该实有人口已存在于该社区，执行更新");
- mistakes.add(mistake);
+ ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setCorrectMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在于该社区，执行更新");
+ mistakes.add(mistake);
+ }
}
log.info("查询实有人口存在社区信息完成");
}
@@ -1401,7 +1401,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -1636,29 +1636,29 @@
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCreateBy(userId);
savePopulationCommunityList.add(cpopulationCommunityTagsDO);
- }
- } else {
- // 实有人口存在于当前社区，则更新
- ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
- (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
- List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
- .collect(Collectors.toList());
- // 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
- Iterator<String> iterator = userTag.iterator();
- while (iterator.hasNext()) {
- String s = iterator.next();
- if (!labelList.contains(s))
- iterator.remove();
- }
- comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
- comMngPopulationCommunityTagsDO.setUpdateBy(userId);
- updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
+ }else {
+ // 实有人口存在于当前社区，则更新
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
+ (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
+ List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
+ .collect(Collectors.toList());
+ // 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
+ Iterator<String> iterator = userTag.iterator();
+ while (iterator.hasNext()) {
+ String s = iterator.next();
+ if (!labelList.contains(s))
+ iterator.remove();
+ }
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ comMngPopulationCommunityTagsDO.setUpdateBy(userId);
+ updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
- ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
- BeanUtils.copyProperties(vo, mistake);
- setMajorMistake(mistake, vo);
- mistake.setMistake("该实有人口已存在于该社区，执行更新");
- mistakes.add(mistake);
+ ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setMajorMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在于该社区，执行更新");
+ mistakes.add(mistake);
+ }
}
log.info("查询实有人口存在社区信息完成");
}
@@ -1696,7 +1696,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -1931,29 +1931,29 @@
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCreateBy(userId);
savePopulationCommunityList.add(cpopulationCommunityTagsDO);
- }
- } else {
- // 实有人口存在于当前社区，则更新
- ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
- (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
- List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
- .collect(Collectors.toList());
- // 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
- Iterator<String> iterator = userTag.iterator();
- while (iterator.hasNext()) {
- String s = iterator.next();
- if (!labelList.contains(s))
- iterator.remove();
- }
- comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
- comMngPopulationCommunityTagsDO.setUpdateBy(userId);
- updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
+ } else {
+ // 实有人口存在于当前社区，则更新
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
+ (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
+ List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
+ .collect(Collectors.toList());
+ // 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
+ Iterator<String> iterator = userTag.iterator();
+ while (iterator.hasNext()) {
+ String s = iterator.next();
+ if (!labelList.contains(s))
+ iterator.remove();
+ }
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ comMngPopulationCommunityTagsDO.setUpdateBy(userId);
+ updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
- ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
- BeanUtils.copyProperties(vo, mistake);
- setCultMistake(mistake, vo);
- mistake.setMistake("该实有人口已存在于该社区，执行更新");
- mistakes.add(mistake);
+ ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setCultMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在于该社区，执行更新");
+ mistakes.add(mistake);
+ }
}
log.info("查询实有人口存在社区信息完成");
}
@@ -1991,7 +1991,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -2228,30 +2228,30 @@
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCreateBy(userId);
savePopulationCommunityList.add(cpopulationCommunityTagsDO);
- }
- } else {
- // 实有人口存在于当前社区，则更新
- ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
- (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
- List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
- .collect(Collectors.toList());
- // 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
- Iterator<String> iterator = userTag.iterator();
- while (iterator.hasNext()) {
- String s = iterator.next();
- if (!labelList.contains(s))
- iterator.remove();
- }
- comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
- comMngPopulationCommunityTagsDO.setUpdateBy(userId);
- updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
+ }else {
+ // 实有人口存在于当前社区，则更新
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
+ (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
+ List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
+ .collect(Collectors.toList());
+ // 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
+ Iterator<String> iterator = userTag.iterator();
+ while (iterator.hasNext()) {
+ String s = iterator.next();
+ if (!labelList.contains(s))
+ iterator.remove();
+ }
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ comMngPopulationCommunityTagsDO.setUpdateBy(userId);
+ updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
- ComMngPopulationRehabilitationMistakeExcelVO mistake =
- new ComMngPopulationRehabilitationMistakeExcelVO();
- BeanUtils.copyProperties(vo, mistake);
- setRehabilitationMistake(mistake, vo);
- mistake.setMistake("该实有人口已存在于该社区，执行更新");
- mistakes.add(mistake);
+ ComMngPopulationRehabilitationMistakeExcelVO mistake =
+ new ComMngPopulationRehabilitationMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setRehabilitationMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在于该社区，执行更新");
+ mistakes.add(mistake);
+ }
}
log.info("查询实有人口存在社区信息完成");
}
@@ -2289,7 +2289,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -2524,29 +2524,29 @@
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCreateBy(userId);
savePopulationCommunityList.add(cpopulationCommunityTagsDO);
- }
- } else {
- // 实有人口存在于当前社区，则更新
- ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
- (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
- List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
- .collect(Collectors.toList());
- // 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
- Iterator<String> iterator = userTag.iterator();
- while (iterator.hasNext()) {
- String s = iterator.next();
- if (!labelList.contains(s))
- iterator.remove();
- }
- comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
- comMngPopulationCommunityTagsDO.setUpdateBy(userId);
- updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
+ }else {
+ // 实有人口存在于当前社区，则更新
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
+ (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
+ List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
+ .collect(Collectors.toList());
+ // 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
+ Iterator<String> iterator = userTag.iterator();
+ while (iterator.hasNext()) {
+ String s = iterator.next();
+ if (!labelList.contains(s))
+ iterator.remove();
+ }
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ comMngPopulationCommunityTagsDO.setUpdateBy(userId);
+ updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
- ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
- BeanUtils.copyProperties(vo, mistake);
- setKeyMistake(mistake, vo);
- mistake.setMistake("该实有人口已存在于该社区，执行更新");
- mistakes.add(mistake);
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setKeyMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在于该社区，执行更新");
+ mistakes.add(mistake);
+ }
}
log.info("查询实有人口存在社区信息完成");
}
@@ -2584,7 +2584,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -2819,29 +2819,29 @@
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCreateBy(userId);
savePopulationCommunityList.add(cpopulationCommunityTagsDO);
- }
- } else {
- // 实有人口存在于当前社区，则更新
- ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
- (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
- List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
- .collect(Collectors.toList());
- // 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
- Iterator<String> iterator = userTag.iterator();
- while (iterator.hasNext()) {
- String s = iterator.next();
- if (!labelList.contains(s))
- iterator.remove();
- }
- comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
- comMngPopulationCommunityTagsDO.setUpdateBy(userId);
- updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
+ } else {
+ // 实有人口存在于当前社区，则更新
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
+ (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
+ List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
+ .collect(Collectors.toList());
+ // 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
+ Iterator<String> iterator = userTag.iterator();
+ while (iterator.hasNext()) {
+ String s = iterator.next();
+ if (!labelList.contains(s))
+ iterator.remove();
+ }
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ comMngPopulationCommunityTagsDO.setUpdateBy(userId);
+ updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
- ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
- BeanUtils.copyProperties(vo, mistake);
- setSentenceMistake(mistake, vo);
- mistake.setMistake("该实有人口已存在于该社区，执行更新");
- mistakes.add(mistake);
+ ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setSentenceMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在于该社区，执行更新");
+ mistakes.add(mistake);
+ }
}
log.info("查询实有人口存在社区信息完成");
}
@@ -2879,7 +2879,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -3114,29 +3114,29 @@
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCreateBy(userId);
savePopulationCommunityList.add(cpopulationCommunityTagsDO);
- }
- } else {
- // 实有人口存在于当前社区，则更新
- ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
- (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
- List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
- .collect(Collectors.toList());
- // 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
- Iterator<String> iterator = userTag.iterator();
- while (iterator.hasNext()) {
- String s = iterator.next();
- if (!labelList.contains(s))
- iterator.remove();
- }
- comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
- comMngPopulationCommunityTagsDO.setUpdateBy(userId);
- updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
+ }else {
+ // 实有人口存在于当前社区，则更新
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
+ (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
+ List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
+ .collect(Collectors.toList());
+ // 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
+ Iterator<String> iterator = userTag.iterator();
+ while (iterator.hasNext()) {
+ String s = iterator.next();
+ if (!labelList.contains(s))
+ iterator.remove();
+ }
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ comMngPopulationCommunityTagsDO.setUpdateBy(userId);
+ updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
- ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
- BeanUtils.copyProperties(vo, mistake);
- setVeteransMistake(mistake, vo);
- mistake.setMistake("该实有人口已存在于该社区，执行更新");
- mistakes.add(mistake);
+ ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setVeteransMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在于该社区，执行更新");
+ mistakes.add(mistake);
+ }
}
log.info("查询实有人口存在社区信息完成");
}
@@ -3174,7 +3174,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -3409,29 +3409,29 @@
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCreateBy(userId);
savePopulationCommunityList.add(cpopulationCommunityTagsDO);
- }
- } else {
- // 实有人口存在于当前社区，则更新
- ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
- (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
- List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
- .collect(Collectors.toList());
- // 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
- Iterator<String> iterator = userTag.iterator();
- while (iterator.hasNext()) {
- String s = iterator.next();
- if (!labelList.contains(s))
- iterator.remove();
- }
- comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
- comMngPopulationCommunityTagsDO.setUpdateBy(userId);
- updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
+ } else {
+ // 实有人口存在于当前社区，则更新
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
+ (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
+ List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
+ .collect(Collectors.toList());
+ // 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
+ Iterator<String> iterator = userTag.iterator();
+ while (iterator.hasNext()) {
+ String s = iterator.next();
+ if (!labelList.contains(s))
+ iterator.remove();
+ }
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ comMngPopulationCommunityTagsDO.setUpdateBy(userId);
+ updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
- ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
- BeanUtils.copyProperties(vo, mistake);
- setDisabilityMistake(mistake, vo);
- mistake.setMistake("该实有人口已存在于该社区，执行更新");
- mistakes.add(mistake);
+ ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setDisabilityMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在于该社区，执行更新");
+ mistakes.add(mistake);
+ }
}
log.info("查询实有人口存在社区信息完成");
}
@@ -3469,7 +3469,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -3709,29 +3709,29 @@
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCreateBy(userId);
savePopulationCommunityList.add(cpopulationCommunityTagsDO);
- }
- } else {
- // 实有人口存在于当前社区，则更新
- ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
- (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
- List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
- .collect(Collectors.toList());
- // 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
- Iterator<String> iterator = userTag.iterator();
- while (iterator.hasNext()) {
- String s = iterator.next();
- if (!labelList.contains(s))
- iterator.remove();
- }
- comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
- comMngPopulationCommunityTagsDO.setUpdateBy(userId);
- updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
+ } else {
+ // 实有人口存在于当前社区，则更新
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
+ (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
+ List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
+ .collect(Collectors.toList());
+ // 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
+ Iterator<String> iterator = userTag.iterator();
+ while (iterator.hasNext()) {
+ String s = iterator.next();
+ if (!labelList.contains(s))
+ iterator.remove();
+ }
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ comMngPopulationCommunityTagsDO.setUpdateBy(userId);
+ updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
- ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
- BeanUtils.copyProperties(vo, mistake);
- setLowSecurityMistake(mistake, vo);
- mistake.setMistake("该实有人口已存在于该社区，执行更新");
- mistakes.add(mistake);
+ ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setLowSecurityMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在于该社区，执行更新");
+ mistakes.add(mistake);
+ }
}
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