完成7.4迭代内容，通过冒烟测试

mitao

2024-07-12 3e456f3e812ead6a19e80cfbdbf86ae0263d50b9

 finance-system/src/main/java/com/finance/system/service/impl/TbBasicDataConfigServiceImpl.java

@@ -266,25 +266,59 @@
    @Override
    public List<BasicDataConfigVO> getFixedRulesConfigList() {
        List<TbBasicDataConfig> configList = this.lambdaQuery()
                .le(TbBasicDataConfig::getId, 24).list();
                .le(TbBasicDataConfig::getId, 25).list();
        Map<Long, TbBasicDataCategory> configCategoryMap = tbBasicDataCategoryService.list()
                .stream()
                .collect(Collectors.toMap(TbBasicDataCategory::getId,
                        Function.identity()));
        List<BasicDataConfigVO> configVOList = BeanUtils.copyList(configList,
                BasicDataConfigVO.class);
        configVOList = configVOList.stream().map(c -> {
        configVOList = configVOList.stream().peek(c -> {
            TbBasicDataCategory tbBasicDataCategory2 = configCategoryMap.get(
                    c.getBasicDataCategoryId());
            if (Objects.nonNull(tbBasicDataCategory2)) {
                if (tbBasicDataCategory2.getParentId() == -1) {
                    c.setBasicDataCategoryOne(tbBasicDataCategory2.getBasicDataCategoryName());
                } else {
                c.setBasicDataCategory(tbBasicDataCategory2.getBasicDataCategoryName());
                TbBasicDataCategory tbBasicDataCategory1 = configCategoryMap.get(
                        tbBasicDataCategory2.getParentId());
                if (Objects.nonNull(tbBasicDataCategory1)) {
                    c.setBasicDataCategoryOne(tbBasicDataCategory1.getBasicDataCategoryName());
                        c.setBasicDataCategoryOne(
                                tbBasicDataCategory1.getBasicDataCategoryName());
                }
            }
            return c;
            }
        }).collect(Collectors.toList());
        return configVOList;
    }

    @Override
    public List<BasicDataConfigVO> getSubsractRulesConfigList() {
        List<TbBasicDataConfig> configList = this.lambdaQuery()
                .in(TbBasicDataConfig::getId, 5, 6, 11, 12, 23, 24, 25).list();
        Map<Long, TbBasicDataCategory> configCategoryMap = tbBasicDataCategoryService.list()
                .stream()
                .collect(Collectors.toMap(TbBasicDataCategory::getId,
                        Function.identity()));
        List<BasicDataConfigVO> configVOList = BeanUtils.copyList(configList,
                BasicDataConfigVO.class);
        configVOList = configVOList.stream().peek(c -> {
            TbBasicDataCategory tbBasicDataCategory2 = configCategoryMap.get(
                    c.getBasicDataCategoryId());
            if (Objects.nonNull(tbBasicDataCategory2)) {
                if (tbBasicDataCategory2.getParentId() == -1) {
                    c.setBasicDataCategoryOne(tbBasicDataCategory2.getBasicDataCategoryName());
                } else {
                    c.setBasicDataCategory(tbBasicDataCategory2.getBasicDataCategoryName());
                    TbBasicDataCategory tbBasicDataCategory1 = configCategoryMap.get(
                            tbBasicDataCategory2.getParentId());
                    if (Objects.nonNull(tbBasicDataCategory1)) {
                        c.setBasicDataCategoryOne(
                                tbBasicDataCategory1.getBasicDataCategoryName());
                    }
                }
            }
        }).collect(Collectors.toList());
        return configVOList;
    }