From ca33462e7791451485c15343d697bd592675d4c3 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Mon, 4 Dec 2017 09:51:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/platform/common/utils/DateUtil.java    |  3 ++-
 .../lyms/platform/operate/web/facade/RiskReportFacade.java    | 11 ++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
index 90bc9c6..dfa7b62 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
@@ -1396,7 +1396,7 @@ public class DateUtil {
             System.out.println("  end>> " + getyyyy_MM_dd(map.get("end")));
         }*/
 
-        Date date = parseDate("2017-12-11");
+        Date date = parseDate("2017-11-30");
         System.out.println("当月第一天: " + getMonthDay(date, 0, 1).toLocaleString());
         System.out.println("当月最后一天: " + getMonthDay(date, 0, 0).toLocaleString());
         System.out.println("上月第一天: " + getMonthDay(date, -1, 1).toLocaleString());
@@ -1414,6 +1414,7 @@ public class DateUtil {
         System.out.println("上一年的第一天: " + getYear(date, -1, 1).toLocaleString());
         System.out.println("上一年的最后一天: " + getYear(date, -1, 0).toLocaleString());
         System.out.println(getBetweenDay(7));
+        System.out.println(date.getTime());
     }
 
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
index 8208ac2..864c36f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
@@ -263,13 +263,11 @@ public class RiskReportFacade {
 
 
         String parentId = "";
-        String childId = "";
         if (StringUtils.isNotEmpty(countRequest.getProvinceId()))
         {
             basicQuery.setParentId(countRequest.getProvinceId());
             countRequest.setExportType(1);
             parentId = countRequest.getProvinceId();
-            childId = countRequest.getQueryCityId();
         }
 
         if (StringUtils.isNotEmpty(countRequest.getCityId()))
@@ -277,11 +275,10 @@ public class RiskReportFacade {
             basicQuery.setParentId(countRequest.getCityId());
             countRequest.setExportType(2);
             parentId = countRequest.getCityId();
-            childId = countRequest.getQueryAreaId();
         }
 
         //获取地址列表
-        List<Map<String, Object>> list = mongoUtil.getChilds(parentId,childId);
+        List<Map<String, Object>> list = mongoUtil.getChilds(parentId,null);
 
         if (StringUtils.isNotEmpty(countRequest.getAreaId()))
         {
@@ -694,18 +691,18 @@ public class RiskReportFacade {
 
         Date currentDate = DateUtil.getYear();
 
-        //0:全部 1:20岁一下 2:25-30 3:30-40 4:40岁以上
+        //0:全部 1:20岁一下 2:20-30 3:30-40 4:40岁以上
         if (countRequest.getAgeRange() != null && countRequest.getAgeRange() != 0)
         {
             int s = 0;
             int e = 0;
             if (countRequest.getAgeRange() == 1)
             {
-                s = 0;e=20;
+                s = 0;e=19;
             }
             else if (countRequest.getAgeRange() == 2)
             {
-                s = 25;e=30;
+                s = 20;e=30;
             }
             else if (countRequest.getAgeRange() == 3)
             {
-- 
1.8.3.1