From 950264a579736c1c51f1efe4baf0ac1476d5748c Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 02 十二月 2024 11:06:46 +0800
Subject: [PATCH] bug修改
---
finance-admin/src/main/java/com/finance/web/controller/service/ScreenService.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/finance-admin/src/main/java/com/finance/web/controller/service/ScreenService.java b/finance-admin/src/main/java/com/finance/web/controller/service/ScreenService.java
index 19e252a..2b63466 100644
--- a/finance-admin/src/main/java/com/finance/web/controller/service/ScreenService.java
+++ b/finance-admin/src/main/java/com/finance/web/controller/service/ScreenService.java
@@ -121,7 +121,7 @@
ScoreRankVO scoreRankVO = tbScoreService.queryRankAndScoreByAreaCode("510000");
riskAndTransferVO.setScoreRankVO(scoreRankVO);
String previousQuarter = DateUtils.getPreviousQuarter();
- // previousQuarter = "2024年一季度";
+ // previousQuarter = "2024年二季度";
// 查询转移支付规模总额
List<TbBasicData> list = tbBasicDataService.lambdaQuery()
.select(TbBasicData::getTransferPaymentScale)
@@ -241,10 +241,10 @@
public List<RiskRankingVO> riskRanking() throws Exception {
DataScreenConfigVO riskLevel = tbDataScreenConfigService.getRiskLevel();
List<RiskLevelVO> riskLevelVOList = formatRiskLevel(riskLevel);
+ String previousQuarter = DateUtils.getPreviousQuarter();
+ // previousQuarter = "2024年二季度";
List<RiskRankingVO> voList = tbScoreService.queryRiskRanking(
- DateUtils.getPreviousQuarter());
- // List<RiskRankingVO> voList = tbScoreService.queryRiskRanking(
- // "2024年一季度");
+ previousQuarter);
int rank = 1;
for (RiskRankingVO riskRankingVO : voList) {
riskRankingVO.setRank(rank++);
@@ -268,7 +268,7 @@
public List<QuestionVO> queryQuestions() throws Exception {
String previousQuarter = DateUtils.getPreviousQuarter();
- // previousQuarter = "2024年一季度";
+ // previousQuarter = "2024年二季度";
List<TbQuestion> list = tbQuestionService.lambdaQuery()
.eq(TbQuestion::getQuarter, previousQuarter).list();
return BeanUtils.copyList(list, QuestionVO.class);
@@ -284,7 +284,7 @@
dataAnalysisVO.setRank(scoreRankVO.getRank());
dataAnalysisVO.setScore(scoreRankVO.getScore());
String previousQuarter = DateUtils.getPreviousQuarter();
- // previousQuarter = "2024年一季度";
+ // previousQuarter = "2024年二季度";
// 查询问题
List<TbQuestion> list = tbQuestionService.lambdaQuery()
.eq(TbQuestion::getQuarter, previousQuarter)
@@ -365,6 +365,7 @@
scoreRateDataVO.setScore(0D);
scoreRateDataVO.setSubType(SubTypeEnum.getEnumByCode(i + 1));
scoreRateDataVO.setScoreRate(0D);
+ scoreRateDataVO.setMaxScore(0D);
} else {
Double indicatorOne = getLevelThreeIndicators(voList, indicatorList.get(i)).stream()
.map(FieldAndScoreDataVO::getScore).reduce(Double::sum)
@@ -382,6 +383,9 @@
.divide(BigDecimal.valueOf(voList.get(i).getLevelOneIndicatorMaxScore()), 2,
RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100L))
.doubleValue());
+ scoreRateDataVO.setMaxScore(
+ getLevelThreeIndicators(voList, indicatorList.get(i)).get(0)
+ .getLevelOneIndicatorMaxScore());
}
result.add(scoreRateDataVO);
}
@@ -425,7 +429,8 @@
.orElse(BigDecimal.ZERO).setScale(2, RoundingMode.HALF_UP).doubleValue();
scoreDataVO.setLastScore(indicatorOneLastYear);
scoreDataVO.setScore(indicatorOne);
- scoreDataVO.setMaxScore(voList.get(0).getLevelOneIndicatorMaxScore());
+ scoreDataVO.setMaxScore(getLevelThreeIndicators(voList, indicatorList.get(i)).get(0)
+ .getLevelOneIndicatorMaxScore());
scoreDataVO.setSubType(SubTypeEnum.getEnumByCode(i + 1));
}
scoreDataVOList.add(scoreDataVO);
@@ -549,13 +554,13 @@
public List<DeptCalculateDetailVO> deptCalculateDetail(DeptCalculateDetailQuery query)
throws Exception {
String previousQuarter = DateUtils.getPreviousQuarter();
- // previousQuarter = "2024年一季度";
+ // previousQuarter = "2024年二季度";
return tbScoreService.deptCalculateDetail(query, previousQuarter);
}
public CurrentFieldsDetailVO viewRawData(String areaCode) throws Exception {
String previousQuarter = DateUtils.getPreviousQuarter();
- // previousQuarter = "2024年一季度";
+ // previousQuarter = "2024年二季度";
Optional<TbBasicData> basicDataOptional = tbBasicDataService.lambdaQuery()
.eq(TbBasicData::getDeptAreaCode, areaCode)
.eq(TbBasicData::getQuarter, previousQuarter).oneOpt();
@@ -587,7 +592,13 @@
.likeRight(SysUser::getAreaCode, cityCode).or(cityCode.equals("5101"))
.in(cityCode.equals("5101"), SysUser::getAreaCode, "510008", "510015", "510017",
"510025")
- .orderByAsc(!areaCode.equals("510100"), SysUser::getAreaCode)
+ .or(cityCode.equals("5106"))
+ .eq(cityCode.equals("5106"), SysUser::getAreaCode, "510049")
+ .or(cityCode.equals("5109"))
+ .eq(cityCode.equals("5109"), SysUser::getAreaCode, "510077")
+ .orderByAsc(!areaCode.equals("510100") && !areaCode.equals("510600")
+ && !areaCode.equals("510900"),
+ SysUser::getAreaCode)
.list();
return list;
}
--
Gitblit v1.7.1