From f9ea4813b794b5de7de48fd06068298ac5e6c9e8 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 18 Mar 2019 11:36:21 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=8D=A1=E8=90=A5=E9=94=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxChartServiceImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 5cf6f4654..0dd05115d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -1470,7 +1470,7 @@ public class WxChartServiceImpl implements WxChartDataService { WxCoupon wxCoupon = new WxCoupon(); //默认时间本月第一天,截止到当天 - if(paramsMap.get("startdate") == null){ + if(paramsMap.get("startdate") == null || StringUtils.isBlank(paramsMap.get("startdate"))){ Calendar c = Calendar.getInstance(); c.add(Calendar.MONTH, 0); c.set(Calendar.DAY_OF_MONTH,1); @@ -1479,7 +1479,7 @@ public class WxChartServiceImpl implements WxChartDataService { Date startTime = DateUtils.stringToDate(startdate); wxCoupon.setStartdate(startTime); } - if(paramsMap.get("enddate") == null){ + if(paramsMap.get("enddate") == null || StringUtils.isBlank(paramsMap.get("enddate"))){ wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); }else{ Date endTime = DateUtils.stringToDate(enddate); @@ -1512,7 +1512,7 @@ public class WxChartServiceImpl implements WxChartDataService { Map result = new HashedMap(); //默认时间本月第一天,截止到当天 - if(paramsMap.get("startdate") == null){ + if(paramsMap.get("startdate") == null || StringUtils.isBlank(paramsMap.get("startdate"))){ Calendar c = Calendar.getInstance(); c.add(Calendar.MONTH, 0); c.set(Calendar.DAY_OF_MONTH,1); @@ -1521,7 +1521,7 @@ public class WxChartServiceImpl implements WxChartDataService { Date startTime = DateUtils.stringToDate(startdate); wxCoupon.setStartdate(startTime); } - if(paramsMap.get("enddate") == null){ + if(paramsMap.get("enddate") == null || StringUtils.isBlank(paramsMap.get("enddate"))){ wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); }else{ Date endTime = DateUtils.stringToDate(enddate); @@ -1566,7 +1566,7 @@ public class WxChartServiceImpl implements WxChartDataService { Map result = new HashedMap(); //默认时间本月第一天,截止到当天 - if(paramsMap.get("startdate") == null){ + if(paramsMap.get("startdate") == null || StringUtils.isBlank(paramsMap.get("startdate"))){ Calendar c = Calendar.getInstance(); c.add(Calendar.MONTH, 0); c.set(Calendar.DAY_OF_MONTH,1); @@ -1575,7 +1575,7 @@ public class WxChartServiceImpl implements WxChartDataService { Date startTime = DateUtils.stringToDate(startdate); wxCoupon.setStartdate(startTime); } - if(paramsMap.get("enddate") == null){ + if(paramsMap.get("enddate") == null || StringUtils.isBlank(paramsMap.get("enddate"))){ wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); }else{ Date endTime = DateUtils.stringToDate(enddate); @@ -1615,7 +1615,7 @@ public class WxChartServiceImpl implements WxChartDataService { Map result = new HashMap<>(); Date startTime = new Date(); Date endTime = startTime; - if (paramsMap.get("startdate") == null) { + if (paramsMap.get("startdate") == null || StringUtils.isBlank(paramsMap.get("startdate"))) { Calendar c = Calendar.getInstance(); c.add(Calendar.MONTH, 0); c.set(Calendar.DAY_OF_MONTH, 1); @@ -1625,7 +1625,7 @@ public class WxChartServiceImpl implements WxChartDataService { startTime = DateUtils.stringToDate(startdate + " 00:00:00"); params.put("startdate", startTime); } - if (paramsMap.get("enddate") == null) { + if (paramsMap.get("enddate") == null || StringUtils.isBlank(paramsMap.get("enddate"))) { params.put("enddate", endTime); } else { endTime = DateUtils.stringToDate(enddate + " 23:59:59");