| | |
|---|
| | | startTime2 = split[1]; |
|---|
| | | } |
|---|
| | | ChargingOrderTimeVO chargingOrderTimeVO = new ChargingOrderTimeVO(); |
|---|
| | | |
|---|
| | | if (StringUtils.hasLength(dto.getPhone())){ |
|---|
| | | List<Long> data = appUserClient.getUserIdsByPhone(dto.getPhone()).getData(); |
|---|
| | | if(data!=null){ |
|---|
| | | if (!data.isEmpty()){ |
|---|
| | | dto.setUserIds(data); |
|---|
| | | } |
|---|
| | | }else{ |
|---|
| | | dto.setUserIds(new ArrayList<Long>()); |
|---|
| | | } |
|---|
| | | if (dto.getUserIds().isEmpty()){ |
|---|
| | | List<Long> carIds = dto.getUserIds(); |
|---|
| | | carIds.add(-1L); |
|---|
| | | dto.setUserIds(carIds); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | if (StringUtils.hasLength(dto.getPhone())){ |
|---|
| | | List<Long> data = appUserCarClient.getAppUserCarByLicensePlates(dto.getLicensePlate()).getData(); |
|---|
| | | if(data!=null){ |
|---|
| | | if (!data.isEmpty()){ |
|---|
| | | dto.setCarIds(data); |
|---|
| | | } |
|---|
| | | }else{ |
|---|
| | | dto.setCarIds(new ArrayList<Long>()); |
|---|
| | | } |
|---|
| | | if (dto.getCarIds().isEmpty()){ |
|---|
| | | List<Long> carIds = dto.getCarIds(); |
|---|
| | | carIds.add(-1L); |
|---|
| | | dto.setCarIds(carIds); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | PageInfo<ChargingOrderListVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize()); |
|---|
| | | List<ChargingOrderListVO> list = this.baseMapper.chargingList(pageInfo,dto,startTime1,startTime2,endTime1,endTime2); |
|---|
| | | for (ChargingOrderListVO chargingOrderListVO : list) { |
|---|
| | |
|---|
| | | // 获取开始SOC 结束soc |
|---|
| | | if (chargingOrderListVO.getCode()!=null){ |
|---|
| | | List<UploadRealTimeMonitoringData> data6 = uploadRealTimeMonitoringDataClient.getDataByOrderCode(chargingOrderListVO.getCode()).getData(); |
|---|
| | | if (!data6.isEmpty()){ |
|---|
| | | if (data6!=null && !data6.isEmpty()){ |
|---|
| | | // 第一条数据soc为开始 最后一条数据soc为结束soc |
|---|
| | | chargingOrderListVO.setStartSoc(data6.get(0).getSoc().toString()); |
|---|
| | | chargingOrderListVO.setEndSoc(data6.get(data6.size()-1).getSoc().toString()); |
|---|
| | |
|---|
| | | public List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto) { |
|---|
| | | return this.baseMapper.usersByQuery(statisticsQueryDto); |
|---|
| | | } |
|---|
| | | @Override |
|---|
| | | public List<Map<String, Object>> usersByQuery1(ChargingStatisticsQueryDto statisticsQueryDto) { |
|---|
| | | return this.baseMapper.usersByQuery(statisticsQueryDto); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public List<Map<String, Object>> getUserTagCount() { |
|---|
