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