From 0fdb9acff4087681ca8b6af0ed19a0d1f9c19efd Mon Sep 17 00:00:00 2001
From: weicw <weicw@websoft.top>
Date: Sat, 31 Oct 2026 08:35:18 +0800
Subject: [PATCH] =?UTF-8?q?test:=20=E6=98=8E=E7=BB=86=E5=AF=BC=E5=87=BA=20?=
 =?UTF-8?q?ENUM=20=E6=96=AD=E8=A8=80=E9=9A=8F=E5=AE=9E=E7=8E=B0=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E4=B8=AD=E6=96=87=EF=BC=9B=E5=8E=86=E5=8F=B2=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=A3=E5=BE=84=E5=9B=9E=E5=88=B0=20ADR=200012=20?=
 =?UTF-8?q?=E7=9A=84=E3=80=8C=E5=90=8C=E6=9D=A1=E4=BB=B6=E3=80=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../approval/doc/facility/FacilityPriceQueryService.java  | 6 ++----
 .../approval/mapper/ApprovalFacilityPriceMapper.java      | 1 -
 .../approval/mapper/xml/ApprovalFacilityPriceMapper.xml   | 8 +++-----
 .../java/com/gxwebsoft/approval/ApprovalVehicleIT.java    | 5 +++--
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/approval/doc/facility/FacilityPriceQueryService.java b/src/main/java/com/gxwebsoft/approval/doc/facility/FacilityPriceQueryService.java
index 06f069b..8fea5df 100644
--- a/src/main/java/com/gxwebsoft/approval/doc/facility/FacilityPriceQueryService.java
+++ b/src/main/java/com/gxwebsoft/approval/doc/facility/FacilityPriceQueryService.java
@@ -53,9 +53,8 @@ public class FacilityPriceQueryService implements ApprovalPriceProvider {
     if (tenantId == null) {
       return null;
     }
-    // 当前生效版本：只看到期已生效的版本
     List<FacilityPriceVersionRow> rows = priceMapper.selectArchivedVersions(
-      tenantId, false, LocalDate.now(), 0, 1);
+      tenantId, LocalDate.now(), 0, 1);
     return rows.isEmpty() ? null : toVersion(tenantId, rows.get(0));
   }
 
@@ -77,9 +76,8 @@ public class FacilityPriceQueryService implements ApprovalPriceProvider {
     }
     int size = limit <= 0 ? DEFAULT_HISTORY_LIMIT : limit;
     int pageNo = page <= 0 ? 1 : page;
-    // 历史版本：包含未来生效的已归档版本（#58 验收要求历史可查）
     List<FacilityPriceVersionRow> rows = priceMapper.selectArchivedVersions(
-      tenantId, true, LocalDate.now(), (pageNo - 1) * size, size);
+      tenantId, LocalDate.now(), (pageNo - 1) * size, size);
     List<ApprovalPriceVersion> versions = new ArrayList<>(rows.size());
     for (FacilityPriceVersionRow row : rows) {
       ApprovalPriceVersion version = toVersion(tenantId, row);
diff --git a/src/main/java/com/gxwebsoft/approval/mapper/ApprovalFacilityPriceMapper.java b/src/main/java/com/gxwebsoft/approval/mapper/ApprovalFacilityPriceMapper.java
index 5a16887..2fd925b 100644
--- a/src/main/java/com/gxwebsoft/approval/mapper/ApprovalFacilityPriceMapper.java
+++ b/src/main/java/com/gxwebsoft/approval/mapper/ApprovalFacilityPriceMapper.java
@@ -25,7 +25,6 @@ public interface ApprovalFacilityPriceMapper {
    */
   @InterceptorIgnore(tenantLine = "true")
   List<FacilityPriceVersionRow> selectArchivedVersions(@Param("tenantId") Integer tenantId,
-                                                        @Param("includeFuture") boolean includeFuture,
                                                        @Param("today") LocalDate today,
                                                        @Param("offset") int offset,
                                                        @Param("limit") int limit);
diff --git a/src/main/java/com/gxwebsoft/approval/mapper/xml/ApprovalFacilityPriceMapper.xml b/src/main/java/com/gxwebsoft/approval/mapper/xml/ApprovalFacilityPriceMapper.xml
index 1a39721..2ff2a0b 100644
--- a/src/main/java/com/gxwebsoft/approval/mapper/xml/ApprovalFacilityPriceMapper.xml
+++ b/src/main/java/com/gxwebsoft/approval/mapper/xml/ApprovalFacilityPriceMapper.xml
@@ -3,9 +3,9 @@
 <mapper namespace="com.gxwebsoft.approval.mapper.ApprovalFacilityPriceMapper">
 
     <!--
-      已归档价格表版本，按生效日期倒序。
-      includeFuture=true 时包含「未来生效」的已归档版本（历史版本列表要看得到它们）；
-      当前生效版本只取 effective_date 不晚于今天的最新一版（ADR 0012）。
+      已归档且已生效的价格表版本，按生效日期倒序。
+      当前生效版本与历史版本是「同条件」（ADR 0012）：未来生效的版本归档后
+      尚未生效，既不成为当前版本，也不进历史列表。
     -->
     <select id="selectArchivedVersions" resultType="com.gxwebsoft.approval.doc.facility.FacilityPriceVersionRow">
         SELECT i.id              AS instance_id,
@@ -18,9 +18,7 @@
         WHERE i.tenant_id = #{tenantId}
           AND i.flow_code = 'facility'
           AND i.status = 'ARCHIVED'
-        <if test="!includeFuture">
           AND f.effective_date &lt;= #{today}
-        </if>
         ORDER BY f.effective_date DESC, i.archive_time DESC, i.id DESC
         <if test="limit >= 0">
             LIMIT #{limit} OFFSET #{offset}
diff --git a/src/test/java/com/gxwebsoft/approval/ApprovalVehicleIT.java b/src/test/java/com/gxwebsoft/approval/ApprovalVehicleIT.java
index b21a4f2..08b257b 100644
--- a/src/test/java/com/gxwebsoft/approval/ApprovalVehicleIT.java
+++ b/src/test/java/com/gxwebsoft/approval/ApprovalVehicleIT.java
@@ -412,11 +412,12 @@ class ApprovalVehicleIT {
       assertThat(cellText(first.getCell(7))).isEqualTo("是");
       assertThat(cellText(first.getCell(9))).isEqualTo("2026-01-01");
       assertThat(cellText(first.getCell(10))).isEqualTo("2026-06-30");
-      assertThat(cellText(first.getCell(12))).isEqualTo(OWNER_GROUP);
+      // 导出给人看：车辆归属输出中文文案而不是 8 类编码
+      assertThat(cellText(first.getCell(12))).isEqualTo("威宁集团公司员工车辆");
 
       Row second = sheet.getRow(2);
       assertThat(cellText(second.getCell(6))).isEqualTo("桂A10002");
-      assertThat(cellText(second.getCell(12))).isEqualTo(OWNER_CLUB);
+      assertThat(cellText(second.getCell(12))).isEqualTo("合作俱乐部员工车辆");
     }
   }