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 408cfa2..fb975cc 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 @@ -31,4 +31,6 @@ public class SettlementCarryforwardVo extends VoucherTemplate{ private static final long serialVersionUID = 4969126049394752855L; String voucherId; + + Integer yearPeriod; } 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 17a4061..cb20e49 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 @@ -7,6 +7,9 @@ from jbx_voucher_template jvt left join jbx_settlement_carryforward jsc on jvt.id = jsc.voucher_template_id and jsc.deleted = 'n' + + and jsc.year_period = #{dto.yearPeriod} + where jvt.deleted = 'n' and jvt.related_Id = #{dto.relatedId}