From 6b2e5d31727f264d9ea1e3af3e1f4db46b8a7d02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Mon, 28 Apr 2025 15:41:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E8=BD=A6=E9=9C=80=E6=B1=82=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/VehicleDemandController.java | 9 +++++++-- .../tms/outbound/vehicledemand/entity/VehicleDemand.java | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/controller/VehicleDemandController.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/controller/VehicleDemandController.java index acc58d6..b45687b 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/controller/VehicleDemandController.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/controller/VehicleDemandController.java @@ -9,6 +9,7 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; @@ -74,8 +75,12 @@ public class VehicleDemandController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(vehicleDemand, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = vehicleDemandService.page(page, queryWrapper); +// Page page = new Page(pageNo, pageSize); + List list = vehicleDemandService.list(queryWrapper); + IPage pageList = new Page(1, list.size()); + pageList.setRecords(list) + .setTotal(list.size()); +// IPage pageList = vehicleDemandService.page(page, queryWrapper); return Result.OK(pageList); } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/entity/VehicleDemand.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/entity/VehicleDemand.java index 8fa5b65..4ec2aa3 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/entity/VehicleDemand.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/entity/VehicleDemand.java @@ -78,7 +78,7 @@ public class VehicleDemand implements Serializable { @ApiModelProperty(value = "总发货数量") private Integer totalShips; /**送货区域*/ - @Excel(name = "送货区域", width = 15) +// @Excel(name = "送货区域", width = 15) @ApiModelProperty(value = "送货区域") private String deliveryArea; /**送货地点*/