| @@ -1116,17 +1116,15 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| */ | */ | ||||
| private ResultData getCarPayCarCountInWeek(TenantEntity tenantEntity) { | private ResultData getCarPayCarCountInWeek(TenantEntity tenantEntity) { | ||||
| HashMap<String, Object> datamap = new HashMap<>(); | HashMap<String, Object> datamap = new HashMap<>(); | ||||
| HashMap<String, Object> weekParams = new HashMap<>(); | |||||
| weekParams.put("tenantId", tenantEntity.getTenantId()); | |||||
| if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { | |||||
| weekParams.put("parentTenantId", tenantEntity.getParentTenantId()); | |||||
| } | |||||
| String oneWeekStartdate = DateUtils.getTimeBefore(7, new Date()); | String oneWeekStartdate = DateUtils.getTimeBefore(7, new Date()); | ||||
| String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date()); | String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date()); | ||||
| weekParams.put("startdate", oneWeekStartdate + " 00:00:00"); | |||||
| weekParams.put("enddate", oneWeekEndDate + " 23:59:59"); | |||||
| weekParams.put("cmdTypes", EnumCarCmd.getCarPay()); | |||||
| datamap.put("oneWeekCarPayCount", wxCarCmdLogService.queryHistoryCount(weekParams)); | |||||
| WxChartDataEntity ChartDataEntity = new WxChartDataEntity(); | |||||
| ChartDataEntity.updateTenantInfo(tenantEntity); | |||||
| ChartDataEntity.setType(EnumChartType.CAR_PAID.getCode()); | |||||
| ChartDataEntity.setStartTime(DateUtils.stringToDate(oneWeekStartdate)); | |||||
| ChartDataEntity.setStartTime(DateUtils.stringToDate(oneWeekEndDate)); | |||||
| Long weekCount = wxChartDataMapper.findSumResult(ChartDataEntity); | |||||
| datamap.put("oneWeekCarPayCount", weekCount); | |||||
| return new ResultData(datamap); | return new ResultData(datamap); | ||||
| } | } | ||||