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/BasicDataConfigDetailVO.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/BasicDataConfigDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/BasicDataConfigDetailVO.java
index 6b4f245..5680e64 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/BasicDataConfigDetailVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/BasicDataConfigDetailVO.java
@@ -1,28 +1,28 @@
package com.ruoyi.system.vo;
import com.ruoyi.common.enums.CalculateTypeEnum;
+import com.ruoyi.system.dto.CalculateItemDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.List;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
/**
* @author mitao
* @date 2024/3/18
*/
@Data
-@ApiModel(value="基础数据配置详情视图对象")
+@ApiModel(value = "基础数据配置详情视图对象")
public class BasicDataConfigDetailVO implements Serializable {
private static final long serialVersionUID = 8789005070048058207L;
@ApiModelProperty(value = "id")
@NotNull(message = "id不能为空")
- private Integer id;
+ private Long id;
@ApiModelProperty(value = "类型名称")
@NotBlank(message = "类型名称不能为空")
@@ -44,8 +44,8 @@
@NotBlank(message = "字段id不能为空")
private String fieldIdStr;
- @ApiModelProperty(value = "计算公式",notes = "计算类型为数字计算，配置内容使用该字段接收；公式中字段的格式为：field_字段id，e.g：field_1,field_2等。")
- private String numberCalculateFormula;
+ @ApiModelProperty(value = "计算公式")
+ private List<CalculateItemDTO> CalculateItemList;
@ApiModelProperty(value = "文本和百分比配置信息", notes = "当计算方式为 文本统计/百分比统计 " +
"配置内容使用这个字段接收；key为键，value为得分；百分比统计 将百分比区间使用'_'拼接作为key，e.g: 10_20,20_30")
--
Gitblit v1.7.1