fix ： 新增日统计接口

kongdeqiang

2024-11-12 552c700f584700316e8d1919dd1ad7f551c53ec4

 src/main/java/com/boying/controller/WhiteListController.java

@@ -13,9 +13,13 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;


@RestController
@RequestMapping("whiteList")
@RequestMapping("ffzf/whiteList")
@RequiredArgsConstructor
public class WhiteListController{

@@ -23,11 +27,12 @@
    private final ParkService parkService;

    @PostMapping("/findPage")
    //@Operation(summary = "分页查询" , description = "分页查询" )
    public Object findPage(Page page, String carNo) {
        QueryWrapper<WhiteList> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .orderByDesc(WhiteList::getId)
                .eq(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo);
                .like(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo)
                .orderByDesc(WhiteList::getId);
        Page<WhiteList> page1 = whiteListService.page(page, wrapper);
        for (WhiteList record : page1.getRecords()) {
            if(record.getParkId() != null){
@@ -38,14 +43,22 @@
    }

    @PostMapping("/findPageNew")
    public Object findPageNew(Page page, String carNo) {
    public Object findPageNew(Page page, String carNo,Integer type,String date) throws ParseException {
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        if(StringUtils.isNotBlank(date)){
            System.out.println(date);
            Date parse = sdf.parse(date);
            date = sdf.format(parse);
        }
        QueryWrapper<WhiteList> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .orderByDesc(WhiteList::getId)
                .eq(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo);
                .like(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo)
                .eq(type!=null,WhiteList::getType,type)
                .le(StringUtils.isNotBlank(date),WhiteList::getEndTime,date);
        Page<WhiteList> page1 = whiteListService.page(page, wrapper);
        for (WhiteList record : page1.getRecords()) {
            if(record.getParkIds() != null){
            if(StringUtils.isNotBlank(record.getParkIds())){
                String s = "";
                String parkIds = record.getParkIds();
                String[] split = parkIds.split(",");