From d61236877687dbbbfd5242ef326acf207c0953f5 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 06 Sep 2023 17:43:53 +0800
Subject: [PATCH] 基础信息表，安全鉴定表，文件上传表字段修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBase.java | 33 ++++++++++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBuildInfo.java | 4 +-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbFileStorageLocation.java | 7 +++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResSafetyMonitor.java | 18 +++++++++
4 files changed, 60 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 250485e..ed7111a 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
@@ -56,6 +56,13 @@
private String buildAddress;
/**
+ * 建设地址(村）
+ */
+ @ApiModelProperty(value = "建设地址(村）")
+ @TableField("\"build_address_village\"")
+ private String buildAddressVillage;
+
+ /**
* 工程规模
*/
@ApiModelProperty(value = "工程规模")
@@ -133,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;
+
+ /**
+ * 最终填报状态（总状态）（0:填写中，1:审核中，2:审核通过）
+ */
+ @ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
+ @TableField("\"check_state\"")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Integer finalState;
+
+ /**
* 填报状态（0:填写中，1:审核中，2:审核通过）
*/
@ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBuildInfo.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBuildInfo.java
index 420e707..db907ca 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBuildInfo.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBuildInfo.java
@@ -70,9 +70,9 @@
private Date reinforceTm;
/**
- * 最近一次加固开始时间
+ * 下闸蓄水时间
*/
- @ApiModelProperty(value = "最近一次加固开始时间")
+ @ApiModelProperty(value = "下闸蓄水时间")
@TableField("\"water_storage_tm\"")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResSafetyMonitor.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResSafetyMonitor.java
index 8dcca57..1f126bf 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResSafetyMonitor.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResSafetyMonitor.java
@@ -80,6 +80,24 @@
private String isReinforce;
/**
+ * 最近一次加固开始时间
+ */
+ @ApiModelProperty(value = "最近一次加固开始时间")
+ @TableField("\"reinforce_tm\"")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date reinforceTm;
+
+ /**
+ * 蓄水验收时间
+ */
+ @ApiModelProperty(value = "蓄水验收时间")
+ @TableField("\"completion_time\"")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date completionTime;
+
+ /**
* 填报状态（0:填写中，1:审核中，2:审核通过）
*/
@ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbFileStorageLocation.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbFileStorageLocation.java
index c6e92e4..7f5b23d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbFileStorageLocation.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbFileStorageLocation.java
@@ -50,6 +50,13 @@
private String constructionPeriodDataPath;
/**
+ * 除险加固资料路径
+ */
+ @ApiModelProperty(value = "除险加固资料路径")
+ @TableField("\"reinforce_data_path\"")
+ private String reinforceDataPath;
+
+ /**
* 第一次除险加固资料路径
*/
@ApiModelProperty(value = "第一次除险加固资料路径")
--
Gitblit v1.9.3