diff --git a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/statement/dto/StatementParamsDto.java b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/statement/dto/StatementParamsDto.java index 9d5332d..bfb956d 100644 --- a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/statement/dto/StatementParamsDto.java +++ b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/statement/dto/StatementParamsDto.java @@ -1,12 +1,12 @@ /* * Copyright [2025] [JinBooks of copyright http://www.jinbooks.com] - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -14,7 +14,7 @@ * limitations under the License. * */ - + package com.jinbooks.entity.statement.dto; @@ -26,8 +26,11 @@ import com.jinbooks.util.DateUtils; import lombok.*; import org.apache.commons.lang3.StringUtils; +import java.io.Serial; +import java.time.LocalDate; import java.time.YearMonth; import java.time.format.DateTimeFormatter; +import java.time.temporal.TemporalAdjusters; import java.util.ArrayList; import java.util.List; @@ -45,12 +48,13 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor public class StatementParamsDto extends PageQuery { - + + /** + * + */ + @Serial + private static final long serialVersionUID = -3371902023167307161L; /** - * - */ - private static final long serialVersionUID = -3371902023167307161L; - /** * 账套ID */ private String bookId; @@ -102,7 +106,7 @@ public class StatementParamsDto extends PageQuery { * 显示所有科目 */ private Boolean showAll; - + /** * 科目编码过滤 */ @@ -123,13 +127,28 @@ public class StatementParamsDto extends PageQuery { this.year = Integer.parseInt(reportDate.substring(0, 4)); this.month = null; this.quarter = null; - // 设置全年起始和结束日期 - this.dateRange = new String[]{this.year + "-01",this.year + "-12"}; - //年初日期 - this.dateRangeStart = year + "-01-01"; - //年终日期 - this.dateRangeEnd = year + "-12-31"; - this.reportDate = this.year + "-12"; + // 年初日期固定 + this.dateRangeStart = this.year + "-01-01"; + // 当前系统日期 + LocalDate now = LocalDate.now(); + int currentYear = now.getYear(); + if (this.year == currentYear) { + // 当前是本年度，终止为本月最后一天 + int currentMonth = now.getMonthValue(); + LocalDate lastDayOfCurrentMonth = now.with(TemporalAdjusters.lastDayOfMonth()); + // 设置 dateRange 为 01 到当前月 + this.dateRange = new String[]{ + String.format("%d-01", this.year), + String.format("%d-%02d", this.year, currentMonth) + }; + this.dateRangeEnd = lastDayOfCurrentMonth.toString(); + this.reportDate = String.format("%d-%02d", this.year, currentMonth); + } else { + // 非本年度，默认整年 + this.dateRange = new String[]{this.year + "-01", this.year + "-12"}; + this.dateRangeEnd = this.year + "-12-31"; + this.reportDate = this.year + "-12"; + } } else if (StatementPeriodTypeEnum.MONTH.getValue().equals(this.periodType)) { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM"); var date = java.time.YearMonth.parse(reportDate, formatter); @@ -161,8 +180,8 @@ public class StatementParamsDto extends PageQuery { this.month = null; if (this.quarter == 1) { - //报告年月 - this.reportDate = this.year + "-03"; + //报告年月 + this.reportDate = this.year + "-03"; //季初日期 this.dateRangeStart = this.year + "-01-01"; //季末日期 @@ -170,8 +189,8 @@ public class StatementParamsDto extends PageQuery { //月份范围 this.dateRange = new String[]{this.year + "-01", this.year + "-03"}; } else if (this.quarter == 2) { - //报告年月 - this.reportDate = this.year + "-06"; + //报告年月 + this.reportDate = this.year + "-06"; //季初日期 this.dateRangeStart = this.year + "-04-01"; //季末日期 @@ -179,8 +198,8 @@ public class StatementParamsDto extends PageQuery { //月份范围 this.dateRange = new String[]{this.year + "-04", this.year + "-06"}; } else if (this.quarter == 3) { - //报告年月 - this.reportDate = this.year + "-09"; + //报告年月 + this.reportDate = this.year + "-09"; //季初日期 this.dateRangeStart = this.year + "-07-01"; //季末日期 @@ -188,8 +207,8 @@ public class StatementParamsDto extends PageQuery { //月份范围 this.dateRange = new String[]{this.year + "-07", this.year + "-09"}; } else if (this.quarter == 4) { - //报告年月 - this.reportDate = this.year + "-12"; + //报告年月 + this.reportDate = this.year + "-12"; //季初日期 this.dateRangeStart = this.year + "-10-01"; //季末日期 @@ -200,17 +219,17 @@ public class StatementParamsDto extends PageQuery { this.year = Integer.parseInt(reportDate.substring(0, 4)); this.half = parseHalfYear(reportDate.substring(5, 7)); if (this.half == 1) { - //报告年月 - this.reportDate = this.year + "-06"; - //起始-终结日期 + //报告年月 + this.reportDate = this.year + "-06"; + //起始-终结日期 this.dateRangeStart = this.year + "-01-01"; this.dateRangeEnd = this.year + "-06-30"; //月份范围 this.dateRange = new String[]{this.year + "-01", this.year + "-06"}; } else if (this.half == 2) { - //报告年月 - this.reportDate = this.year + "-12"; - //起始-终结日期 + //报告年月 + this.reportDate = this.year + "-12"; + //起始-终结日期 this.dateRangeStart = this.year + "-07-01"; this.dateRangeEnd = this.year + "-12-31"; //月份范围 @@ -248,13 +267,20 @@ public class StatementParamsDto extends PageQuery { * 获取时间范围中的所有月份 */ public List getAllMonths() { + return getAllMonths(null); + } + + public List getAllMonths(String currentMonth) { List months = new ArrayList<>(); if (dateRange == null || dateRange.length != 2) { throw new IllegalArgumentException("dateRange must contain exactly two elements: start and end."); } YearMonth start = YearMonth.parse(dateRange[0]); - YearMonth end = YearMonth.parse(dateRange[1]); + YearMonth end = currentMonth == null ? YearMonth.parse(dateRange[1]) + : currentMonth.compareTo(dateRange[1]) > 0 + ? YearMonth.parse(dateRange[1]) + : YearMonth.parse(currentMonth); if (start.isAfter(end)) { throw new IllegalArgumentException("Start date must be before or equal to end date."); @@ -269,6 +295,7 @@ public class StatementParamsDto extends PageQuery { return months; } + /** * 判断是否是季报所在月份 * @@ -278,9 +305,10 @@ public class StatementParamsDto extends PageQuery { this.parse(); return isQuarterReportMonth(this.dateRange[1]); } - + /** * 判断是否季末 + * * @param yyyy_MM 2025-03 2025-06 2025-09 2025-12 * @return boolean */ @@ -300,9 +328,10 @@ public class StatementParamsDto extends PageQuery { this.parse(); return isYearReportMonth(this.dateRange[1]); } - + /** * 判断是否12月 + * * @param yyyy_MM 2025-12 * @return boolean */ diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/mapper/StatementSubjectBalanceMapper.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/mapper/StatementSubjectBalanceMapper.java index cbd6fb2..30612c0 100644 --- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/mapper/StatementSubjectBalanceMapper.java +++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/mapper/StatementSubjectBalanceMapper.java @@ -1,12 +1,12 @@ /* * Copyright [2025] [JinBooks of copyright http://www.jinbooks.com] - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -14,16 +14,23 @@ * limitations under the License. * */ - + package com.jinbooks.persistence.mapper; import com.jinbooks.entity.statement.StatementSubjectBalance; +import com.jinbooks.entity.statement.dto.StatementParamsDto; import com.jinbooks.mapper.BaseMapperPlus; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import java.util.List; + @Mapper public interface StatementSubjectBalanceMapper extends BaseMapperPlus { + List groupCodeSubjectBalance(@Param("dto") StatementParamsDto dto, + @Param("allMonths") List allMonths, + @Param("minPeriod") String minPeriod, + @Param("maxPeriod") String maxPeriod); } diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/StatementBalanceSheetService.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/StatementBalanceSheetService.java index cf9de44..d48e5ab 100644 --- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/StatementBalanceSheetService.java +++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/StatementBalanceSheetService.java @@ -60,7 +60,7 @@ public interface StatementBalanceSheetService { void updateRuleBalance(StatementSubjectBalance subjectBalance, StatementRules statementRules); void refreshItemsBalance(List items, - String bookId, String yearPeriod); + String bookId, String yearPeriod, int updateParams); StatementBalanceSheetItemListVo insertSubtotals(List items); diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementBalanceSheetConfigServiceImpl.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementBalanceSheetConfigServiceImpl.java index e149a2b..3d155b8 100644 --- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementBalanceSheetConfigServiceImpl.java +++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementBalanceSheetConfigServiceImpl.java @@ -105,7 +105,7 @@ public class StatementBalanceSheetConfigServiceImpl implements StatementBalanceS lqw.eq(StatementBalanceSheetItem::getBookId, bookId); lqw.eq(StatementBalanceSheetItem::getBalanceSheetId, ConstsSysConfig.SYS_CONFIG_TEMPLATE_ID); List balanceSheets = statementBalanceSheetItemMapper.selectList(lqw); - statementBalanceSheetService.refreshItemsBalance(balanceSheets, bookId, configSysService.getCurrentTerm(bookId)); + statementBalanceSheetService.refreshItemsBalance(balanceSheets, bookId, configSysService.getCurrentTerm(bookId), 3); StatementBalanceSheetItemListVo itemListVo = statementBalanceSheetService.insertSubtotals(balanceSheets); itemListVo.getAssets().sort(Comparator.comparing(StatementBalanceSheetItem::getItemCode)); itemListVo.getLiability().sort(Comparator.comparing(StatementBalanceSheetItem::getItemCode)); diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementBalanceSheetServiceImpl.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementBalanceSheetServiceImpl.java index 5228935..ac523f3 100644 --- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementBalanceSheetServiceImpl.java +++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementBalanceSheetServiceImpl.java @@ -1,12 +1,12 @@ /* * Copyright [2025] [JinBooks of copyright http://www.jinbooks.com] - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -14,7 +14,7 @@ * limitations under the License. * */ - + package com.jinbooks.persistence.service.impl; @@ -91,7 +91,7 @@ public class StatementBalanceSheetServiceImpl implements StatementBalanceSheetSe StatementBalanceSheet balanceSheet = balanceSheetMapper.selectOne(lqw); String currentTerm = configSysService.getCurrentTerm(dto.getBookId()); - List allMonths = dto.getAllMonths(); + List allMonths = dto.getAllMonths(currentTerm); List items; // 查询范围包含了当前期,或者没数据，则实时统计 boolean isNull = balanceSheet == null; @@ -126,12 +126,15 @@ public class StatementBalanceSheetServiceImpl implements StatementBalanceSheetSe //balanceSheetMapper.insert(balanceSheet); } - // 遍历月份，统计总金额 - for (String month : allMonths) { - refreshItemsBalance(items, dto.getBookId(), month); + // 统计总金额,因为是期末和年初，则只需要统计第一个月和最后一个月的数额 + if (allMonths.size() == 1) { + refreshItemsBalance(items, dto.getBookId(), allMonths.get(0), 3); + } else { + refreshItemsBalance(items, dto.getBookId(), allMonths.get(0), 1); + refreshItemsBalance(items, dto.getBookId(), allMonths.get(allMonths.size() - 1), 2); } } - }else {// 拉取历史数据 + } else {// 拉取历史数据 // 查询条目 LambdaQueryWrapper itemLqw = Wrappers.lambdaQuery(); itemLqw.eq(StatementBalanceSheetItem::getBookId, dto.getBookId()); @@ -363,17 +366,18 @@ public class StatementBalanceSheetServiceImpl implements StatementBalanceSheetSe return true; } - + /** * 刷新信息项对应的余额数据 * - * @param items 信息项组 - * @param bookId 所属账簿 - * @param yearPeriod 账期 + * @param items 信息项组 + * @param bookId 所属账簿 + * @param yearPeriod 账期 + * @param updateParams 需要更新的金额项：1：年初，2：期末，3：同时 */ @Override public void refreshItemsBalance(List items, - String bookId, String yearPeriod) { + String bookId, String yearPeriod, int updateParams) { // 方便更新参数 Map mapSheet = items.stream() .collect(Collectors.toMap(StatementBalanceSheetItem::getItemCode, item -> item)); @@ -383,7 +387,9 @@ public class StatementBalanceSheetServiceImpl implements StatementBalanceSheetSe lqwRule.in(StatementRules::getItemCode, itemCodes); lqwRule.eq(StatementRules::getBookId, bookId); lqwRule.eq(StatementRules::getType, StatementTypeEnum.balance_sheet.name()); + // 相关的所有规则 List rules = rulesMapper.selectList(lqwRule); + // 所有规则下的绑定科目编号 List subjectCodes = rules.stream().map(StatementRules::getSubjectCode).toList(); if (CollectionUtils.isNotEmpty(subjectCodes)) { // 查询科目余额 @@ -400,11 +406,19 @@ public class StatementBalanceSheetServiceImpl implements StatementBalanceSheetSe updateRuleBalance(subjectBalance, statementRules); StatementBalanceSheetItem balanceSheet = mapSheet.get(statementRules.getItemCode()); if (StatementSymbolEnum.PLUS.getValue().equals(statementRules.getSymbol())) { - balanceSheet.setInitialBalance(balanceSheet.getInitialBalance().add(statementRules.getOpeningYearBalance())); - balanceSheet.setCurrentBalance(balanceSheet.getCurrentBalance().add(statementRules.getClosingBalance())); + if (updateParams == 1 || updateParams == 3) { + balanceSheet.setInitialBalance(balanceSheet.getInitialBalance().add(statementRules.getOpeningYearBalance())); + } + if (updateParams == 2 || updateParams == 3) { + balanceSheet.setCurrentBalance(balanceSheet.getCurrentBalance().add(statementRules.getClosingBalance())); + } } else { - balanceSheet.setInitialBalance(balanceSheet.getInitialBalance().subtract(statementRules.getOpeningYearBalance())); - balanceSheet.setCurrentBalance(balanceSheet.getCurrentBalance().subtract(statementRules.getClosingBalance())); + if (updateParams == 1 || updateParams == 3) { + balanceSheet.setInitialBalance(balanceSheet.getInitialBalance().subtract(statementRules.getOpeningYearBalance())); + } + if (updateParams == 2 || updateParams == 3) { + balanceSheet.setCurrentBalance(balanceSheet.getCurrentBalance().subtract(statementRules.getClosingBalance())); + } } } } @@ -545,7 +559,7 @@ public class StatementBalanceSheetServiceImpl implements StatementBalanceSheetSe initialSum = initialSum.add( child.getInitialBalance() != null ? child.getInitialBalance() : BigDecimal.ZERO ); - } else if (StatementSymbolEnum.MINUS.getValue().equals(child.getSymbol())){ + } else if (StatementSymbolEnum.MINUS.getValue().equals(child.getSymbol())) { currentSum = currentSum.subtract( child.getCurrentBalance() != null ? child.getCurrentBalance() : BigDecimal.ZERO ); @@ -562,14 +576,21 @@ public class StatementBalanceSheetServiceImpl implements StatementBalanceSheetSe @Override public void updateRuleBalance(StatementSubjectBalance subjectBalance, StatementRules statementRules) { - if (subjectBalance != null) { - statementRules.setOpeningYearBalance(subjectBalance.getOpeningYearBalanceDebit() - .subtract(subjectBalance.getOpeningYearBalanceCredit())); - statementRules.setClosingBalance(subjectBalance.getBalance()); - } else { + if (statementRules != null && statementRules.getOpeningYearBalance() == null) { statementRules.setOpeningYearBalance(BigDecimal.ZERO); + } + if (statementRules != null && statementRules.getClosingBalance() == null) { statementRules.setClosingBalance(BigDecimal.ZERO); } + + if (subjectBalance != null && statementRules != null) { + statementRules.setOpeningYearBalance( + statementRules.getOpeningYearBalance().add( + subjectBalance.getOpeningYearBalanceDebit() + .subtract(subjectBalance.getOpeningYearBalanceCredit())) + ); + statementRules.setClosingBalance(statementRules.getClosingBalance().add(subjectBalance.getBalance())); + } } - + } diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementReportServiceImpl.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementReportServiceImpl.java index 0893767..72755ed 100644 --- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementReportServiceImpl.java +++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementReportServiceImpl.java @@ -360,52 +360,59 @@ public class StatementReportServiceImpl implements StatementReportService { @Override public Message> subjectBalance(StatementParamsDto dto) { dto.parse(); - List allMonths = dto.getAllMonths(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.in(StatementSubjectBalance::getYearPeriod, allMonths); - lqw.eq(StatementSubjectBalance::getBookId, dto.getBookId()); - lqw.eq(!dto.getShowAll(), StatementSubjectBalance::getIsVoucher, YesNoEnum.y.name()); - List res = subjectBalanceMapper.selectList(lqw); + String currentTerm = configSysService.selectConfigByKey(dto.getBookId(), ConstsSysConfig.SYS_PAYMENT_TERM_CURRENT); + List allMonths = dto.getAllMonths(currentTerm); - // 拉取父级数据 - List subjectIds = new ArrayList<>(res.stream().map(StatementSubjectBalance::getSourceId).toList()); - List parentIds = res.stream().filter(item -> item.getIsAuxiliary().equals(YesNoEnum.y.name())) - .map(StatementSubjectBalance::getParentId).toList(); - subjectIds.addAll(parentIds); - if (!subjectIds.isEmpty()) { - LambdaQueryWrapper lqwSubject = Wrappers.lambdaQuery(); - lqwSubject.eq(BookSubject::getBookId, dto.getBookId()); - List bookSubjects = bookSubjectMapper.selectList(lqwSubject); - // 找出所有父级 - List subjectPaths = new ArrayList<>(); - bookSubjects.forEach(bookSubject -> { - for (String subjectId : subjectIds) { - if (bookSubject.getIdPath().contains(subjectId)) { - subjectPaths.addAll(List.of(bookSubject.getIdPath().split("/"))); - } - } - }); - // 创建父级 - List balanceList = bookSubjects.stream() - .filter(bookSubject -> subjectPaths.contains(bookSubject.getId())) - .map(subject -> subjectBalanceService.create(subject, dto.getReportDate())) - .toList(); - // 合并 - Set existingSourceIds = res.stream().map(StatementSubjectBalance::getSourceId).collect(Collectors.toSet()); - for (StatementSubjectBalance item : balanceList) { - if (!existingSourceIds.contains(item.getSourceId())) { - res.add(item); - } - } + List res = null; + if (allMonths.size() > 1) { + res = subjectBalanceMapper.groupCodeSubjectBalance(dto, allMonths,allMonths.get(0), allMonths.get(allMonths.size() - 1)); + } else { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.in(StatementSubjectBalance::getYearPeriod, allMonths); + lqw.eq(StatementSubjectBalance::getBookId, dto.getBookId()); + lqw.eq(!dto.getShowAll(), StatementSubjectBalance::getIsVoucher, YesNoEnum.y.name()); + res = subjectBalanceMapper.selectList(lqw); } + +// // 拉取父级数据 +// List subjectIds = new ArrayList<>(res.stream().map(StatementSubjectBalance::getSourceId).toList()); +// List parentIds = res.stream().filter(item -> item.getIsAuxiliary().equals(YesNoEnum.y.name())) +// .map(StatementSubjectBalance::getParentId).toList(); +// subjectIds.addAll(parentIds); +// if (!subjectIds.isEmpty()) { +// LambdaQueryWrapper lqwSubject = Wrappers.lambdaQuery(); +// lqwSubject.eq(BookSubject::getBookId, dto.getBookId()); +// List bookSubjects = bookSubjectMapper.selectList(lqwSubject); +// // 找出所有父级 +// Set subjectPaths = new HashSet<>(); +// bookSubjects.forEach(bookSubject -> { +// for (String subjectId : subjectIds) { +// if (bookSubject.getIdPath().contains(subjectId)) { +// subjectPaths.addAll(List.of(bookSubject.getIdPath().split("/"))); +// } +// } +// }); +// // 创建父级 +// List balanceList = bookSubjects.stream() +// .filter(bookSubject -> subjectPaths.contains(bookSubject.getId())) +// .map(subject -> subjectBalanceService.create(subject, dto.getReportDate())) +// .toList(); +// // 合并 +// Set existingSourceIds = res.stream().map(StatementSubjectBalance::getSourceId).collect(Collectors.toSet()); +// for (StatementSubjectBalance item : balanceList) { +// if (!existingSourceIds.contains(item.getSourceId())) { +// res.add(item); +// } +// } +// } // counterBalance(res); // 按照科目编号升序排列 res.sort(Comparator.comparing(StatementSubjectBalance::getSubjectCode)); - if (!dto.getShowAux()) { - res = res.stream().filter(item -> item.getIsAuxiliary().equals(YesNoEnum.n.name())).toList(); - } +// if (!dto.getShowAux()) { +// res = res.stream().filter(item -> item.getIsAuxiliary().equals(YesNoEnum.n.name())).toList(); +// } return new Message<>(res); } diff --git a/jinbooks/jinbooks-persistence/src/main/resources/com/jinbooks/persistence/mapper/xml/mysql/StatementSubjectBalanceMapper.xml b/jinbooks/jinbooks-persistence/src/main/resources/com/jinbooks/persistence/mapper/xml/mysql/StatementSubjectBalanceMapper.xml new file mode 100644 index 0000000..cb59f7d --- /dev/null +++ b/jinbooks/jinbooks-persistence/src/main/resources/com/jinbooks/persistence/mapper/xml/mysql/StatementSubjectBalanceMapper.xml @@ -0,0 +1,54 @@ + + + + + + + diff --git a/jinbooks/jinbooks-web/src/main/resources/log4j2.xml b/jinbooks/jinbooks-web/src/main/resources/log4j2.xml index c0601da..bd5d495 100644 --- a/jinbooks/jinbooks-web/src/main/resources/log4j2.xml +++ b/jinbooks/jinbooks-web/src/main/resources/log4j2.xml @@ -1,16 +1,19 @@ - + - - + + + - - + - - - + @@ -21,40 +24,50 @@ - + - - + + + - - - - - - - + + - - - + + + + + + + + - - + + + + - - - - - - - + + + + + + + + + + + + + + - - + +