From 3a6f2b349aaac3fd9f895c16f7d833252a2158ab Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 23 八月 2024 15:26:25 +0800
Subject: [PATCH] bug修改

---
 finance-system/src/main/java/com/finance/system/service/impl/TbScoreServiceImpl.java |   70 ++++++++++++++++++++++++++++++++---
 1 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/finance-system/src/main/java/com/finance/system/service/impl/TbScoreServiceImpl.java b/finance-system/src/main/java/com/finance/system/service/impl/TbScoreServiceImpl.java
index d293948..60174f3 100644
--- a/finance-system/src/main/java/com/finance/system/service/impl/TbScoreServiceImpl.java
+++ b/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;
@@ -18,6 +19,8 @@
 import com.finance.system.service.TbBasicDataConfigService;
 import com.finance.system.service.TbScoreService;
 import com.finance.system.vo.DeptCalculateDetailVO;
+import com.finance.system.vo.RiskMapVO;
+import com.finance.system.vo.RiskRankingVO;
 import com.finance.system.vo.ScoreCalculateDetailVO;
 import com.finance.system.vo.ScoreDetailVO;
 import com.finance.system.vo.ScoreRankVO;
@@ -59,8 +62,9 @@
     }
 
     @Override
-    public ScoreCalculateDetailVO scoreCalculateDetail(ScoreCalculateDetailQuery query) {
-        //查询计算类型
+    public ScoreCalculateDetailVO scoreCalculateDetail(ScoreCalculateDetailQuery query)
+            throws Exception {
+        // 查询计算类型
         TbBasicDataConfig config = basicDataConfigService.getById(query.getId());
         if (Objects.isNull(config)) {
             throw new ServiceException("非法参数");
@@ -69,7 +73,28 @@
         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());
+        vo.setList(pageVO.getRecords());
+        return vo;
+    }
 
+    @Override
+    public ScoreCalculateDetailVO scoreCalculateHistoryDetail(ScoreCalculateDetailQuery query)
+            throws Exception {
+        // 查询计算类型
+        TbBasicDataConfig config = basicDataConfigService.getById(query.getId());
+        if (Objects.isNull(config)) {
+            throw new ServiceException("非法参数");
+        }
+        ScoreCalculateDetailVO vo = new ScoreCalculateDetailVO();
+        vo.setTypeName(config.getTypeName());
+        vo.setCalculateType(config.getCalculateType());
+        Page<ScoreDetailVO> page = new Page<>(query.getPageNum(), query.getPageSize());
         Page<ScoreDetailVO> pageVO = baseMapper.scoreCalculateDetail(query, page);
         vo.setTotal(pageVO.getTotal());
         vo.setPages(pageVO.getPages());
@@ -83,8 +108,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
@@ -95,8 +132,8 @@
 
     @Override
     public ScoreCalculateDetailVO fieldsDetail(CalculateDetailQuery query,
-            List<SysUser> countyList) {
-        //查询计算类型
+            List<SysUser> countyList) throws Exception {
+        // 查询计算类型
         TbBasicDataConfig config = basicDataConfigService.getById(query.getId());
         if (Objects.isNull(config)) {
             throw new ServiceException("非法参数");
@@ -110,10 +147,31 @@
         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());
         vo.setList(pageVO.getRecords());
         return vo;
     }
+
+    @Override
+    public List<RiskMapVO> getCurrentScoreList(String nowQuarter, String areaCode) {
+        return baseMapper.getCurrentScoreList(nowQuarter, areaCode);
+    }
+
+    @Override
+    public List<RiskRankingVO> queryRiskRanking(String nowQuarter) {
+        return baseMapper.queryRiskRanking(nowQuarter);
+    }
+
+    /**
+     * @param areaCode 区划代码
+     * @return
+     */
+    @Override
+    public List<RiskMapVO> getScoreByYearType(String areaCode, String quarter) {
+        return baseMapper.getScoreByYearType(areaCode, quarter);
+    }
 }

--
Gitblit v1.7.1