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 5885f550a..714a8f575 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -128,7 +128,7 @@ public class DataTowerServiceImpl implements DataTowerService { List> recordlist=wxDateAmountRecordMapper.queryprice(tenantId); Map collect = recordlist.stream().collect(Collectors.toMap(m -> { - return m.get("date"); + return DateUtils.date2String((Date)m.get("date"),"MM/dd"); }, m -> { return m.get("price"); })); @@ -168,7 +168,7 @@ public class DataTowerServiceImpl implements DataTowerService { List> historylist=wxCarCmdLogMapper.queryHistory(params); Map collect = historylist.stream().collect(Collectors.toMap(m -> { - return m.get("create_date"); + return DateUtils.date2String((Date)m.get("create_date"),"MM/dd"); }, m -> { return m.get("carcount"); })); @@ -176,7 +176,7 @@ public class DataTowerServiceImpl implements DataTowerService { for(String date:tjTimeList){ Object o = collect.get(date); if(o==null){ - collect.put(date,0l); + collect.put(date.substring(5).replace("-","/"),0l); } } @@ -187,10 +187,10 @@ public class DataTowerServiceImpl implements DataTowerService { datamap.put("history",historymap); //今日车流量 - long todaycar = (long) collect.get(systemTime); + long todaycar = (long) collect.get(DateUtils.getSystemTime("MM/dd")); datamap.put("todaycar",todaycar); //环比 - long yesterdaycar = (long) collect.get(tjTimeList.get(8 - 2)); + long yesterdaycar = (long) collect.get(tjTimeList.get(8 - 2).substring(5).replace("-","/")); if(yesterdaycar>0){ double hbd = (double) (todaycar - yesterdaycar) / yesterdaycar *100; double hb = new BigDecimal(hbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); @@ -200,7 +200,7 @@ public class DataTowerServiceImpl implements DataTowerService { } //上周同期 - long last = (long) collect.get(tjTimeList.get(0)); + long last = (long) collect.get(tjTimeList.get(0).substring(5).replace("-","/")); if(last>0){ double lasthbd = (double) (todaycar - last) / last *100; double lasthb = new BigDecimal(lasthbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); diff --git a/mallinkService/src/main/resources/mapper/WxUserVisitMapper.xml b/mallinkService/src/main/resources/mapper/WxUserVisitMapper.xml index 0481a5fb5..327a5a027 100644 --- a/mallinkService/src/main/resources/mapper/WxUserVisitMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxUserVisitMapper.xml @@ -102,7 +102,7 @@