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/FormalIndicatorsUpdDTO.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/update/FormalIndicatorsUpdDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/update/FormalIndicatorsUpdDTO.java
index bbac114..e2ac5a3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/update/FormalIndicatorsUpdDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/update/FormalIndicatorsUpdDTO.java
@@ -1,9 +1,11 @@
 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 lombok.Data;
 
 /**
@@ -15,11 +17,11 @@
 public class FormalIndicatorsUpdDTO implements Serializable {
 
     private static final long serialVersionUID = -4878457973955230627L;
-    
+
     @ApiModelProperty(value = "配置类型子类型(1=指标一 2=指标二 3=指标三 4=指标四)")
     private SubTypeEnum subType;
 
     @ApiModelProperty(value = "得分计算规则")
-    private String calculateFormula;
+    private List<CalculateItemDTO> calculateItemList;
 
 }

--
Gitblit v1.7.1