bug修改，查询季度写死“2024年一季度”

mitao

2024-07-24 4b5624af301dfbdcf54b65dc55aadde1b6a8efd5

 finance-admin/src/test/java/com/finance/FinanceManageApplicationTest.java

@@ -3,7 +3,27 @@
import static com.finance.web.controller.service.DepartmentRanking.DATA_ONE_SCORE_RANKING_KEY;
import static com.finance.web.controller.service.DepartmentRanking.TOTAL_SCORE_RANKING_KEY;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.finance.common.enums.ShowStatusEnum;
import com.finance.common.utils.BeanUtils;
import com.finance.system.domain.TbBasicData;
import com.finance.system.domain.TbBasicDataCategory;
import com.finance.system.domain.TbBasicDataConfig;
import com.finance.system.domain.TbBasicDataField;
import com.finance.system.domain.TbField;
import com.finance.system.mapper.TbBasicDataFieldMapper;
import com.finance.system.mapper.TbBasicDataMapper;
import com.finance.system.service.AsyncService;
import com.finance.system.service.TbBasicDataCategoryService;
import com.finance.system.service.TbBasicDataConfigService;
import com.finance.system.service.TbFieldService;
import com.finance.system.vo.BasicDataConfigVO;
import com.finance.web.controller.service.DepartmentRanking;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@@ -17,16 +37,28 @@

    @Resource
    private DepartmentRanking departmentRanking;
    @Resource
    private AsyncService asyncService;
    @Resource
    private TbBasicDataMapper basicDataMapper;
    @Resource
    private TbBasicDataFieldMapper basicDataFieldMapper;
    @Resource
    private TbFieldService tbFieldService;
    @Resource
    private TbBasicDataConfigService tbBasicDataConfigService;
    @Resource
    private TbBasicDataCategoryService tbBasicDataCategoryService;

    @Test
    public void test() {
        departmentRanking.addToScoreRanking(TOTAL_SCORE_RANKING_KEY, "area1" , 50);
        departmentRanking.addToScoreRanking(TOTAL_SCORE_RANKING_KEY, "area2" , 50);
        departmentRanking.addToScoreRanking(TOTAL_SCORE_RANKING_KEY, "area3" , 50);
        departmentRanking.addToScoreRanking(TOTAL_SCORE_RANKING_KEY, "area1", 50);
        departmentRanking.addToScoreRanking(TOTAL_SCORE_RANKING_KEY, "area2", 50);
        departmentRanking.addToScoreRanking(TOTAL_SCORE_RANKING_KEY, "area3", 50);

        departmentRanking.addToScoreRanking(DATA_ONE_SCORE_RANKING_KEY, "area1" , 50);
        departmentRanking.addToScoreRanking(DATA_ONE_SCORE_RANKING_KEY, "area2" , 80);
        departmentRanking.addToScoreRanking(DATA_ONE_SCORE_RANKING_KEY, "area3" , 90);
        departmentRanking.addToScoreRanking(DATA_ONE_SCORE_RANKING_KEY, "area1", 50);
        departmentRanking.addToScoreRanking(DATA_ONE_SCORE_RANKING_KEY, "area2", 80);
        departmentRanking.addToScoreRanking(DATA_ONE_SCORE_RANKING_KEY, "area3", 90);

        Long score1Rank1 = departmentRanking.getScoreRankByAreaCode(TOTAL_SCORE_RANKING_KEY,
                "area1");
@@ -58,5 +90,47 @@
            System.out.println("Area2 not found in the ranking.");
        }
    }

    @Test
    public void test2() {
        TbBasicData one = basicDataMapper.selectOne(
                Wrappers.lambdaQuery(TbBasicData.class).eq(TbBasicData::getId, "1"));
        List<TbBasicDataField> list = basicDataFieldMapper.selectList(
                Wrappers.lambdaQuery(TbBasicDataField.class)
                        .eq(TbBasicDataField::getBasicDataId, one.getId()));
        List<TbField> fieldList =
                tbFieldService.lambdaQuery().eq(TbField::getStatus, ShowStatusEnum.SHOW).list();
        asyncService.calculateScoreWithFixedRules(one, list, fieldList);
    }

    @Test
    public void test3() {
        List<TbBasicDataConfig> configList = tbBasicDataConfigService.lambdaQuery()
                .le(TbBasicDataConfig::getId, 25).list();
        List<BasicDataConfigVO> configVOList = BeanUtils.copyList(configList,
                BasicDataConfigVO.class);
        Map<Long, TbBasicDataCategory> configCategoryMap = tbBasicDataCategoryService.list()
                .stream()
                .collect(Collectors.toMap(TbBasicDataCategory::getId,
                        Function.identity()));
        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());
        System.err.println(configVOList);
    }
}