From e69dec94fe9763d04425756370760698850f926f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 22 三月 2024 19:38:39 +0800
Subject: [PATCH] 部门端基础数据保存、基础数据导入模板下载、基础数据导入接口
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/TbBasicDataConfig.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbBasicDataConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbBasicDataConfig.java
index 07c7947..953d132 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbBasicDataConfig.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbBasicDataConfig.java
@@ -1,6 +1,8 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.enums.CalculateTypeEnum;
+import com.ruoyi.common.enums.ShowStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,7 +17,7 @@
* </p>
*
* @author mitao
- * @since 2024-03-13
+ * @since 2024-03-18
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -26,7 +28,7 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "基础数据配置id")
- @TableId("id")
+ @TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty(value = "基础数据分类id")
@@ -42,12 +44,20 @@
private String fieldDescription;
@ApiModelProperty(value = "计算类型（1=数字计算 2=文本统计 3=百分比统计）")
- @TableField("caculate_type")
- private Boolean caculateType;
+ @TableField("calculate_type")
+ private CalculateTypeEnum calculateType;
- @ApiModelProperty(value = "计算公式")
- @TableField("caculate_formula")
- private String caculateFormula;
+ @ApiModelProperty(value = "数字计算公式")
+ @TableField("number_calculate_formula")
+ private String numberCalculateFormula;
+
+ @ApiModelProperty(value = "字段id (多个id使用 ',' 拼接)")
+ @TableField("field_id_str")
+ private String fieldIdStr;
+
+ @ApiModelProperty(value = "状态（0=展示 1=隐藏）")
+ @TableField("status")
+ private ShowStatusEnum status;
@ApiModelProperty(value = "删除标志（0代表存在 1代表删除）")
@TableField("del_flag")
--
Gitblit v1.7.1