部门查询 车俩店铺bug修改

wl

2022-10-10 064a3b0b19604f6817705871af6343726c42feff

部门查询 车俩店铺bug修改

 ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java

@@ -1,6 +1,7 @@
package com.ycl.controller.depart;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.api.BasePageDTO;
import com.ycl.api.BasePageVO;
@@ -19,7 +20,6 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;

/**
@@ -64,9 +64,9 @@
    }

    /**
     * @return com.ycl.api.CommonResult<java.lang.Void>
     * @Description  batch deletion departments
     * @Param [ids]
     * @return com.ycl.api.CommonResult<java.lang.Void>
     **/
    @ApiOperation("批处理-删除")
    @PostMapping(value = "/batch_deletion")
@@ -111,5 +111,21 @@
        BasePageDTO basePageDTO= umsAdminDepartService.belongDepart(fetchOperator(request).getOperatorId(), params.getCurrent(), params.getPageSize());
        return CommonResult.success(basePageDTO);
    }

    @ApiOperation("查询顶级部门")
    @GetMapping(value = "/query_father")
    public CommonResult search() {
        Integer fatherId = 0;
        return CommonResult.success(departService
                .list(new LambdaQueryWrapper<UmsDepart>()
                        .eq(UmsDepart::getParentId, fatherId)));
}

    @ApiOperation("查询部门二级")
    @GetMapping(value = "/query_father_children")
    public CommonResult search(@RequestParam Integer fatherId) {
        return CommonResult.success(departService
                .list(new LambdaQueryWrapper<UmsDepart>()
                        .eq(UmsDepart::getParentId, fatherId)));
    }
}

 ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java

@@ -35,7 +35,7 @@

    @ApiOperation(value = "查询执法车")
    @GetMapping("/query_enforce")
    public CommonResult searchEnforceCar(@RequestParam String carNum,
    public CommonResult searchEnforceCar(@RequestParam(required = false) String carNum,
                                         @RequestParam Integer size,
                                         @RequestParam Integer current) {
        Page<CarEnforcecar> carEnforcecarPage = new Page<>();
@@ -48,7 +48,7 @@

    @ApiOperation(value = "查询渣土车")
    @GetMapping("/query_slag")
    public CommonResult searchSlagCar(@RequestParam String carNum,
    public CommonResult searchSlagCar(@RequestParam(required = false) String carNum,
                                      @RequestParam Integer size,
                                      @RequestParam Integer current) {
        Page<CarSlagcar> carSlagcarPage = new Page<>();

 ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java

@@ -84,7 +84,7 @@
    }

    @ApiOperation(value = "修改门店信息")
    @RequestMapping(value = "/update", method = RequestMethod.GET)
    @RequestMapping(value = "/update", method = RequestMethod.PUT)
    @ResponseBody
    public CommonResult update(@RequestBody StoreInfo storeInfo) {
        boolean success = storeInfoService.updateById(storeInfo);

 ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java

@@ -8,7 +8,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.*;


import java.io.Serializable;
import java.math.BigDecimal;

@@ -44,6 +43,11 @@
    @TableField("store_name")
    private String storeName;


    @ApiModelProperty("门店编码")
    @TableField("store_number")
    private String storeNumber;

    @ApiModelProperty("联系方式")
    @TableField("contact")
    private String contact;
@@ -63,6 +67,4 @@
    @ApiModelProperty("门店积分")
    @TableField("store_score")
    private BigDecimal storeScore;


}