From ba421d977e745d18a6264353c739bcaaf44c40d6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 08 四月 2024 18:39:41 +0800
Subject: [PATCH] 历史数据模块接口
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/TbBasicDataConfig.java | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 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..19211c5 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,13 +1,15 @@
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;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
/**
* <p>
@@ -15,7 +17,7 @@
* </p>
*
* @author mitao
- * @since 2024-03-13
+ * @since 2024-03-18
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -26,8 +28,8 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "基础数据配置id")
- @TableId("id")
- private Integer id;
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
@ApiModelProperty(value = "基础数据分类id")
@TableField("basic_data_category_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")
@@ -55,20 +65,20 @@
private String delFlag;
@ApiModelProperty(value = "创建者")
- @TableField("create_by")
+ @TableField(value = "create_by", fill = FieldFill.INSERT)
private String createBy;
@ApiModelProperty(value = "创建时间")
@TableField(value = "create_time", fill = FieldFill.INSERT)
- private LocalDateTime createTime;
+ private Date createTime;
@ApiModelProperty(value = "创建者")
- @TableField("update_by")
+ @TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE)
private String updateBy;
@ApiModelProperty(value = "创建时间")
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
- private LocalDateTime updateTime;
+ private Date updateTime;
}
--
Gitblit v1.7.1