From 604d00f67ddcf25a9d079ceddd1c668b2a4e5288 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 19 四月 2024 15:08:22 +0800
Subject: [PATCH] bug修复
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/TbBasicData.java | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbBasicData.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbBasicData.java
index ff8ac2a..d9f9566 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbBasicData.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbBasicData.java
@@ -1,13 +1,18 @@
package com.ruoyi.system.domain;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.enums.ReportingStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
/**
* <p>
@@ -20,20 +25,20 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("tb_basic_data")
-@ApiModel(value="TbBasicData对象", description="基础数据表")
+@ApiModel(value = "TbBasicData对象", description = "基础数据表")
public class TbBasicData implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "分类id")
+ @ApiModelProperty(value = "id")
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
@ApiModelProperty(value = "季度")
- @TableField("quarter")
+ @TableField("`quarter`")
private String quarter;
- @ApiModelProperty(value = "所属部门id")
+ @ApiModelProperty(value = "区划代码")
@TableField("dept_area_code")
private String deptAreaCode;
@@ -50,8 +55,8 @@
private String remark;
@ApiModelProperty(value = "填报状态（1=未填报 2=数据缺失 3=已填报）")
- @TableField("status")
- private Boolean status;
+ @TableField("`status`")
+ private ReportingStatusEnum status;
@ApiModelProperty(value = "删除标志（0代表存在 1代表删除)")
@TableField("del_flag")
@@ -59,20 +64,22 @@
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;
-
+ @ApiModelProperty(value = "上报时间")
+ @TableField(value = "reporting_time")
+ private Date reportingTime;
}
--
Gitblit v1.7.1