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 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 rows = priceMapper.selectArchivedVersions( - tenantId, true, LocalDate.now(), (pageNo - 1) * size, size); + tenantId, LocalDate.now(), (pageNo - 1) * size, size); List 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 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 @@