From 97fb52cd257ed128f59706d1f6f649e80eb48320 Mon Sep 17 00:00:00 2001 From: Lemon Date: Tue, 17 Jun 2025 10:29:39 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E5=90=8E=E7=AE=A1=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=BD=A6=E7=89=8C=E5=8F=B7=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/impl/PileConnectorInfoServiceImpl.java | 4 ++-- .../src/main/resources/mapper/pile/OrderBasicInfoMapper.xml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java index 20e75b2f0..945554c51 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java @@ -456,14 +456,14 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService { Comparator.nullsLast(Comparator.naturalOrder())) // 处理可能的null值 ); - // 4. 手动分页(取出当前页的数据) + // 手动分页(取出当前页的数据) int fromIndex = (pageNum - 1) * pageSize; int toIndex = Math.min(fromIndex + pageSize, pileConnectorInfoList.size()); List pagedList = pileConnectorInfoList.subList(fromIndex, toIndex); // PageInfo pageInfo = new PageInfo<>(pileConnectorInfoList); - // 5. 构造 PageInfo(注意:PageInfo 需要总记录数) + // 构造 PageInfo(注意:PageInfo 需要总记录数) PageInfo pageInfo = new PageInfo<>(pagedList); pageInfo.setTotal(pileConnectorInfoList.size()); // 设置总记录数 pageInfo.setPageNum(pageNum); // 设置当前页码 diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index a60dc0f5f..ba473c02e 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -1828,6 +1828,9 @@ and t1.vin_code = #{vinCode,jdbcType=VARCHAR} + + and t1.plate_number = #{plateNumber,jdbcType=VARCHAR} + and t3.dept_id in