Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-08-26 c161f8538c248a6bd01054b8e5b79a1b2d5dd476

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java

@@ -751,7 +751,6 @@
                        populationDO.setLabel(Joiner.on(",").join(userTag));
                        populationDO.setCreateBy(userId);
                        savePopulationCommunityList.add(cpopulationCommunityTagsDO);
                    }
                } else {
                    // 实有人口存在于当前社区，则更新
                    ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
@@ -774,6 +773,7 @@
                    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,7 +1046,6 @@
                        populationDO.setLabel(Joiner.on(",").join(userTag));
                        populationDO.setCreateBy(userId);
                        savePopulationCommunityList.add(cpopulationCommunityTagsDO);
                    }
                } else {
                    // 实有人口存在于当前社区，则更新
                    ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
@@ -1069,6 +1068,7 @@
                    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,7 +1341,6 @@
                        populationDO.setLabel(Joiner.on(",").join(userTag));
                        populationDO.setCreateBy(userId);
                        savePopulationCommunityList.add(cpopulationCommunityTagsDO);
                    }
                } else {
                    // 实有人口存在于当前社区，则更新
                    ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
@@ -1364,6 +1363,7 @@
                    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,7 +1636,6 @@
                        populationDO.setLabel(Joiner.on(",").join(userTag));
                        populationDO.setCreateBy(userId);
                        savePopulationCommunityList.add(cpopulationCommunityTagsDO);
                    }
                } else {
                    // 实有人口存在于当前社区，则更新
                    ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
@@ -1659,6 +1658,7 @@
                    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,7 +1931,6 @@
                        populationDO.setLabel(Joiner.on(",").join(userTag));
                        populationDO.setCreateBy(userId);
                        savePopulationCommunityList.add(cpopulationCommunityTagsDO);
                    }
                } else {
                    // 实有人口存在于当前社区，则更新
                    ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
@@ -1954,6 +1953,7 @@
                    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,7 +2228,6 @@
                        populationDO.setLabel(Joiner.on(",").join(userTag));
                        populationDO.setCreateBy(userId);
                        savePopulationCommunityList.add(cpopulationCommunityTagsDO);
                    }
                } else {
                    // 实有人口存在于当前社区，则更新
                    ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
@@ -2252,6 +2251,7 @@
                    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,7 +2524,6 @@
                        populationDO.setLabel(Joiner.on(",").join(userTag));
                        populationDO.setCreateBy(userId);
                        savePopulationCommunityList.add(cpopulationCommunityTagsDO);
                    }
                } else {
                    // 实有人口存在于当前社区，则更新
                    ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
@@ -2547,6 +2546,7 @@
                    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,7 +2819,6 @@
                        populationDO.setLabel(Joiner.on(",").join(userTag));
                        populationDO.setCreateBy(userId);
                        savePopulationCommunityList.add(cpopulationCommunityTagsDO);
                    }
                } else {
                    // 实有人口存在于当前社区，则更新
                    ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
@@ -2842,6 +2841,7 @@
                    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,7 +3114,6 @@
                        populationDO.setLabel(Joiner.on(",").join(userTag));
                        populationDO.setCreateBy(userId);
                        savePopulationCommunityList.add(cpopulationCommunityTagsDO);
                    }
                } else {
                    // 实有人口存在于当前社区，则更新
                    ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
@@ -3137,6 +3136,7 @@
                    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,7 +3409,6 @@
                        populationDO.setLabel(Joiner.on(",").join(userTag));
                        populationDO.setCreateBy(userId);
                        savePopulationCommunityList.add(cpopulationCommunityTagsDO);
                    }
                } else {
                    // 实有人口存在于当前社区，则更新
                    ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
@@ -3432,6 +3431,7 @@
                    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,7 +3709,6 @@
                        populationDO.setLabel(Joiner.on(",").join(userTag));
                        populationDO.setCreateBy(userId);
                        savePopulationCommunityList.add(cpopulationCommunityTagsDO);
                    }
                } else {
                    // 实有人口存在于当前社区，则更新
                    ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
@@ -3732,6 +3731,7 @@
                    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);
                            }