From d9c2e19ad1e6061e3df2112c18ccad0908c7792c Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Tue, 21 Apr 2026 16:14:12 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0=E6=9F=A5=E8=AF=A2sq?=
 =?UTF-8?q?l?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java    | 5 +++++
 .../pile/service/impl/SettleOrderReportServiceImpl.java      | 1 +
 .../src/main/resources/mapper/pile/OrderBasicInfoMapper.xml  | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java
index d0aab7425..3440f025d 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java
@@ -100,6 +100,11 @@ public class QueryOrderDTO extends BaseEntity {
 	 */
 	private String endSettleTime;
 
+	/**
+	 * 审核标志
+	 */
+	private String reviewFlag;
+
 	/**
 	 * 会员组编号
  	 */
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
index 0e485d80a..e9f9039fc 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
@@ -676,6 +676,7 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
         dto.setEndSettleTime(endTime);
         // 2024年1月30日13点49分 查询订单列表只查对应当前运营商的
         dto.setMerchantId(stationInfo.getMerchantId());
+        dto.setReviewFlag(Constants.ONE);
         // 查询结算完成的订单
         List<OrderListVO> orderListVOS = orderBasicInfoMapper.selectOrderBasicInfoList(dto);
         // 收集订单编号
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
index f71f30b27..bf30a5194 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -2005,7 +2005,8 @@
         <if test="vinCode != null and vinCode != ''">
             and t1.vin_code = #{vinCode,jdbcType=VARCHAR}
         </if>
-        <if test="params != null and params.roleId != null and params.roleId > 2">
+        <if test="(params != null and params.roleId != null and params.roleId > 2)
+                 or (reviewFlag != null and reviewFlag != '')">
             and t1.review_flag = '1'
         </if>
         <if test="plateNumber != null and plateNumber != ''">