gitee/yudao-cloud
1
0
Fork 0
mirror of https://gitee.com/zhijiantianya/yudao-cloud.git synced 2026-10-06 07:22:58 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud into master-jdk25

Browse Source 
# Conflicts:
#	yudao-dependencies/pom.xml
This commit is contained in:
YunaiV
2026-08-30 09:56:36 +08:00
parent cd5d3a2c63 745a848271
commit 936bcb523e
4 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yudao-module-fms/yudao-module-fms-server/src/main/java/cn/iocoder/yudao/module/fms/dal/mysql/config/FmsAuxiliaryItemMapper.java
+4 -4
View File
@@ -55,8 +55,8 @@ public interface FmsAuxiliaryItemMapper extends BaseMapperX<FmsAuxiliaryItemDO>
return selectList(new LambdaQueryWrapperX<FmsAuxiliaryItemDO>()
.eq(FmsAuxiliaryItemDO::getAccountSetId, accountSetId)
.eq(FmsAuxiliaryItemDO::getAuxiliaryTypeId, auxiliaryTypeId)
.orderByDesc(FmsAuxiliaryItemDO::getCode)
.orderByDesc(FmsAuxiliaryItemDO::getId));
.orderByAsc(FmsAuxiliaryItemDO::getCode)
.orderByAsc(FmsAuxiliaryItemDO::getId));
}
default List<FmsAuxiliaryItemDO> selectListByAccountSetIdAndAuxiliaryTypeIdAndStatus(
@@ -65,8 +65,8 @@ public interface FmsAuxiliaryItemMapper extends BaseMapperX<FmsAuxiliaryItemDO>
.eq(FmsAuxiliaryItemDO::getAccountSetId, accountSetId)
.eq(FmsAuxiliaryItemDO::getAuxiliaryTypeId, auxiliaryTypeId)
.eq(FmsAuxiliaryItemDO::getStatus, status)
.orderByDesc(FmsAuxiliaryItemDO::getCode)
.orderByDesc(FmsAuxiliaryItemDO::getId));
.orderByAsc(FmsAuxiliaryItemDO::getCode)
.orderByAsc(FmsAuxiliaryItemDO::getId));
}
default List<FmsAuxiliaryItemDO> selectListByAccountSetId(Long accountSetId) {
yudao-module-fms/yudao-module-fms-server/src/test/java/cn/iocoder/yudao/module/fms/service/config/FmsAccountSetServiceImplTest.java
+1 -1
View File
@@ -17,6 +17,7 @@ import cn.iocoder.yudao.module.fms.service.closing.FmsClosingTemplateService;
import cn.iocoder.yudao.module.fms.service.config.FmsAuxiliaryTypeService;
import cn.iocoder.yudao.module.fms.service.config.FmsCurrencyService;
import cn.iocoder.yudao.module.fms.service.config.FmsFinanceParameterService;
import cn.iocoder.yudao.module.fms.service.config.FmsFinanceIndicatorService;
import cn.iocoder.yudao.module.fms.service.config.FmsSubjectService;
import cn.iocoder.yudao.module.fms.service.config.FmsVoucherWordService;
import jakarta.annotation.Resource;
@@ -69,7 +70,6 @@ public class FmsAccountSetServiceImplTest extends BaseDbUnitTest {
private FmsClosingSchemeService closingSchemeService;
@MockitoBean
private FmsClosingTemplateService closingTemplateService;
@Test
public void testCreateAccountSet_success() {
// 准备参数
yudao-module-fms/yudao-module-fms-server/src/test/java/cn/iocoder/yudao/module/fms/service/home/FmsHomeServiceImplTest.java
+20 -1
View File
@@ -8,7 +8,11 @@ import cn.iocoder.yudao.module.fms.controller.admin.report.vo.FmsReportListReqVO
import cn.iocoder.yudao.module.fms.dal.dataobject.config.FmsAccountSetDO;
import cn.iocoder.yudao.module.fms.service.closing.FmsClosingPeriodService;
import cn.iocoder.yudao.module.fms.service.config.FmsAccountSetService;
import cn.iocoder.yudao.module.fms.service.config.FmsFinanceIndicatorService;
import cn.iocoder.yudao.module.fms.service.config.FmsSubjectService;
import cn.iocoder.yudao.module.fms.service.report.FmsBalanceSheetService;
import cn.iocoder.yudao.module.fms.service.report.FmsIncomeStatementService;
import cn.iocoder.yudao.module.fms.service.report.FmsReportCommonService;
import jakarta.annotation.Resource;
import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.Import;
@@ -26,6 +30,7 @@ import static cn.iocoder.yudao.module.fms.enums.ErrorCodeConstants.ACCOUNT_SET_N
import static cn.iocoder.yudao.module.fms.enums.ErrorCodeConstants.HOME_METRIC_INVALID;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -42,6 +47,14 @@ public class FmsHomeServiceImplTest extends BaseDbUnitTest {
private FmsClosingPeriodService closingPeriodService;
@MockitoBean
private FmsIncomeStatementService incomeStatementService;
@MockitoBean
private FmsBalanceSheetService balanceSheetService;
@MockitoBean
private FmsReportCommonService reportCommonService;
@MockitoBean
private FmsSubjectService subjectService;
@MockitoBean
private FmsFinanceIndicatorService financeIndicatorService;
@Test
public void testGetHome_success() {
@@ -52,6 +65,8 @@ public class FmsHomeServiceImplTest extends BaseDbUnitTest {
.thenReturn(accountSet);
when(closingPeriodService.getCurrentMonth(1L, accountSet.getStartTime()))
.thenReturn(YearMonth.of(2026, 8));
when(reportCommonService.isLineFormula(anyString()))
.thenAnswer(invocation -> invocation.getArgument(0, String.class).contains("L"));
when(incomeStatementService.getIncomeStatement(any(FmsReportListReqVO.class), eq(10L)))
.thenAnswer(invocation -> buildIncomeStatement(
invocation.<FmsReportListReqVO>getArgument(0).getStartMonth()));
@@ -82,6 +97,8 @@ public class FmsHomeServiceImplTest extends BaseDbUnitTest {
.thenReturn(accountSet);
when(closingPeriodService.getCurrentMonth(1L, accountSet.getStartTime()))
.thenReturn(YearMonth.of(2026, 8));
when(reportCommonService.isLineFormula(anyString()))
.thenAnswer(invocation -> invocation.getArgument(0, String.class).contains("L"));
when(incomeStatementService.getIncomeStatement(any(FmsReportListReqVO.class), eq(10L)))
.thenAnswer(invocation -> buildMetricIncomeStatement(
invocation.<FmsReportListReqVO>getArgument(0).getStartMonth()));
@@ -99,7 +116,7 @@ public class FmsHomeServiceImplTest extends BaseDbUnitTest {
assertEquals(new BigDecimal("80.00"), result.getStructure().get(0).getAmount());
assertEquals("5051", result.getStructure().get(1).getSubjectCode());
assertEquals(new BigDecimal("20.00"), result.getStructure().get(1).getAmount());
verify(incomeStatementService, times(8)).getIncomeStatement(any(FmsReportListReqVO.class), eq(10L));
verify(incomeStatementService, times(9)).getIncomeStatement(any(FmsReportListReqVO.class), eq(10L));
}
@Test
@@ -133,6 +150,8 @@ public class FmsHomeServiceImplTest extends BaseDbUnitTest {
when(accountSetService.validateAccountSetReadPermission(1L, 10L)).thenReturn(accountSet);
when(closingPeriodService.getCurrentMonth(1L, accountSet.getStartTime()))
.thenReturn(YearMonth.of(2026, 8));
when(reportCommonService.isLineFormula(anyString()))
.thenAnswer(invocation -> invocation.getArgument(0, String.class).contains("L"));
when(incomeStatementService.getIncomeStatement(any(FmsReportListReqVO.class), eq(10L)))
.thenReturn(Arrays.asList(
new FmsReportItemRespVO().setRowNo(1).setCurrentAmount(new BigDecimal("100.00"))
yudao-module-fms/yudao-module-fms-server/src/test/resources/sql/create_tables.sql
+1 -1
View File
@@ -584,7 +584,7 @@ CREATE TABLE IF NOT EXISTS "fms_closing_template" (
);
ALTER TABLE "fms_closing_template"
ADD "unique_active" int GENERATED ALWAYS AS (CASE WHEN "deleted" = FALSE THEN 1 ELSE NULL END);
ADD IF NOT EXISTS "unique_active" int GENERATED ALWAYS AS (CASE WHEN "deleted" = FALSE THEN 1 ELSE NULL END);
CREATE UNIQUE INDEX IF NOT EXISTS "uk_fms_closing_template_active"
ON "fms_closing_template" ("account_set_id", "preset_code", "unique_active", "tenant_id");