Merge branch 'dev' into dev-g

jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java

@@ -102,4 +102,9 @@ public class QueryOrderDTO extends BaseEntity {
 	 * 车辆vin编号
 	 */
 	private String vinCode;
+
+	/**
+	 * 车牌号
+	 */
+	private String plateNumber;
 }

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<PileConnectorInfoVO> pagedList = pileConnectorInfoList.subList(fromIndex, toIndex);
 
         // PageInfo<PileConnectorInfoVO> pageInfo = new PageInfo<>(pileConnectorInfoList);
 
-        // 5. 构造 PageInfo（注意：PageInfo 需要总记录数）
+        // 构造 PageInfo（注意：PageInfo 需要总记录数）
         PageInfo<PileConnectorInfoVO> pageInfo = new PageInfo<>(pagedList);
         pageInfo.setTotal(pileConnectorInfoList.size());  // 设置总记录数
         pageInfo.setPageNum(pageNum);                     // 设置当前页码

jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml

@@ -1828,6 +1828,9 @@
         <if test="vinCode != null and vinCode != ''">
             and t1.vin_code = #{vinCode,jdbcType=VARCHAR}
         </if>
+        <if test="plateNumber != null and plateNumber != ''">
+            and t1.plate_number = #{plateNumber,jdbcType=VARCHAR}
+        </if>
         <if test="stationDeptIds != null and stationDeptIds.size() != 0">
             and t3.dept_id in
             <foreach close=")" collection="stationDeptIds" item="stationDeptId" open="(" separator=",">