From 4403a428edc18482c5aa561e603b26ebe13d328f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 02 四月 2024 18:27:02 +0800
Subject: [PATCH] 部门端登录、基础数据导入优化、得分计算优化
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/TbField.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbField.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbField.java
index 9e6d061..36838f1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbField.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbField.java
@@ -1,6 +1,8 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.enums.FieldInputTypeEnum;
+import com.ruoyi.common.enums.FieldTypeEnum;
import com.ruoyi.common.enums.ShowStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -8,7 +10,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
/**
* <p>
@@ -28,7 +30,7 @@
@ApiModelProperty(value = "字段id")
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
@ApiModelProperty(value = "字段名")
@TableField("field_name")
@@ -36,19 +38,19 @@
@ApiModelProperty(value = "字段类型（1=数字 2=文本 3=百分比）")
@TableField("field_type")
- private Integer fieldType;
+ private FieldTypeEnum fieldType;
@ApiModelProperty(value = "一级分类id")
@TableField("level_one_category_id")
- private Integer levelOneCategoryId;
+ private Long levelOneCategoryId;
@ApiModelProperty(value = "二级分类id")
@TableField("level_two_category_id")
- private Integer levelTwoCategoryId;
+ private Long levelTwoCategoryId;
@ApiModelProperty(value = "三级分类id")
@TableField("level_three_category_id")
- private Integer levelThreeCategoryId;
+ private Long levelThreeCategoryId;
@ApiModelProperty(value = "一级分类")
@TableField("level_one_category")
@@ -76,7 +78,7 @@
@ApiModelProperty(value = "文本输入类型（1=手动输入 2=固定内容）")
@TableField("text_input_type")
- private Integer textInputType;
+ private FieldInputTypeEnum textInputType;
@ApiModelProperty(value = "文本最少字数")
@TableField("text_min_num")
@@ -96,20 +98,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