From ce7e6574a1f9942fc090d989b52aceaa11ba8f3e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 15 四月 2024 21:54:08 +0800
Subject: [PATCH] 1.得分计算部分调整； 2.大屏得分计算；
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/update/DataIndicatorsUpdDTO.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/update/DataIndicatorsUpdDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/update/DataIndicatorsUpdDTO.java
index 4bf10fd..0853b8a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/update/DataIndicatorsUpdDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/update/DataIndicatorsUpdDTO.java
@@ -1,9 +1,12 @@
package com.ruoyi.system.dto.update;
import com.ruoyi.common.enums.SubTypeEnum;
+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.NotEmpty;
import javax.validation.constraints.NotNull;
import lombok.Data;
@@ -16,17 +19,17 @@
public class DataIndicatorsUpdDTO implements Serializable {
private static final long serialVersionUID = -5866223907037261823L;
-
+
@ApiModelProperty(value = "配置类型子类型（1=指标一 2=指标二 3=指标三 4=指标四）")
@NotNull(message = "配置类型子类型不能为空")
private SubTypeEnum subType;
@ApiModelProperty(value = "得分计算规则")
- @NotNull(message = "得分计算规则不能为空")
- private String calculateFormula;
+ @NotEmpty(message = "得分计算规则不能为空")
+ private List<CalculateItemDTO> scoreCalculateList;
@ApiModelProperty(value = "得分率计算规则")
- @NotNull(message = "得分率计算规则不能为空")
- private String calculateRateFormula;
+ @NotEmpty(message = "得分率计算规则不能为空")
+ private List<CalculateItemDTO> rateCalculateList;
}
--
Gitblit v1.7.1