lidongdong
2023-02-27 7cca18cd3b851ca98f98723c5553903ad36b3088
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);
    }
@@ -603,9 +614,11 @@
        List<EventVisitingTasksDO> saveList = new ArrayList<>();
        //获取上月第一天时间
        Date lastMonthFirst = DateUtils.getLastMonthFirst();
//        Date lastMonthFirst = DateUtils.getLastMonthFirst();
        Date lastMonthFirst = DateUtils.getFirstDayOfMonth();
        //获取上月最后一天时间
        Date lastMonthEnd = DateUtils.getLastMonthEnd();
//        Date lastMonthEnd = DateUtils.getLastMonthEnd();
        Date lastMonthEnd = DateUtils.getLastDayOfMonth();
        //查询上月已走访任务
        List<EventVisitingTasksDO> visitingTasksList = this.baseMapper.selectList(new QueryWrapper<EventVisitingTasksDO>().lambda()