diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index 6336d2f1d..f0cf2fcfc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -512,10 +512,8 @@ public class DataTowerServiceImpl implements DataTowerService { // 查询近一周的缴费车辆----start------ HashMap weekParams = new HashMap<>(); weekParams.put("tenantId", tenantId); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - List days = DateUtils.dateToWeek(new Date()); - String oneWeekStartdate = sdf.format(days.get(0)); - String oneWeekEndDate = sdf.format(days.get(days.size()-1)); + String oneWeekStartdate = DateUtils.getTimeBefore(7, 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("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); @@ -530,26 +528,16 @@ public class DataTowerServiceImpl implements DataTowerService { }, m -> { return m.get("fee"); })); + List days = DateUtils.getTjTimeList(oneWeekStartdate, oneWeekEndDate, "0"); + TreeMap weekMap = new TreeMap<>(); - SimpleDateFormat sdfForWeek = new SimpleDateFormat("MM/dd"); - for (Date date:days) { - weekMap.put(sdfForWeek.format(date),"0"); + for (String date:days) { + weekMap.put(date.substring(5,date.length()).replace("-","/"),"0"); } for (String key : weekCollect.keySet()) { weekMap.put(key,weekCollect.get(key)); } - - TreeMap weekResultMap = new TreeMap<>(); - int count = 1; - for (String key : weekMap.keySet()) { - if(count == 7){ - weekResultMap.put("日",weekMap.get(key)); - }else{ - weekResultMap.put(count+"",weekMap.get(key)); - } - count++; - } - datamap.put("oneWeekCarPayFeeCount",weekResultMap); + datamap.put("oneWeekCarPayFeeCount",weekMap); // 查询近一周的缴费车辆----end------ //今日车流量 diff --git a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java index d7b907cbd..dd24f899d 100755 --- a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java +++ b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java @@ -938,24 +938,4 @@ public class DateUtils { return false; } } - - - /** - * 根据日期获得所在周的日期 - * @param mdate - * @return - */ - @SuppressWarnings("deprecation") - public static List dateToWeek(Date mdate) { - int b = mdate.getDay(); - Date fdate; - List list = new ArrayList<>(); - Long fTime = mdate.getTime() - b * 24 * 3600000; - for (int a = 1; a <= 7; a++) { - fdate = new Date(); - fdate.setTime(fTime + (a * 24 * 3600000)); - list.add(a-1, fdate); - } - return list; - } } diff --git a/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml index fda0c7cde..a517896d3 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml @@ -96,5 +96,4 @@ -