From 434088b7d4ee12c1206cfb194da2b600f4815f94 Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期二, 15 八月 2023 18:27:37 +0800 Subject: [PATCH] broker 卡车公司端 --- src/main/java/com/stylefeng/guns/modular/system/controller/TPowerUnitController.java | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/stylefeng/guns/modular/system/controller/TPowerUnitController.java b/src/main/java/com/stylefeng/guns/modular/system/controller/TPowerUnitController.java index b7d5977..d3c4147 100644 --- a/src/main/java/com/stylefeng/guns/modular/system/controller/TPowerUnitController.java +++ b/src/main/java/com/stylefeng/guns/modular/system/controller/TPowerUnitController.java @@ -16,6 +16,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import jodd.madvoc.meta.In; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -50,13 +51,15 @@ @ApiImplicitParam(name = "status", value = "status", required = false, dataType = "String",paramType = "query"), @ApiImplicitParam(name = "pageNumber", value = "pageNumber", required = true, dataType = "int",paramType = "query"), @ApiImplicitParam(name = "pageSize", value = "pageSize", required = true, dataType = "int",paramType = "query"), + @ApiImplicitParam(name = "companyId", value = "companyId", required = true, dataType = "int",paramType = "query"), }) @GetMapping(value = "/list") @ResponseBody - public Object list(String makeModel,Integer powerUnitNumber,String ownership, String status ,int pageNumber,int pageSize) { + public Object list(String makeModel,Integer powerUnitNumber,String ownership, String status ,int pageNumber,int pageSize,Integer companyId) { Page<TPowerUnits> tPowerUnitsPage = new Page<>(pageNumber, pageSize); EntityWrapper<TPowerUnits> tPowerUnitsEntityWrapper = new EntityWrapper<>(); tPowerUnitsEntityWrapper.eq("type",1); + tPowerUnitsEntityWrapper.eq("company_id",companyId); if(ToolUtil.isNotEmpty(status)){ tPowerUnitsEntityWrapper.eq("status",status); } @@ -95,13 +98,15 @@ @ApiImplicitParam(name = "status", value = "status", required = false, dataType = "String",paramType = "query"), @ApiImplicitParam(name = "pageNumber", value = "pageNumber", required = true, dataType = "int",paramType = "query"), @ApiImplicitParam(name = "pageSize", value = "pageSize", required = true, dataType = "int",paramType = "query"), + @ApiImplicitParam(name = "companyId", value = "companyId", required = true, dataType = "int",paramType = "query"), }) @GetMapping(value = "/listChassises") @ResponseBody - public Object listChassises(String makeModel,String vehicleIdNumber,String ownership, String status ,int pageNumber,int pageSize) { + public Object listChassises(String makeModel, String vehicleIdNumber, String ownership, String status , int pageNumber, int pageSize, Integer companyId) { Page<TPowerUnits> tPowerUnitsPage = new Page<>(pageNumber, pageSize); EntityWrapper<TPowerUnits> tPowerUnitsEntityWrapper = new EntityWrapper<>(); tPowerUnitsEntityWrapper.eq("type",2); + tPowerUnitsEntityWrapper.eq("company_id",companyId); if(ToolUtil.isNotEmpty(status)){ tPowerUnitsEntityWrapper.eq("status",status); } -- Gitblit v1.7.1