From ce7e6574a1f9942fc090d989b52aceaa11ba8f3e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 15 四月 2024 21:54:08 +0800
Subject: [PATCH] 1.得分计算部分调整； 2.大屏得分计算；
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/TbBasicData.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 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 3fd566a..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,14 +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 lombok.Data;
-import lombok.EqualsAndHashCode;
-
import java.io.Serializable;
import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* <p>
@@ -21,7 +25,7 @@
@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;
@@ -31,7 +35,7 @@
private Long id;
@ApiModelProperty(value = "季度")
- @TableField("quarter")
+ @TableField("`quarter`")
private String quarter;
@ApiModelProperty(value = "区划代码")
@@ -51,7 +55,7 @@
private String remark;
@ApiModelProperty(value = "填报状态（1=未填报 2=数据缺失 3=已填报）")
- @TableField("status")
+ @TableField("`status`")
private ReportingStatusEnum status;
@ApiModelProperty(value = "删除标志（0代表存在 1代表删除)")
@@ -75,5 +79,7 @@
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
-
+ @ApiModelProperty(value = "上报时间")
+ @TableField(value = "reporting_time")
+ private Date reportingTime;
}
--
Gitblit v1.7.1