xuemingqiang/jinbooks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update FundDashboardServiceImpl.java

Browse Source
This commit is contained in:
jinbooks_dev
2025-06-04 11:32:09 +08:00
parent e686da36a3
commit a2655d8b4c
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jinbooks-ui/src/views/dashboard/accounting/other_subjects.vue
View File

@ -186,7 +186,7 @@ const getList = () => {
show: true, show: true,
position: 'center', position: 'center',
formatter: [ formatter: [
'{title|总额合计}', '{title|总额合计(万元)}',
'{value|' + totalAmount.toLocaleString() + '}', '{value|' + totalAmount.toLocaleString() + '}',
].join('\n'), ].join('\n'),
rich: { rich: {

12
jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/FundDashboardServiceImpl.java
View File

@ -193,7 +193,7 @@ public class FundDashboardServiceImpl implements FundDashboardService {
*/ */
@Override @Override
public List<OtherSubjectsVo> statisticsOtherSubjects(StatementParamsDto params) { public List<OtherSubjectsVo> statisticsOtherSubjects(StatementParamsDto params) {
LambdaQueryWrapper<StatementSubjectBalance> lqw = buildQueryWrapper(params); LambdaQueryWrapper<StatementSubjectBalance> lqw = buildYearQueryWrapper(params);
lqw.orderByAsc(StatementSubjectBalance::getYearPeriod); lqw.orderByAsc(StatementSubjectBalance::getYearPeriod);
if (params.getSubjectCodes() != null) { if (params.getSubjectCodes() != null) {
lqw.likeRight(!params.getSubjectCodes().isEmpty(), lqw.likeRight(!params.getSubjectCodes().isEmpty(),
@ -883,4 +883,14 @@ public class FundDashboardServiceImpl implements FundDashboardService {
lqw.le(StatementSubjectBalance::getYearPeriod, params.getDateRange()[1]); lqw.le(StatementSubjectBalance::getYearPeriod, params.getDateRange()[1]);
return lqw; return lqw;
} }
private LambdaQueryWrapper<StatementSubjectBalance> buildYearQueryWrapper(StatementParamsDto params) {
LambdaQueryWrapper<StatementSubjectBalance> 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;
}
} }