From 75fef641fec2039c7592704a292486a4adff4f58 Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Sun, 2 Jun 2019 19:24:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/AreaCountFacade.java   | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
index ad30699..5cb77bc 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
@@ -1,7 +1,6 @@
 package com.lyms.platform.operate.web.facade;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.lyms.platform.beans.AddressBean;
 import com.lyms.platform.biz.service.*;
 import com.lyms.platform.common.base.PageInfo;
@@ -40,20 +39,14 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
 import org.springframework.data.mongodb.core.aggregation.AggregationOperation;
 import org.springframework.data.mongodb.core.aggregation.AggregationResults;
-import org.springframework.data.mongodb.core.aggregation.SortOperation;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletResponse;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.concurrent.*;
-import java.util.stream.Collectors;
 
 import static org.springframework.data.mongodb.core.aggregation.Aggregation.project;
 
@@ -1140,10 +1133,15 @@ public class AreaCountFacade {
      * @return
      */
     public Date getStartDate() {
-        LocalDate with = LocalDate.now().plusYears(0).with(TemporalAdjusters.firstDayOfYear());
+       /* LocalDate with = LocalDate.now().plusYears(0).with(TemporalAdjusters.firstDayOfYear());
         ZoneId zoneId = ZoneId.systemDefault();
-        Instant instant = with.atStartOfDay().atZone(zoneId).toInstant();
-        return Date.from(instant);
+        Instant instant = with.atStartOfDay().atZone(zoneId).toInstant();*/
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(new Date());
+        cal.set(Calendar.MONTH, 0);
+        cal.set(Calendar.DAY_OF_MONTH, 1);
+        Date startDate = cal.getTime();
+        return startDate;
     }
 
     /**
-- 
1.8.3.1