花城E+bug更新

101captain

2022-05-24 ab09389c59dcfc5277cf91ed1f244a8a439e7113

花城E+bug更新

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationSentenceExcelListen.java

@@ -307,7 +307,7 @@
                if (StringUtils.isNotEmpty(oneData.get(22))) {
                    vo.setRemark(oneData.get(22).trim());
                }
                vo.getUserTagStr().add("服刑人员");
                vo.getUserTagStr().add("刑满释放");
                for (int i = 23; i < headSize; i++) {
                    if (oneData.get(i) != null && oneData.get(i).equals("是")) {
                        vo.getUserTagStr().add(headData.get(i).substring(0, headData.get(i).indexOf("(")));

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

@@ -925,6 +925,7 @@
                                iterator.remove();
                        }
                        comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));

                        comMngPopulationCommunityTagsDO.setUpdateBy(userId);
                        updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

@@ -1230,7 +1231,12 @@
                            if (!labelList.contains(s))
                                iterator.remove();
                        }
                        if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
                            comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
                        }
                        else{
                        comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
                        }
                        comMngPopulationCommunityTagsDO.setUpdateBy(userId);
                        updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

@@ -1536,7 +1542,12 @@
                            if (!labelList.contains(s))
                                iterator.remove();
                        }
                        if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
                            comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
                        }
                        else{
                        comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
                        }
                        comMngPopulationCommunityTagsDO.setUpdateBy(userId);
                        updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

@@ -1842,7 +1853,12 @@
                            if (!labelList.contains(s))
                                iterator.remove();
                        }
                        if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
                            comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
                        }
                        else{
                        comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
                        }
                        comMngPopulationCommunityTagsDO.setUpdateBy(userId);
                        updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

@@ -2148,7 +2164,12 @@
                            if (!labelList.contains(s))
                                iterator.remove();
                        }
                        if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
                            comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
                        }
                        else{
                        comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
                        }
                        comMngPopulationCommunityTagsDO.setUpdateBy(userId);
                        updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

@@ -2455,7 +2476,12 @@
                            if (!labelList.contains(s))
                                iterator.remove();
                        }
                        if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
                            comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
                        }
                        else{
                        comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
                        }
                        comMngPopulationCommunityTagsDO.setUpdateBy(userId);
                        updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

@@ -2761,7 +2787,12 @@
                            if (!labelList.contains(s))
                                iterator.remove();
                        }
                        if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
                            comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
                        }
                        else{
                        comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
                        }
                        comMngPopulationCommunityTagsDO.setUpdateBy(userId);
                        updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

@@ -3066,7 +3097,12 @@
                            if (!labelList.contains(s))
                                iterator.remove();
                        }
                        if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
                            comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
                        }
                        else{
                        comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
                        }
                        comMngPopulationCommunityTagsDO.setUpdateBy(userId);
                        updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

@@ -3371,7 +3407,12 @@
                            if (!labelList.contains(s))
                                iterator.remove();
                        }
                        if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
                            comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
                        }
                        else{
                        comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
                        }
                        comMngPopulationCommunityTagsDO.setUpdateBy(userId);
                        updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

@@ -3676,7 +3717,12 @@
                            if (!labelList.contains(s))
                                iterator.remove();
                        }
                        if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
                            comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
                        }
                        else{
                        comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
                        }
                        comMngPopulationCommunityTagsDO.setUpdateBy(userId);
                        updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

@@ -3986,7 +4032,12 @@
                            if (!labelList.contains(s))
                                iterator.remove();
                        }
                        if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
                            comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
                        }
                        else{
                        comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
                        }
                        comMngPopulationCommunityTagsDO.setUpdateBy(userId);
                        updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml

@@ -426,7 +426,8 @@
            LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id
        WHERE
            cmpct.community_id = ${pageInputUserDTO.communityId}
            AND cmpct.label IS NOT NULL and cmpct.label !=''
            AND (cmpct.label like '%吸毒%' or cmpct.label like '%矫正%' or cmpct.label like '%重精%' or cmpct.label like '%刑满%'
            or cmpct.label like '%上访%'   or cmpct.label like '%退役%' or cmpct.label like '%残疾%' or cmpct.label like '%低保%')
            <if test='pageInputUserDTO.name != null and pageInputUserDTO.name != &quot;&quot;'>
                AND cmp.`name` LIKE concat(#{pageInputUserDTO.name},'%')
            </if>
@@ -456,7 +457,8 @@
        LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id
        WHERE
        cmpct.community_id = ${pageInputUserDTO.communityId}
        AND cmpct.label IS NOT NULL and cmpct.label !=''
        AND (cmpct.label like '%吸毒%' or cmpct.label like '%矫正%' or cmpct.label like '%重精%' or cmpct.label like '%刑满%'
        or cmpct.label like '%上访%'   or cmpct.label like '%退役%' or cmpct.label like '%残疾%' or cmpct.label like '%低保%')
        <if test='pageInputUserDTO.name != null and pageInputUserDTO.name != &quot;&quot;'>
            AND cmp.`name` LIKE concat(#{pageInputUserDTO.name},'%')
        </if>