From 18891c60ab1c06a4acc85d0ec54dee50d1b1a19f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 07 四月 2025 17:20:07 +0800
Subject: [PATCH] bug修改
---
finance-system/src/main/java/com/finance/system/service/impl/TbDataScreenConfigServiceImpl.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/finance-system/src/main/java/com/finance/system/service/impl/TbDataScreenConfigServiceImpl.java b/finance-system/src/main/java/com/finance/system/service/impl/TbDataScreenConfigServiceImpl.java
index 8647d2e..ab70a5c 100644
--- a/finance-system/src/main/java/com/finance/system/service/impl/TbDataScreenConfigServiceImpl.java
+++ b/finance-system/src/main/java/com/finance/system/service/impl/TbDataScreenConfigServiceImpl.java
@@ -63,20 +63,24 @@
if (dto.areRiskLevelsDistinct()) {
throw new ServiceException("得分范围不能重叠");
}
- //查询是否有该指标配置
+ // 查询是否有该指标配置
TbDataScreenConfig tbDataScreenConfig = this.lambdaQuery()
.eq(TbDataScreenConfig::getType, DataScreenConfigEnum.RISK_LEVEL)
.oneOpt().orElseGet(() -> BeanUtils.copyBean(dto,
TbDataScreenConfig.class));
- List<CalculateItemDTO> calculateItemList = dto.getCalculateItemList();
- validateCalculateItemList(calculateItemList);
- String numberCalculateFormulaJsonStr = JSON.toJSONString(calculateItemList);
- tbDataScreenConfig.setCalculateFormula(numberCalculateFormulaJsonStr);
+ // List<CalculateItemDTO> calculateItemList = dto.getCalculateItemList();
+ // validateCalculateItemList(calculateItemList);
+ // String numberCalculateFormulaJsonStr = JSON.toJSONString(calculateItemList);
+ // tbDataScreenConfig.setCalculateFormula(numberCalculateFormulaJsonStr);
+ tbDataScreenConfig.setNoRisk(dto.getNoRisk());
+ tbDataScreenConfig.setLowRisk(dto.getLowRisk());
+ tbDataScreenConfig.setMediumRisk(dto.getMediumRisk());
+ tbDataScreenConfig.setHighRisk(dto.getHighRisk());
tbDataScreenConfig.setType(DataScreenConfigEnum.RISK_LEVEL);
this.saveOrUpdate(tbDataScreenConfig);
DataScreenConfigVO dataScreenConfigVO = BeanUtils.copyBean(tbDataScreenConfig,
DataScreenConfigVO.class);
- dataScreenConfigVO.setRateCalculateList(calculateItemList);
+ // dataScreenConfigVO.setRateCalculateList(calculateItemList);
return dataScreenConfigVO;
}
@@ -99,11 +103,11 @@
if (result) {
throw new ServiceException("计算表达式有误，请修改");
}
- //参数校验
+ // 参数校验
String numberCalculateFormulaStr = calculateItemList.stream()
.map(CalculateItemDTO::getContent)
.collect(Collectors.joining());
- //校验表达式是否正确
+ // 校验表达式是否正确
try {
CalculateUtil.calculate(numberCalculateFormulaStr);
} catch (Exception e) {
@@ -111,7 +115,7 @@
}
}
- //表达式校验
+ // 表达式校验
public boolean hasConsecutiveDuplicates(List<CalculateItemDTO> calculateItemList) {
return IntStream.range(1, calculateItemList.size())
.anyMatch(i -> calculateItemList.get(i - 1).getValueType()
@@ -142,7 +146,7 @@
public List<DataScreenConfigVO> editDataIndicatorsConfig(List<DataIndicatorsUpdDTO> dtoList) {
List<DataScreenConfigVO> vosList = new ArrayList<>();
for (DataIndicatorsUpdDTO dto : dtoList) {
- //查询是否有该指标配置
+ // 查询是否有该指标配置
TbDataScreenConfig tbDataScreenConfig = this.lambdaQuery()
.eq(TbDataScreenConfig::getType, DataScreenConfigEnum.DATA_INDICATORS)
.eq(TbDataScreenConfig::getSubType,
@@ -173,7 +177,7 @@
List<FormalIndicatorsUpdDTO> dtoList) {
List<DataScreenConfigVO> vosList = new ArrayList<>();
for (FormalIndicatorsUpdDTO dto : dtoList) {
- //查询是否有该指标配置
+ // 查询是否有该指标配置
TbDataScreenConfig tbDataScreenConfig = this.lambdaQuery()
.eq(TbDataScreenConfig::getType, DataScreenConfigEnum.FORMAL_INDICATORS)
.eq(TbDataScreenConfig::getSubType,
--
Gitblit v1.7.1