明星电力充电桩
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xuhy
2024-11-04 c0211a20f4f2d94fe1ac7657284504afa876b8a0 
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java


@@ -37,6 +37,7 @@


import java.math.BigDecimal;


import java.net.URLEncoder;


import java.time.LocalDate;


import java.time.LocalDateTime;


import java.time.format.DateTimeFormatter;


import java.util.ArrayList;


import java.util.HashMap;


@@ -151,6 +152,7 @@


    public R out(Long id) {


        TParkingRecord byId = parkingRecordService.getById(id);


        byId.setStatus(2);


        byId.setOutParkingTime(LocalDateTime.now());


        parkingRecordService.updateById(byId);


        return R.ok();




@@ -306,7 +308,7 @@


    @PostMapping(value = "/parking/work")


    @ApiOperation(value = "停车订单统计", tags = {"管理后台-工作台"})


    public R<TParkLotRecordCountVo> work(@RequestBody ParkingRecordQueryDto parkingRecordQueryDto){


        List<TParkingRecord> list = parkingRecordService.lambdaQuery().eq(parkingRecordQueryDto.getParkingLotId() != null, TParkingRecord::getParkingLotId, parkingRecordQueryDto.getParkingLotId())


        List<TParkingRecord> list = parkingRecordService.lambdaQuery().isNotNull(TParkingRecord::getOutParkingType).eq(parkingRecordQueryDto.getParkingLotId() != null, TParkingRecord::getParkingLotId, parkingRecordQueryDto.getParkingLotId())


                .ge(parkingRecordQueryDto.getStartTime()!=null,TParkingRecord::getCreateTime, parkingRecordQueryDto.getStartTime())


                .le(parkingRecordQueryDto.getEndTime()!=null,TParkingRecord::getCreateTime, parkingRecordQueryDto.getEndTime().plusDays(1)).list();


        int count1 = list.size();


@@ -335,7 +337,7 @@


    @PostMapping(value = "/parking/work1")


    @ApiOperation(value = "停车订单统计", tags = {"管理后台-工作台"})


    public R<TParkLotRecordCountVo> work1(@RequestBody ParkingRecordQueryDto parkingRecordQueryDto){


        List<TParkingRecord> list = parkingRecordService.lambdaQuery().eq(parkingRecordQueryDto.getParkingLotId() != null, TParkingRecord::getParkingLotId, parkingRecordQueryDto.getParkingLotId()).list();


        List<TParkingRecord> list = parkingRecordService.lambdaQuery().isNotNull(TParkingRecord::getOutParkingType).eq(parkingRecordQueryDto.getParkingLotId() != null, TParkingRecord::getParkingLotId, parkingRecordQueryDto.getParkingLotId()).list();


        int count1 = list.size();


        //统计出list中chargingOrderId为null的数据个数


        int count2 = list.stream().filter(item -> item.getChargingOrderId() != null).collect(Collectors.toList()).size();