From ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 14 十一月 2023 17:49:20 +0800
Subject: [PATCH] 修改打卡

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 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 6212eb6..3cdb220 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
@@ -614,11 +614,11 @@
         List<EventVisitingTasksDO> saveList = new ArrayList<>();
 
         //获取上月第一天时间
-//        Date lastMonthFirst = DateUtils.getLastMonthFirst();
-        Date lastMonthFirst = DateUtils.getYearMonthStart(2022,7);
+        Date lastMonthFirst = DateUtils.getLastMonthFirst();
+//        Date lastMonthFirst = DateUtils.getYearMonthStart(2022,7);
         //获取上月最后一天时间/
-//        Date lastMonthEnd = DateUtils.getLastMonthEnd();
-        Date lastMonthEnd =  DateUtils.getYearMonthStart(2022,8);
+        Date lastMonthEnd = DateUtils.getLastMonthEnd();
+//        Date lastMonthEnd =  DateUtils.getYearMonthStart(2022,8);
 
         log.error("第一天时间"+lastMonthFirst);
         log.error("第一天时间"+lastMonthEnd);
@@ -655,11 +655,16 @@
         visitingTasksDO.setGridId(oldVisitingTasksDO.getGridId());
         visitingTasksDO.setGridMemberCommunity(oldVisitingTasksDO.getGridMemberCommunity());
         visitingTasksDO.setGridMemberStreet(oldVisitingTasksDO.getGridMemberStreet());
+        visitingTasksDO.setGridMember(oldVisitingTasksDO.getGridMember());
+        visitingTasksDO.setGridMemberName(oldVisitingTasksDO.getGridMemberName());
+        visitingTasksDO.setGridMenberTele(oldVisitingTasksDO.getGridMenberTele());
         visitingTasksDO.setVisiterId(oldVisitingTasksDO.getVisiterId());
         visitingTasksDO.setVisiterName(oldVisitingTasksDO.getVisiterName());
         visitingTasksDO.setVisiterSex(oldVisitingTasksDO.getVisiterSex());
         visitingTasksDO.setVisiterTele(oldVisitingTasksDO.getVisiterTele());
         visitingTasksDO.setVisiterAddress(oldVisitingTasksDO.getVisiterAddress());
+        visitingTasksDO.setVisiterAddress(oldVisitingTasksDO.getVisiterAddress());
+        visitingTasksDO.setVisiterAddress(oldVisitingTasksDO.getVisiterAddress());
         visitingTasksDO.setVisiterType(0);
         visitingTasksDO.setActOpara(0);
         visitingTasksDO.setHappentLatLng(oldVisitingTasksDO.getHappentLatLng());

--
Gitblit v1.7.1