kongdeqiang
2023-07-27 e6682c9434f133a25660110e39a1f0f993267a65
提交更新
4个文件已修改
15 ■■■■■ 已修改文件
src/main/java/com/boying/controller/OrderRecordController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/boying/controller/TicketBlackController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/boying/controller/WhiteListController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/boying/controller/phone/TicketController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/boying/controller/OrderRecordController.java
@@ -53,7 +53,7 @@
        wrapper.lambda()
                .eq(OrderRecord::getType,orderRecord.getType())
                .eq(OrderRecord::getStatus,1)
                .eq(StringUtils.isNotBlank(orderRecord.getCarNo()),OrderRecord::getCarNo,orderRecord.getCarNo())
                .like(StringUtils.isNotBlank(orderRecord.getCarNo()),OrderRecord::getCarNo,orderRecord.getCarNo())
                .isNotNull(OrderRecord::getPayCode)
                .orderByDesc(OrderRecord::getCreateTime);
        Page page1 = orderRecordService.page(page, wrapper);
src/main/java/com/boying/controller/TicketBlackController.java
@@ -47,7 +47,7 @@
        QueryWrapper<TicketBlack> wrapper =  new QueryWrapper<>();
        wrapper.lambda()
                .eq(TicketBlack::getBlackType,0)
                .eq(StringUtils.isNotBlank(ticket.getCarNo()),TicketBlack::getCarNo,ticket.getCarNo())
                .like(StringUtils.isNotBlank(ticket.getCarNo()),TicketBlack::getCarNo,ticket.getCarNo())
                .eq(ticket.getIsActive() != null,TicketBlack::getIsActive,ticket.getIsActive())
                .orderByDesc(TicketBlack::getCreateTime);
        return R.ok(ticketBlackService.page(page, wrapper));
@@ -84,8 +84,11 @@
    @PostMapping("/delete")
    public Object delete(Long id){
        TicketBlack ticket =ticketBlackService.getById(id);
        ticketBlackService.saveOrUpdate(ticket);
        return R.ok("操作成功");
        if(ticket!=null){
            ticketBlackService.removeById(ticket);
            return R.ok("操作成功");
        }
        return R.failed("未找到该车");
    }
    @PostMapping("/updateById")
src/main/java/com/boying/controller/WhiteListController.java
@@ -27,7 +27,7 @@
        QueryWrapper<WhiteList> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .orderByDesc(WhiteList::getId)
                .eq(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo);
                .like(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo);
        Page<WhiteList> page1 = whiteListService.page(page, wrapper);
        for (WhiteList record : page1.getRecords()) {
            if(record.getParkId() != null){
src/main/java/com/boying/controller/phone/TicketController.java
@@ -77,7 +77,7 @@
    public Object findPage(Page page, Ticket ticket){
        QueryWrapper<Ticket> wrapper =  new QueryWrapper<>();
        wrapper.lambda()
                .eq(StringUtils.isNotBlank(ticket.getCarNo()),Ticket::getCarNo,ticket.getCarNo())
                .like(StringUtils.isNotBlank(ticket.getCarNo()),Ticket::getCarNo,ticket.getCarNo())
                .eq(ticket.getType() != null,Ticket::getType,ticket.getType())
                .eq(ticket.getViolationTypeId() != null,Ticket::getViolationTypeId,ticket.getViolationTypeId())
                .eq(ticket.getPayStatus() != null,Ticket::getPayStatus,ticket.getPayStatus())