From 604d00f67ddcf25a9d079ceddd1c668b2a4e5288 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 19 四月 2024 15:08:22 +0800
Subject: [PATCH] bug修复
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/update/RiskLevelUpdDTO.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/update/RiskLevelUpdDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/update/RiskLevelUpdDTO.java
index 0553e4d..5df2fba 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/update/RiskLevelUpdDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/update/RiskLevelUpdDTO.java
@@ -1,9 +1,12 @@
package com.ruoyi.system.dto.update;
+import com.ruoyi.system.dto.CalculateItemDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
+import java.util.List;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
import lombok.Data;
/**
@@ -16,12 +19,9 @@
private static final long serialVersionUID = -4878457973955230627L;
- @ApiModelProperty(value = "id", notes = "如果返回了id，必传")
- private Long id;
-
- @ApiModelProperty(value = "计算规则", notes = "公式中字段的格式为：field_字段id，e.g：field_1,field_2等。")
- @NotBlank(message = "计算规则不能为空")
- private String calculateFormula;
+ @ApiModelProperty(value = "计算规则")
+ @NotEmpty(message = "计算规则不能为空")
+ private List<CalculateItemDTO> calculateItemList;
@ApiModelProperty(value = "风险等级范围-高风险得分")
@NotBlank(message = "风险等级范围-高风险得分不能为空")
@@ -38,4 +38,19 @@
@ApiModelProperty(value = "风险等级范围-无风险得分")
@NotBlank(message = "风险等级范围-无风险得分不能为空")
private String noRisk;
+
+ public boolean areRiskLevelsDistinct() {
+ return highRisk.equals(mediumRisk) || highRisk.equals(lowRisk) || highRisk.equals(noRisk)
+ || mediumRisk.equals(lowRisk) || mediumRisk.equals(noRisk) || lowRisk.equals(
+ noRisk);
+ }
+
+ public static void main(String[] args) {
+ RiskLevelUpdDTO riskLevelUpdDTO = new RiskLevelUpdDTO();
+ riskLevelUpdDTO.setNoRisk("0_10");
+ riskLevelUpdDTO.setLowRisk("10_20");
+ riskLevelUpdDTO.setMediumRisk("20_30");
+ riskLevelUpdDTO.setHighRisk("30_40");
+ System.out.println(riskLevelUpdDTO.areRiskLevelsDistinct());
+ }
}
--
Gitblit v1.7.1