From 0db2fe31365053b8947d154c8fac6fe3afa3aedc Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 27 二月 2023 17:32:40 +0800
Subject: [PATCH] 修改走访任务定时
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
index 9f100fd..5142ee8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
+++ b/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,14 @@
List<EventVisitingTasksDO> saveList = new ArrayList<>();
//获取上月第一天时间
- Date lastMonthFirst = DateUtils.getLastMonthFirst();
+// Date lastMonthFirst = DateUtils.getLastMonthFirst();
+ Date lastMonthFirst = DateUtils.getYearMonthStart(2022,7);
//获取上月最后一天时间
- Date lastMonthEnd = DateUtils.getLastMonthEnd();
+// Date lastMonthEnd = DateUtils.getLastMonthEnd();
+ Date lastMonthEnd = DateUtils.getYearMonthEnd(2022,7);
+
+ log.error("第一天时间"+lastMonthFirst);
+ log.error("第一天时间"+lastMonthEnd);
//查询上月已走访任务
List<EventVisitingTasksDO> visitingTasksList = this.baseMapper.selectList(new QueryWrapper<EventVisitingTasksDO>().lambda()
@@ -613,11 +629,15 @@
.ge(EventVisitingTasksDO::getSubmitDate,lastMonthFirst)
.le(EventVisitingTasksDO::getSubmitDate,lastMonthEnd));
+ log.error("走访对象"+visitingTasksList.size());
+
visitingTasksList.forEach(visitingTask -> {
EventVisitingTasksDO visitingTasksDO = dataConversion(visitingTask);
saveList.add(visitingTasksDO);
});
+ log.error("走访新对象"+saveList.size());
+
if(saveList.size() > 0){
this.saveBatch(saveList);
}
--
Gitblit v1.7.1