From 4997b0c4897bcdbd05abb1ba080a20dfa394048f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 27 Oct 2023 23:25:02 +0800
Subject: [PATCH] 水库基本信息填报新增字段，最终审核状态设置调整
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBase.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBase.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBase.java
index ffade78..b2149ba 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBase.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBase.java
@@ -1,6 +1,7 @@
package cn.gistack.sm.sjztmd.entity;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -20,7 +21,7 @@
* @date 2023-08-14
*/
@Data
-@TableName("\"att_res_base\"")
+@TableName("\"tb_att_res_base\"")
@ApiModel(value = "水库对象", description = "水库对象")
public class TbAttResBase implements Serializable {
private static final long serialVersionUID = 1L;
@@ -30,7 +31,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "主键")
- @TableField("\"guid\"")
+ @TableId("\"guid\"")
private String guid;
/**
@@ -53,6 +54,13 @@
@ApiModelProperty(value = "建设地址")
@TableField("\"build_address\"")
private String buildAddress;
+
+ /**
+ * 建设地址(村）
+ */
+ @ApiModelProperty(value = "建设地址(村）")
+ @TableField("\"build_address_village\"")
+ private String buildAddressVillage;
/**
* 工程规模
@@ -132,6 +140,32 @@
private String resFunc;
/**
+ * 工程开工时间
+ */
+ @ApiModelProperty(value = "工程开工时间")
+ @TableField("\"start_time\"")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date startTime;
+
+ /**
+ * 下闸蓄水时间
+ */
+ @ApiModelProperty(value = "下闸蓄水时间")
+ @TableField("\"water_storage_tm\"")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date waterStorageTm;
+
+ /**
+ * 最终填报状态（总状态）（-1：未填写 0:填写中，1:审核通过）
+ */
+ @ApiModelProperty(value = "填报状态（-1：未填写 0:填写中，1:审核通过 2:审核中） ")
+ @TableField("\"final_state\"")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Integer finalState;
+
+ /**
* 填报状态（0:填写中，1:审核中，2:审核通过）
*/
@ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
@@ -163,4 +197,11 @@
@TableField("\"log\"")
private String log;
+ /**
+ * 所属行业部门
+ */
+ @ApiModelProperty(value = "所属行业部门 ")
+ @TableField("\"industry_dept\"")
+ private String industryDept;
+
}
--
Gitblit v1.9.3