From 2239256dfbaec20e20654247383f92c0aee030c8 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 22 May 2023 21:36:16 +0800
Subject: [PATCH] 水位字段修改

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResStagChar.java      |   90 +++++++++++++++++++++++++++++++-------------
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResStagCharMapper.xml |   21 ++++++----
 2 files changed, 75 insertions(+), 36 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResStagChar.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResStagChar.java
index e0eca94..eb996fa 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResStagChar.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResStagChar.java
@@ -256,12 +256,12 @@
 	@TableField("\"flood_season_m_end\"")
 	private String floodSeasonMEnd;
 
-	/**
-	 * 主汛期讯限水位
-	 */
-	@ApiModelProperty(value = "主汛期讯限水位 ")
-	@TableField("\"flood_season_mz\"")
-	private String floodSeasonMz;
+//	/**
+//	 * 主汛期讯限水位
+//	 */
+//	@ApiModelProperty(value = "主汛期讯限水位 ")
+//	@TableField("\"flood_season_mz\"")
+//	private String floodSeasonMz;
 
 	/**
 	 * 后汛期开始时间
@@ -299,27 +299,27 @@
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date updateTime;
-
-	/**
-	 * 修改人编码
-	 */
-	@ApiModelProperty(value = "修改人编码 ")
-	@TableField("\"update_user_code\"")
-	private String updateUserCode;
-
-	/**
-	 * 修改人名称
-	 */
-	@ApiModelProperty(value = "修改人名称 ")
-	@TableField("\"update_user_name\"")
-	private String updateUserName;
-
-	/**
-	 * 修改人联系方式
-	 */
-	@ApiModelProperty(value = "修改人联系方式 ")
-	@TableField("\"update_user_phone\"")
-	private String updateUserPhone;
+//
+//	/**
+//	 * 修改人编码
+//	 */
+//	@ApiModelProperty(value = "修改人编码 ")
+//	@TableField("\"update_user_code\"")
+//	private String updateUserCode;
+//
+//	/**
+//	 * 修改人名称
+//	 */
+//	@ApiModelProperty(value = "修改人名称 ")
+//	@TableField("\"update_user_name\"")
+//	private String updateUserName;
+//
+//	/**
+//	 * 修改人联系方式
+//	 */
+//	@ApiModelProperty(value = "修改人联系方式 ")
+//	@TableField("\"update_user_phone\"")
+//	private String updateUserPhone;
 
 //	/**
 //	 * 采集时间
@@ -328,4 +328,40 @@
 //	@TableField("\"collect_time\"")
 //	private String collectTime;
 
+
+	/**
+	 * 填报校核洪水位(米)
+	 */
+	@ApiModelProperty(value = "填报校核洪水位(米) ")
+	@TableField("\"tb_chec_fl_stag\"")
+	private String tbChecFlStag;
+
+	/**
+	 * 填报死水位(米)
+	 */
+	@ApiModelProperty(value = "填报死水位(米)")
+	@TableField("\"tb_dead_stag\"")
+	private String tbDeadStag;
+
+	/**
+	 * 填报设计洪水位(米)
+	 */
+	@ApiModelProperty(value = "填报设计洪水位(米)")
+	@TableField("\"tb_des_fl_stag\"")
+	private String tbDesFlStag;
+
+	/**
+	 * 填报校核洪水位(米)
+	 */
+	@ApiModelProperty(value = "填报防洪高水位(米)")
+	@TableField("\"tb_flpr_high_stag\"")
+	private String tbFlprHighStag;
+
+	/**
+	 * 填报正常蓄水位(米)
+	 */
+	@ApiModelProperty(value = "填报正常蓄水位(米) ")
+	@TableField("\"tb_norm_pool_stag\"")
+	private String tbNormPoolStag;
+
 }
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResStagCharMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResStagCharMapper.xml
index e9118b5..56a71fd 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResStagCharMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResStagCharMapper.xml
@@ -96,9 +96,6 @@
         <if test="attResStagChar.floodSeasonMEnd !=null  and attResStagChar.floodSeasonMEnd != '' ">
             "flood_season_m_end" = #{attResStagChar.floodSeasonMEnd},
         </if>
-        <if test="attResStagChar.floodSeasonMz !=null  and attResStagChar.floodSeasonMz != '' ">
-            "flood_season_mz" = #{attResStagChar.floodSeasonMz},
-        </if>
         <if test="attResStagChar.floodSeasonAStart !=null  and attResStagChar.floodSeasonAStart != '' ">
             "flood_season_a_start" = #{attResStagChar.floodSeasonAStart},
         </if>
@@ -108,14 +105,20 @@
         <if test="attResStagChar.floodSeasonAz !=null  and attResStagChar.floodSeasonAz != '' ">
             "flood_season_az" = #{attResStagChar.floodSeasonAz},
         </if>
-        <if test="attResStagChar.updateUserCode !=null  and attResStagChar.updateUserCode != '' ">
-            "update_user_code" = #{attResStagChar.updateUserCode},
+        <if test="attResStagChar.tbChecFlStag !=null  and attResStagChar.tbChecFlStag != '' ">
+            "tb_chec_fl_stag" = #{attResStagChar.tbChecFlStag},
         </if>
-        <if test="attResStagChar.updateUserName !=null  and attResStagChar.updateUserName != '' ">
-            "update_user_name" = #{attResStagChar.updateUserName},
+        <if test="attResStagChar.tbDeadStag !=null  and attResStagChar.tbDeadStag != '' ">
+            "tb_dead_stag" = #{attResStagChar.tbDeadStag},
         </if>
-        <if test="attResStagChar.updateUserPhone !=null  and attResStagChar.updateUserPhone != '' ">
-            "update_user_phone" = #{attResStagChar.updateUserPhone},
+        <if test="attResStagChar.tbDesFlStag !=null  and attResStagChar.tbDesFlStag != '' ">
+            "tb_des_fl_stag" = #{attResStagChar.tbDesFlStag},
+        </if>
+        <if test="attResStagChar.tbFlprHighStag !=null  and attResStagChar.tbFlprHighStag != '' ">
+            "tb_flpr_high_stag" = #{attResStagChar.tbFlprHighStag},
+        </if>
+        <if test="attResStagChar.tbNormPoolStag !=null  and attResStagChar.tbNormPoolStag != '' ">
+            "tb_norm_pool_stag" = #{attResStagChar.tbNormPoolStag},
         </if>
             "update_time" = #{attResStagChar.updateTime}
             WHERE "res_guid" = #{attResStagChar.resGuid}

--
Gitblit v1.9.3