Explorar el Código

[数据塔台][营销数据][修改券数据为30天记录],[数据塔台][车流数据][修改数据为30天记录]

release_toaliyun_real
gongbiao hace 7 años
padre
commit
5e9a1785a3
Se han modificado 2 ficheros con 3 adiciones y 3 borrados
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java Ver fichero

@@ -158,7 +158,7 @@ public class DataTowerServiceImpl implements DataTowerService {
HashMap<Object, Object> params = new HashMap<>(); HashMap<Object, Object> params = new HashMap<>();
params.put("tenantId",tenantId); params.put("tenantId",tenantId);
params.put("cmdType",EnumCarCmd.CAR_ETCP_CALLBACK_PARK_OUT.getCode()); params.put("cmdType",EnumCarCmd.CAR_ETCP_CALLBACK_PARK_OUT.getCode());
String startdate = DateUtils.getTimeBefore(29, new Date());
String startdate = DateUtils.getTimeBefore(30, new Date());
String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); String systemTime = DateUtils.getSystemTime("yyyy-MM-dd");


List<String> tjTimeList = DateUtils.getTjTimeList(startdate, systemTime, "0"); List<String> tjTimeList = DateUtils.getTjTimeList(startdate, systemTime, "0");


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java Ver fichero

@@ -123,7 +123,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
List<MarkingCouponDataReportVo> couponDatalist = wxCouponOrderMapper.couponDataMap(params); List<MarkingCouponDataReportVo> couponDatalist = wxCouponOrderMapper.couponDataMap(params);
//查询券领取人数 //查询券领取人数


String startdate = DateUtils.getTimeBefore(29, new Date());
String startdate = DateUtils.getTimeBefore(30, new Date());
String enddate = DateUtils.getTimeBefore(1,new Date()); String enddate = DateUtils.getTimeBefore(1,new Date());
List<String> tjTimeList = DateUtils.getTjTimeList(startdate, enddate, "0"); List<String> tjTimeList = DateUtils.getTjTimeList(startdate, enddate, "0");
List<String> tjList = tjTimeList.stream().map(d -> d.substring(5).replace("-", "/")).collect(Collectors.toList()); List<String> tjList = tjTimeList.stream().map(d -> d.substring(5).replace("-", "/")).collect(Collectors.toList());
@@ -205,7 +205,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
vo.setVerifyCount(verifyCountMap.get(vo.getxTime()) == null ? 0 : verifyCountMap.get(vo.getxTime())); vo.setVerifyCount(verifyCountMap.get(vo.getxTime()) == null ? 0 : verifyCountMap.get(vo.getxTime()));
} }


String startdate = DateUtils.getTimeBefore(29, new Date());
String startdate = DateUtils.getTimeBefore(30, new Date());
String enddate = DateUtils.getTimeBefore(1,new Date()); String enddate = DateUtils.getTimeBefore(1,new Date());
List<String> tjTimeList = DateUtils.getTjTimeList(startdate, enddate, "0"); List<String> tjTimeList = DateUtils.getTjTimeList(startdate, enddate, "0");
List<String> tjList = tjTimeList.stream().map(d -> d.substring(5).replace("-", "/")).collect(Collectors.toList()); List<String> tjList = tjTimeList.stream().map(d -> d.substring(5).replace("-", "/")).collect(Collectors.toList());


Cargando…
Cancelar
Guardar