From 271cf160d3b1cf2fa8b46a0eee76bbf8466350be Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Sat, 14 Jun 2025 20:42:33 +0800
Subject: [PATCH] yearPeriod

---
 .../jinbooks/entity/book/vo/SettlementCarryforwardVo.java | 2 +-
 .../entity/voucher/dto/VoucherTemplatePageDto.java        | 4 ++++
 .../service/impl/SettlementCarryServiceImpl.java          | 1 +
 .../mapper/xml/mysql/SettlementCarryforwardMapper.xml     | 8 ++++----
 .../web/book/controller/SettlementCarryController.java    | 1 +
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/book/vo/SettlementCarryforwardVo.java b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/book/vo/SettlementCarryforwardVo.java
index fb975cc..a176c1e 100644
--- a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/book/vo/SettlementCarryforwardVo.java
+++ b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/book/vo/SettlementCarryforwardVo.java
@@ -32,5 +32,5 @@ public class SettlementCarryforwardVo extends VoucherTemplate{
 
 	String voucherId;
 	
-	Integer yearPeriod;
+	
 }
diff --git a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/voucher/dto/VoucherTemplatePageDto.java b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/voucher/dto/VoucherTemplatePageDto.java
index 72962be..08d9227 100644
--- a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/voucher/dto/VoucherTemplatePageDto.java
+++ b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/voucher/dto/VoucherTemplatePageDto.java
@@ -51,5 +51,9 @@ public class VoucherTemplatePageDto extends PageQuery {
     String name;
     
     int category;
+    
+    String yearPeriod;
+    
+    String bookId;
 
 }
diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/SettlementCarryServiceImpl.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/SettlementCarryServiceImpl.java
index bbc0ef0..6639245 100644
--- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/SettlementCarryServiceImpl.java
+++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/SettlementCarryServiceImpl.java
@@ -96,6 +96,7 @@ public class SettlementCarryServiceImpl extends ServiceImpl<SettlementMapper, Se
 
     public Message<Page<SettlementCarryforwardVo>> fetchCarry(VoucherTemplatePageDto dto) {
         dto.setCategory(1);//期末处理模板
+        dto.setYearPeriod(configSysService.getCurrentTerm(dto.getBookId()));
         Page<SettlementCarryforwardVo> page = settlementCarryforwardMapper.pageList(dto.build(), dto);
         if (page.getTotal() <= 0) {
             Book book = bookMapper.selectById(dto.getRelatedId());
diff --git a/jinbooks/jinbooks-persistence/src/main/resources/com/jinbooks/persistence/mapper/xml/mysql/SettlementCarryforwardMapper.xml b/jinbooks/jinbooks-persistence/src/main/resources/com/jinbooks/persistence/mapper/xml/mysql/SettlementCarryforwardMapper.xml
index cb20e49..8227a67 100644
--- a/jinbooks/jinbooks-persistence/src/main/resources/com/jinbooks/persistence/mapper/xml/mysql/SettlementCarryforwardMapper.xml
+++ b/jinbooks/jinbooks-persistence/src/main/resources/com/jinbooks/persistence/mapper/xml/mysql/SettlementCarryforwardMapper.xml
@@ -6,10 +6,10 @@
         select jvt.*,jsc.voucher_id
         from jbx_voucher_template jvt
         left join jbx_settlement_carryforward jsc
-        on jvt.id = jsc.voucher_template_id and jsc.deleted = 'n'
-        <if test="dto.yearPeriod != null ">
-            and jsc.year_period = #{dto.yearPeriod}
-        </if>
+        on jvt.id = jsc.voucher_template_id 
+          and jsc.year_period = #{dto.yearPeriod}
+          and jsc.book_id = #{dto.bookId}
+          and jsc.deleted = 'n'
         where jvt.deleted = 'n'
         <if test="dto.relatedId != null and dto.relatedId != ''">
             and jvt.related_Id = #{dto.relatedId}
diff --git a/jinbooks/jinbooks-web/src/main/java/com/jinbooks/web/book/controller/SettlementCarryController.java b/jinbooks/jinbooks-web/src/main/java/com/jinbooks/web/book/controller/SettlementCarryController.java
index a724613..6cb3088 100644
--- a/jinbooks/jinbooks-web/src/main/java/com/jinbooks/web/book/controller/SettlementCarryController.java
+++ b/jinbooks/jinbooks-web/src/main/java/com/jinbooks/web/book/controller/SettlementCarryController.java
@@ -52,6 +52,7 @@ public class SettlementCarryController {
     public Message<Page<SettlementCarryforwardVo>> fetchCarry(@ParameterObject VoucherTemplatePageDto dto,@CurrentUser UserInfo userInfo) {
         logger.debug("fetch {}",dto);
         dto.setRelatedId(userInfo.getBookId());
+        dto.setBookId(userInfo.getBookId());
         return settlementCarryService.fetchCarry(dto);
     }