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-admin/src/main/java/com/finance/web/controller/service/ScreenService.java | 20 ++++++++++----------
1 files changed, 10 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 0024565..d48f5cd 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
@@ -135,10 +135,10 @@
riskAndTransferVO.setRiskLevelVOList(riskLevelVOList);
RiskCountVO riskCountVO = new RiskCountVO();
List<RiskMapVO> riskMapVOList = tbScoreService.getCurrentScoreList(previousQuarter, null);
- String[] noRiskArr = riskLevel.getNoRisk().split("-");
- String[] lowRiskArr = riskLevel.getLowRisk().split("-");
- String[] mediumRiskArr = riskLevel.getMediumRisk().split("-");
- String[] highRiskArr = riskLevel.getHighRisk().split("-");
+ String[] noRiskArr = riskLevel.getNoRisk().split("_");
+ String[] lowRiskArr = riskLevel.getLowRisk().split("_");
+ String[] mediumRiskArr = riskLevel.getMediumRisk().split("_");
+ String[] highRiskArr = riskLevel.getHighRisk().split("_");
List<RiskMapVO> cityRiskVO = riskMapVOList.stream()
.filter(r -> r.getAreaLevel().equals(AreaLevelEnum.CITY))
.collect(Collectors.toList());
@@ -189,10 +189,10 @@
}
private List<RiskLevelVO> formatRiskLevel(DataScreenConfigVO riskLevel) {
- String[] noRiskArr = riskLevel.getNoRisk().split("-");
- String[] lowRiskArr = riskLevel.getLowRisk().split("-");
- String[] mediumRiskArr = riskLevel.getMediumRisk().split("-");
- String[] highRiskArr = riskLevel.getHighRisk().split("-");
+ String[] noRiskArr = riskLevel.getNoRisk().split("_");
+ String[] lowRiskArr = riskLevel.getLowRisk().split("_");
+ String[] mediumRiskArr = riskLevel.getMediumRisk().split("_");
+ String[] highRiskArr = riskLevel.getHighRisk().split("_");
return handleRiskLevel(noRiskArr, lowRiskArr, mediumRiskArr,
highRiskArr);
}
@@ -322,7 +322,7 @@
List<FieldAndScoreDataVO> voList =
tbBasicDataService.getFieldAndScoreData(areaCode, previousQuarter, 1, 2);
List<FieldAndScoreDataVO> lastYearList =
- tbBasicDataService.getFieldAndScoreData(areaCode, previousQuarter, 2, 2);
+ tbBasicDataService.getFieldAndScoreData(areaCode, lastYearQuarter, 2, 2);
// 查询四个指标下的三级指标
List<FieldAndScoreDataVO> allDeptVoList =
tbBasicDataService.getFieldAndScoreData(areaCode, previousQuarter, 1, 1);
@@ -582,7 +582,7 @@
.select(SysUser::getAreaCode, SysUser::getAreaName, SysUser::getAreaAlias,
SysUser::getUserId).eq(SysUser::getUserType,
UserTypeEnum.DEPARTMENT)
- .ne(SysUser::getAreaCode, areaCode)
+ .ne(SysUser::getAreaLevel, AreaLevelEnum.CITY)
.likeRight(SysUser::getAreaCode, cityCode).list();
return list;
}
--
Gitblit v1.7.1