From ae37e30dcf71113f69d11fbe7cfef389a1fb9a01 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 28 Nov 2023 17:36:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResSafetyMonitor.java | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
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 dc8909b..2bf58f0 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
@@ -1,7 +1,6 @@
package cn.gistack.sm.sjztmd.entity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -30,7 +29,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "主键")
- @TableField("\"guid\"")
+ @TableId(value = "\"guid\"",type = IdType.ASSIGN_ID)
private String guid;
/**
@@ -44,33 +43,58 @@
* 最近一次安全鉴定时间
*/
@ApiModelProperty(value = "最近一次安全鉴定时间")
- @TableField("\"safety_appraisal_time\"")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(value = "\"safety_appraisal_time\"",fill = FieldFill.UPDATE)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date safetyAppraisalTime;
/**
* 安全鉴定结论
*/
@ApiModelProperty(value = "安全鉴定结论")
- @TableField("\"safety_appraisal_result\"")
+ @TableField(value = "\"safety_appraisal_result\"",fill = FieldFill.UPDATE)
private String safetyAppraisalResult;
/**
* 控制运行水位
*/
@ApiModelProperty(value = "控制运行水位")
- @TableField("\"control_rz\"")
+ @TableField(value = "\"control_rz\"",fill = FieldFill.UPDATE)
private Double controlRz;
/**
* 工程存在问题
*/
@ApiModelProperty(value = "工程存在问题")
- @TableField("\"survey_problem\"")
+ @TableField(value = "\"survey_problem\"",fill = FieldFill.UPDATE)
private String surveyProblem;
/**
+ * 是否开展除险加固
+ */
+ @ApiModelProperty(value = "是否开展除险加固")
+ @TableField(value = "\"is_reinforce\"",fill = FieldFill.UPDATE)
+ private String isReinforce;
+
+ /**
+ * 最近一次加固开始时间
+ */
+ @ApiModelProperty(value = "最近一次加固开始时间")
+ @TableField(value = "\"reinforce_tm\"",fill = FieldFill.UPDATE)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date reinforceTm;
+
+ /**
+ * 蓄水验收时间
+ */
+ @ApiModelProperty(value = "蓄水验收时间")
+ @TableField(value = "\"completion_time\"",fill = FieldFill.UPDATE)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date completionTime;
+
+ /**
* 填报状态（0:填写中，1:审核中，2:审核通过）
*/
@ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
--
Gitblit v1.9.3