Commit ca33462e7791451485c15343d697bd592675d4c3
1 parent
a51f626109
Exists in
master
and in
6 other branches
统计
Showing 2 changed files with 6 additions and 8 deletions
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
View file @
ca33462
| ... | ... | @@ -1396,7 +1396,7 @@ |
| 1396 | 1396 | System.out.println(" end>> " + getyyyy_MM_dd(map.get("end"))); |
| 1397 | 1397 | }*/ |
| 1398 | 1398 | |
| 1399 | - Date date = parseDate("2017-12-11"); | |
| 1399 | + Date date = parseDate("2017-11-30"); | |
| 1400 | 1400 | System.out.println("当月第一天: " + getMonthDay(date, 0, 1).toLocaleString()); |
| 1401 | 1401 | System.out.println("当月最后一天: " + getMonthDay(date, 0, 0).toLocaleString()); |
| 1402 | 1402 | System.out.println("上月第一天: " + getMonthDay(date, -1, 1).toLocaleString()); |
| ... | ... | @@ -1414,6 +1414,7 @@ |
| 1414 | 1414 | System.out.println("上一年的第一天: " + getYear(date, -1, 1).toLocaleString()); |
| 1415 | 1415 | System.out.println("上一年的最后一天: " + getYear(date, -1, 0).toLocaleString()); |
| 1416 | 1416 | System.out.println(getBetweenDay(7)); |
| 1417 | + System.out.println(date.getTime()); | |
| 1417 | 1418 | } |
| 1418 | 1419 | |
| 1419 | 1420 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
View file @
ca33462
| ... | ... | @@ -263,13 +263,11 @@ |
| 263 | 263 | |
| 264 | 264 | |
| 265 | 265 | String parentId = ""; |
| 266 | - String childId = ""; | |
| 267 | 266 | if (StringUtils.isNotEmpty(countRequest.getProvinceId())) |
| 268 | 267 | { |
| 269 | 268 | basicQuery.setParentId(countRequest.getProvinceId()); |
| 270 | 269 | countRequest.setExportType(1); |
| 271 | 270 | parentId = countRequest.getProvinceId(); |
| 272 | - childId = countRequest.getQueryCityId(); | |
| 273 | 271 | } |
| 274 | 272 | |
| 275 | 273 | if (StringUtils.isNotEmpty(countRequest.getCityId())) |
| 276 | 274 | |
| ... | ... | @@ -277,11 +275,10 @@ |
| 277 | 275 | basicQuery.setParentId(countRequest.getCityId()); |
| 278 | 276 | countRequest.setExportType(2); |
| 279 | 277 | parentId = countRequest.getCityId(); |
| 280 | - childId = countRequest.getQueryAreaId(); | |
| 281 | 278 | } |
| 282 | 279 | |
| 283 | 280 | //获取地址列表 |
| 284 | - List<Map<String, Object>> list = mongoUtil.getChilds(parentId,childId); | |
| 281 | + List<Map<String, Object>> list = mongoUtil.getChilds(parentId,null); | |
| 285 | 282 | |
| 286 | 283 | if (StringUtils.isNotEmpty(countRequest.getAreaId())) |
| 287 | 284 | { |
| 288 | 285 | |
| 289 | 286 | |
| ... | ... | @@ -694,18 +691,18 @@ |
| 694 | 691 | |
| 695 | 692 | Date currentDate = DateUtil.getYear(); |
| 696 | 693 | |
| 697 | - //0:全部 1:20岁一下 2:25-30 3:30-40 4:40岁以上 | |
| 694 | + //0:全部 1:20岁一下 2:20-30 3:30-40 4:40岁以上 | |
| 698 | 695 | if (countRequest.getAgeRange() != null && countRequest.getAgeRange() != 0) |
| 699 | 696 | { |
| 700 | 697 | int s = 0; |
| 701 | 698 | int e = 0; |
| 702 | 699 | if (countRequest.getAgeRange() == 1) |
| 703 | 700 | { |
| 704 | - s = 0;e=20; | |
| 701 | + s = 0;e=19; | |
| 705 | 702 | } |
| 706 | 703 | else if (countRequest.getAgeRange() == 2) |
| 707 | 704 | { |
| 708 | - s = 25;e=30; | |
| 705 | + s = 20;e=30; | |
| 709 | 706 | } |
| 710 | 707 | else if (countRequest.getAgeRange() == 3) |
| 711 | 708 | { |