From a2655d8b4c3e501a175c4988317fa4182b463db0 Mon Sep 17 00:00:00 2001 From: jinbooks_dev Date: Wed, 4 Jun 2025 11:32:09 +0800 Subject: [PATCH] Update FundDashboardServiceImpl.java --- .../views/dashboard/accounting/other_subjects.vue | 2 +- .../service/impl/FundDashboardServiceImpl.java | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/jinbooks-ui/src/views/dashboard/accounting/other_subjects.vue b/jinbooks-ui/src/views/dashboard/accounting/other_subjects.vue index b5bf921..148d5a5 100644 --- a/jinbooks-ui/src/views/dashboard/accounting/other_subjects.vue +++ b/jinbooks-ui/src/views/dashboard/accounting/other_subjects.vue @@ -186,7 +186,7 @@ const getList = () => { show: true, position: 'center', formatter: [ - '{title|总额合计}', + '{title|总额合计(万元)}', '{value|' + totalAmount.toLocaleString() + '}', ].join('\n'), rich: { diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/FundDashboardServiceImpl.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/FundDashboardServiceImpl.java index 30a8698..a6328a6 100644 --- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/FundDashboardServiceImpl.java +++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/FundDashboardServiceImpl.java @@ -193,7 +193,7 @@ public class FundDashboardServiceImpl implements FundDashboardService { */ @Override public List statisticsOtherSubjects(StatementParamsDto params) { - LambdaQueryWrapper lqw = buildQueryWrapper(params); + LambdaQueryWrapper lqw = buildYearQueryWrapper(params); lqw.orderByAsc(StatementSubjectBalance::getYearPeriod); if (params.getSubjectCodes() != null) { lqw.likeRight(!params.getSubjectCodes().isEmpty(), @@ -883,4 +883,14 @@ public class FundDashboardServiceImpl implements FundDashboardService { lqw.le(StatementSubjectBalance::getYearPeriod, params.getDateRange()[1]); return lqw; } + + private LambdaQueryWrapper buildYearQueryWrapper(StatementParamsDto params) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StatementSubjectBalance::getBookId, params.getBookId()); + lqw.eq(StatementSubjectBalance::getPeriodType, StatementPeriodTypeEnum.MONTH.getValue()); + String currentTerm = configSysService.getCurrentTerm(params.getBookId()); + lqw.ge(StatementSubjectBalance::getYearPeriod, currentTerm.split("-")[0]+"-01"); + lqw.le(StatementSubjectBalance::getYearPeriod, currentTerm); + return lqw; + } }