From c802a49bba1bedbe98950a297802342b1b488c00 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 22 Apr 2019 09:55:56 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=B8=93=E9=A2=98][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9findbyid]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxChartServiceImpl.java | 6 +++--- .../src/main/resources/mapper/WxCouponMapper.xml | 16 ++++++++++------ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 95f28fb61..82241205a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2234,7 +2234,7 @@ public class WxChartServiceImpl implements WxChartDataService { */ private ResultData getIndexShopRentData(String tenantId, String startDateStr) { HashMap datamap = new HashMap<>(); - Date startDate = DateUtils.getDateFromString(startDateStr,"yyyy-MM-dd").getTime(); + Date startDate = DateUtils.getDateFromString(startDateStr,"yyyy-MM-dd HH:mm:ss").getTime(); Date endDate = DateUtils.getLastDayForMonth(startDate); WxShop query = new WxShop(); query.setTenantId(tenantId); @@ -2283,7 +2283,7 @@ public class WxChartServiceImpl implements WxChartDataService { */ private ResultData getBillReceRate(String tenantId, String startDateStr) { HashMap datamap = new HashMap<>(); - Date startDate = DateUtils.getDateFromString(startDateStr,"yyyy-MM-dd").getTime(); + Date startDate = DateUtils.getDateFromString(startDateStr,"yyyy-MM-dd HH:mm:ss").getTime(); Date endDate = DateUtils.getLastDayForMonth(startDate); //租金收缴率 @@ -2430,7 +2430,7 @@ public class WxChartServiceImpl implements WxChartDataService { Date endDate = DateUtils.getDateFromString(enddate,"yyyy-MM-dd HH:mm:ss").getTime(); HashMap datamap = new HashMap<>(); - List days = DateUtils.getTjTimeList(startdate,enddate,"0"); + List days = DateUtils.getTjTimeList(new SimpleDateFormat("yyyy-MM-dd").format(startDate),new SimpleDateFormat("yyyy-MM-dd").format(endDate),"0"); TreeMap historyMap; Map countMap; WxCoupon couponQuery = new WxCoupon(); diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 0e0201ca8..09c7eca2f 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -746,12 +746,6 @@ and wop.create_date between #{startdate} and #{enddate} - - +