| @@ -1568,7 +1568,7 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| Map<String, Object> result = new HashMap<>(); | Map<String, Object> result = new HashMap<>(); | ||||
| Date startTime = new Date(); | Date startTime = new Date(); | ||||
| Date endTime = startTime; | Date endTime = startTime; | ||||
| if (startdate == null) { | |||||
| if (paramsMap.get("startdate") == null) { | |||||
| Calendar c = Calendar.getInstance(); | Calendar c = Calendar.getInstance(); | ||||
| c.add(Calendar.MONTH, 0); | c.add(Calendar.MONTH, 0); | ||||
| c.set(Calendar.DAY_OF_MONTH, 1); | c.set(Calendar.DAY_OF_MONTH, 1); | ||||
| @@ -1578,7 +1578,7 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| startTime = DateUtils.stringToDate(startdate + " 00:00:00"); | startTime = DateUtils.stringToDate(startdate + " 00:00:00"); | ||||
| params.put("startdate", startTime); | params.put("startdate", startTime); | ||||
| } | } | ||||
| if (enddate == null) { | |||||
| if (paramsMap.get("enddate") == null) { | |||||
| params.put("enddate", endTime); | params.put("enddate", endTime); | ||||
| } else { | } else { | ||||
| endTime = DateUtils.stringToDate(enddate + " 23:59:59"); | endTime = DateUtils.stringToDate(enddate + " 23:59:59"); | ||||