Merge branch 'test' into 'test_bak'

罗元桥

2021-10-12 ac40c3007b59a73c6ad985d8fab2a6d0db65af87

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java

@@ -4,7 +4,9 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.ComMngPopulationCommunityTagsVo;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.LabelUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -172,6 +174,10 @@
                eventVisitingTasksVO
                    .setNation(PopulPoliticalOutlookEnum.getCnDescByName(eventVisitingTasksVO.getNationCode()));
            }
            //查询该人口的标签
            List<ComMngPopulationCommunityTagsVo> communityTagsList = this.baseMapper.getCommunityTagList(eventVisitingTasksVO.getVisiterId());
            String label = LabelUtils.assembleLabel(communityTagsList);
            eventVisitingTasksVO.setLabel(label);
        }
        return R.ok(page);
    }
@@ -186,6 +192,11 @@
                eventVisitingTasksVO
                    .setNation(PopulPoliticalOutlookEnum.getCnDescByName(eventVisitingTasksVO.getNationCode()));
            }

            //查询该人口的标签
            List<ComMngPopulationCommunityTagsVo> communityTagsList = this.baseMapper.getCommunityTagList(eventVisitingTasksVO.getVisiterId());
            String label = LabelUtils.assembleLabel(communityTagsList);
            eventVisitingTasksVO.setLabel(label);
        }
        return R.ok(page);
    }