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/vo/DataScreenConfigVO.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/DataScreenConfigVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/DataScreenConfigVO.java
index 2fc30fa..c960474 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/DataScreenConfigVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/DataScreenConfigVO.java
@@ -2,8 +2,10 @@
import com.ruoyi.common.enums.DataScreenConfigEnum;
import com.ruoyi.common.enums.SubTypeEnum;
+import com.ruoyi.system.dto.CalculateItemDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
import lombok.Data;
/**
@@ -21,10 +23,10 @@
private DataScreenConfigEnum type;
@ApiModelProperty(value = "得分计算规则")
- private String calculateFormula;
+ private List<CalculateItemDTO> scoreCalculateList;
@ApiModelProperty(value = "得分率计算规则")
- private String calculateRateFormula;
+ private List<CalculateItemDTO> rateCalculateList;
@ApiModelProperty(value = "配置类型子类型（1=指标一 2=指标二 3=指标三 4=指标四）")
private SubTypeEnum subType;
--
Gitblit v1.7.1