| @@ -84,14 +84,18 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| public ResultData queryData(Map<String, String> paramsMap) { | public ResultData queryData(Map<String, String> paramsMap) { | ||||
| String tenantId = paramsMap.get("tenantId"); | String tenantId = paramsMap.get("tenantId"); | ||||
| Integer chart = Integer.valueOf(paramsMap.get("chart")); | Integer chart = Integer.valueOf(paramsMap.get("chart")); | ||||
| String startdate = paramsMap.get("startdate") + " 00:00:00"; | |||||
| String enddate = paramsMap.get("enddate") + " 23:59:59"; | |||||
| String startdate = paramsMap.get("startdate"); | |||||
| String enddate = paramsMap.get("enddate"); | |||||
| if (StringUtils.isEmpty(startdate)) { | if (StringUtils.isEmpty(startdate)) { | ||||
| startdate = DateUtils.getSystemTime("yyyy-MM-dd") + " 00:00:00" ; | startdate = DateUtils.getSystemTime("yyyy-MM-dd") + " 00:00:00" ; | ||||
| } else { | |||||
| startdate = startdate + " 00:00:00"; | |||||
| } | } | ||||
| if (StringUtils.isEmpty(enddate)) { | if (StringUtils.isEmpty(enddate)) { | ||||
| enddate = DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59"; | enddate = DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59"; | ||||
| } else { | |||||
| enddate = enddate + " 23:59:59"; | |||||
| } | } | ||||
| //出租率 | //出租率 | ||||