|
|
|
@@ -241,7 +241,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
for (MarkingSceneDataReportVo temp: templist) { |
|
|
|
MarkingSceneDataVo vo = new MarkingSceneDataVo(); |
|
|
|
vo.setxTime(temp.getxTime()); |
|
|
|
if(markingCouponDataReportDto.getType()==1) { |
|
|
|
if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.CAR_STOP.getCode())) { |
|
|
|
vo.setSendCount(temp.getParkSendCount()); |
|
|
|
}else{ |
|
|
|
vo.setSendCount(temp.getVerifySendCount()); |
|
|
|
@@ -251,7 +251,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
|
|
|
|
Map<String, Integer> countMap = new HashMap<>(); |
|
|
|
|
|
|
|
if(markingCouponDataReportDto.getType()==1){ //停车 |
|
|
|
if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.CAR_STOP.getCode())){ //停车 |
|
|
|
//停车发券被核销数 |
|
|
|
params.clear(); |
|
|
|
params.put("tenantId", tenantId); |
|
|
|
@@ -277,7 +277,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
|
|
|
|
Map<String, Integer> triggerCountMap = new HashMap<>(); |
|
|
|
|
|
|
|
if(markingCouponDataReportDto.getType()==1) { //停车 |
|
|
|
if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.CAR_STOP.getCode())){ //停车 |
|
|
|
//获取车辆进场数 |
|
|
|
params.clear(); |
|
|
|
params.put("tenantId", tenantId); |
|
|
|
|