diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalarySummaryServiceImpl.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalarySummaryServiceImpl.java index 9e695ca..fa42078 100644 --- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalarySummaryServiceImpl.java +++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalarySummaryServiceImpl.java @@ -48,8 +48,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.time.YearMonth; import java.util.*; @@ -150,11 +148,9 @@ public class EmployeeSalarySummaryServiceImpl extends ServiceImpl rules = getSalaryVoucherRules(bookId, voucherType); BigDecimal debitAmount = BigDecimal.ZERO; @@ -163,7 +159,7 @@ public class EmployeeSalarySummaryServiceImpl extends ServiceImpl voucherItems = new ArrayList<>(); for (EmployeeSalaryVoucherRule rule : rules) { - rule.setSummary(generateVoucherItemSummary(rule.getSummary(), year, month)); + rule.setSummary(generateVoucherItemSummary(rule.getSummary(), currentTerm.getYear(), currentTerm.getMonthValue())); String selectedValue = rule.getSelectedValue(); SalaryVoucherTemplateEnum matchedEnum = SalaryVoucherTemplateEnum.fromValue(selectedValue); @@ -196,7 +192,7 @@ public class EmployeeSalarySummaryServiceImpl extends ServiceImpl