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

mitao

2024-07-24 4b5624af301dfbdcf54b65dc55aadde1b6a8efd5

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

@@ -7,6 +7,7 @@
import com.finance.common.exception.ServiceException;
import com.finance.common.utils.BeanUtils;
import com.finance.common.utils.CollUtils;
import com.finance.common.utils.DateUtils;
import com.finance.system.domain.TbBasicDataConfig;
import com.finance.system.domain.TbScore;
import com.finance.system.mapper.TbScoreMapper;
@@ -61,7 +62,8 @@
    }

    @Override
    public ScoreCalculateDetailVO scoreCalculateDetail(ScoreCalculateDetailQuery query) {
    public ScoreCalculateDetailVO scoreCalculateDetail(ScoreCalculateDetailQuery query)
            throws Exception {
        // 查询计算类型
        TbBasicDataConfig config = basicDataConfigService.getById(query.getId());
        if (Objects.isNull(config)) {
@@ -71,7 +73,9 @@
        vo.setTypeName(config.getTypeName());
        vo.setCalculateType(config.getCalculateType());
        Page<ScoreDetailVO> page = new Page<>(query.getPageNum(), query.getPageSize());

        String previousQuarter = DateUtils.getPreviousQuarter();
        previousQuarter = "2024年一季度";
        query.setPreviousQuarter(previousQuarter);
        Page<ScoreDetailVO> pageVO = baseMapper.scoreCalculateDetail(query, page);
        vo.setTotal(pageVO.getTotal());
        vo.setPages(pageVO.getPages());
@@ -85,8 +89,20 @@
    }

    @Override
    public ScoreRankVO queryRankAndScoreByAreaCode(String areaCode) {
        return baseMapper.queryRankAndScoreByAreaCode(areaCode);
    public ScoreRankVO queryRankAndScoreByAreaCode(String areaCode) throws Exception {
        String previousQuarter = DateUtils.getPreviousQuarter();
        previousQuarter = "2024年一季度";
        List<ScoreRankVO> voList = baseMapper.queryRankAndScoreByAreaCode(areaCode,
                previousQuarter);
        if (CollUtils.isNotEmpty(voList)) {
            for (int i = 0; i < voList.size(); i++) {
                if (areaCode.equals(voList.get(i).getAreaCode())) {
                    voList.get(i).setRank(i + 1);
                    return voList.get(i);
                }
            }
        }
        return null;
    }

    @Override
@@ -97,7 +113,7 @@

    @Override
    public ScoreCalculateDetailVO fieldsDetail(CalculateDetailQuery query,
            List<SysUser> countyList) {
            List<SysUser> countyList) throws Exception {
        // 查询计算类型
        TbBasicDataConfig config = basicDataConfigService.getById(query.getId());
        if (Objects.isNull(config)) {
@@ -112,6 +128,8 @@
        vo.setTypeName(config.getTypeName());
        vo.setCalculateType(config.getCalculateType());
        Page<ScoreDetailVO> page = new Page<>(query.getPageNum(), query.getPageSize());
        String previousQuarter = DateUtils.getPreviousQuarter();
        previousQuarter = "2023年一季度";
        Page<ScoreDetailVO> pageVO = baseMapper.fieldsDetail(query, page, areaCodeList);
        vo.setTotal(pageVO.getTotal());
        vo.setPages(pageVO.getPages());
@@ -131,11 +149,10 @@

    /**
     * @param areaCode 区划代码
     * @param yearType 年份类型 1=今年 2=去年
     * @return
     */
    @Override
    public List<RiskMapVO> getScoreByYearType(String areaCode, Integer yearType) {
        return baseMapper.getScoreByYearType(areaCode, yearType);
    public List<RiskMapVO> getScoreByYearType(String areaCode, String quarter) {
        return baseMapper.getScoreByYearType(areaCode, quarter);
    }
}