From a7a8a50f48c1bff5ddc52b3bad1782328f8043d8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 12 四月 2024 18:50:20 +0800
Subject: [PATCH] 基础数据配置接口修改
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/BasicDataConfigDTO.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/BasicDataConfigDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/BasicDataConfigDTO.java
index c0abdc7..41ab9dd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/BasicDataConfigDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/BasicDataConfigDTO.java
@@ -4,12 +4,11 @@
import com.ruoyi.common.utils.CalculateUtil;
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.util.List;
import java.util.Map;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
/**
* @author mitao
@@ -25,7 +24,7 @@
@ApiModelProperty(value = "基础数据分类id")
@NotNull(message = "基础数据分类id不能为空")
- private Integer basicDataCategoryId;
+ private Long basicDataCategoryId;
@ApiModelProperty(value = "字段说明")
@NotBlank(message = "字段说明不能为空")
@@ -35,14 +34,13 @@
@NotNull(message = "计算类型不能为空")
private CalculateTypeEnum calculateType;
- @ApiModelProperty(value = "字段id ",notes = "多个id使用 ',' 拼接")
- @NotBlank(message = "字段id不能为空")
+ @ApiModelProperty(value = "字段id ", notes = "文本统计 和百分比统计的的字段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 = "当计算方式为 文本统计/百分比统计 " +
+ @ApiModelProperty(value = "文本和百分比配置信息", notes = "当计算方式为 文本统计/百分比统计 " +
"配置内容使用这个字段接收；key为键，value为得分；百分比统计 将百分比区间使用'_'拼接作为key，e.g: 10_20,20_30")
private List<CalculateDTO> dtoList;
@@ -95,4 +93,4 @@
/* double calculate = CalculateUtil.calculate(expression, fieldsAndValue);
System.out.println(calculate);*/
}
- }
+}
--
Gitblit v1.7.1