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/TbDataScreenConfig.java | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbDataScreenConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbDataScreenConfig.java index d036394..cd4e1ca 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbDataScreenConfig.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbDataScreenConfig.java @@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** * <p> @@ -27,15 +27,15 @@ @ApiModelProperty(value = "大屏数据配置id") @TableId(value = "id", type = IdType.AUTO) - private Integer id; + private Long id; @ApiModelProperty(value = "配置类型(1=风险等级设置 2=数据指标设置 3=形式指标设置)") @TableField("type") private Boolean type; @ApiModelProperty(value = "得分计算规则(多个规则使用','隔开)") - @TableField("caculate_formula") - private String caculateFormula; + @TableField("calculate_formula") + private String calculateFormula; @ApiModelProperty(value = "配置类型子类型(1=数据指标一/形式指标一 2=数据指标二/形式指标二 3=数据指标三/形式指标三 4=数据指标四/形式指标四)") @TableField("sub_type") @@ -47,20 +47,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