From cf8e55ddcdfb67f34672fdb6df2b48c094a51c96 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 24 Aug 2023 17:47:07 +0800
Subject: [PATCH] 水库填报部分表数据类型修改

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbNorspi.java          |    4 ++--
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbSpillway.java        |    4 ++--
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterDelivery.java      |    4 ++--
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResMgrSysB.java            |    4 ++--
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterBlock.java         |   10 +++++-----
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResInformationProject.java |   18 +++++++++---------
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResInformationProject.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResInformationProject.java
index 5e8d562..217af10 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResInformationProject.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResInformationProject.java
@@ -47,49 +47,49 @@
 	 */
 	@ApiModelProperty(value = "运行状态")
 	@TableField("\"run_status\"")
-	private Integer runStatus;
+	private String runStatus;
 
 	/**
 	 * 是否有水雨情测报雨量
 	 */
 	@ApiModelProperty(value = "是否有水雨情测报雨量")
 	@TableField("\"is_rain\"")
-	private Integer isRain;
+	private String isRain;
 
 	/**
 	 * 是否有水雨情测报水位
 	 */
 	@ApiModelProperty(value = "是否有水雨情测报水位")
 	@TableField("\"is_rsvr\"")
-	private Integer isRsvr;
+	private String isRsvr;
 
 	/**
 	 * 是否有大坝安全监测水平位移
 	 */
 	@ApiModelProperty(value = "是否有大坝安全监测水平位移")
 	@TableField("\"is_gnss_horizontal\"")
-	private Integer isGnssHorizontal;
+	private String isGnssHorizontal;
 
 	/**
 	 * 是否有大坝安全监测垂直位移
 	 */
 	@ApiModelProperty(value = "是否有大坝安全监测垂直位移")
 	@TableField("\"is_gnss_vertical\"")
-	private Integer isGnssVertical;
+	private String isGnssVertical;
 
 	/**
 	 * 是否有大坝安全监测渗透压力
 	 */
 	@ApiModelProperty(value = "是否有大坝安全监测渗透压力")
 	@TableField("\"is_sppr\"")
-	private Integer isSppr;
+	private String isSppr;
 
 	/**
 	 * 是否有大坝安全监测渗流(漏)量
 	 */
 	@ApiModelProperty(value = "是否有大坝安全监测渗流(漏)量")
 	@TableField("\"is_spqnmp\"")
-	private Integer isSpqnmp;
+	private String isSpqnmp;
 
 
 	/**
@@ -97,14 +97,14 @@
 	 */
 	@ApiModelProperty(value = "是否有视频监视 ")
 	@TableField("\"is_wmst\"")
-	private Integer isWmst;
+	private String isWmst;
 
 	/**
 	 * 是否有白蚁监测
 	 */
 	@ApiModelProperty(value = "是否有白蚁监测 ")
 	@TableField("\"is_termites\"")
-	private Integer isTermites;
+	private String isTermites;
 
 	/**
 	 * 填报状态(0:填写中,1:审核中,2:审核通过)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResMgrSysB.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResMgrSysB.java
index 81922e2..3ba81c1 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResMgrSysB.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResMgrSysB.java
@@ -75,14 +75,14 @@
 	 */
 	@ApiModelProperty(value = "人员经费来源")
 	@TableField("\"person_economic_source\"")
-	private Integer personEconomicSource;
+	private String personEconomicSource;
 
 	/**
 	 * 维修养护经费来源
 	 */
 	@ApiModelProperty(value = "维修养护经费来源 ")
 	@TableField("\"maintenance_economic_source\"")
-	private Integer maintenanceEconomicSource;
+	private String maintenanceEconomicSource;
 
 	/**
 	 * 填报状态(0:填写中,1:审核中,2:审核通过)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbNorspi.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbNorspi.java
index 712146c..34868ab 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbNorspi.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbNorspi.java
@@ -61,14 +61,14 @@
 	 */
 	@ApiModelProperty(value = "是否位于坝身")
 	@TableField("\"is_loc_dam_body\"")
-	private Integer isLocDamBody;
+	private String isLocDamBody;
 
 	/**
 	 * 是否有闸控制
 	 */
 	@ApiModelProperty(value = "是否有闸控制")
 	@TableField("\"is_gate\"")
-	private Integer isGate;
+	private String isGate;
 
 	/**
 	 * 堰顶高程
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbSpillway.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbSpillway.java
index b511dfa..d301b72 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbSpillway.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbSpillway.java
@@ -54,7 +54,7 @@
 	 */
 	@ApiModelProperty(value = "洞(孔)身型式")
 	@TableField("\"spillway_type\"")
-	private Integer spillwayType;
+	private String spillwayType;
 
 	/**
 	 * 洞长
@@ -103,7 +103,7 @@
 	 */
 	@ApiModelProperty(value = "启闭方式 ")
 	@TableField("\"oc_type\"")
-	private Double ocType;
+	private Integer ocType;
 
 	/**
 	 * 填报状态(0:填写中,1:审核中,2:审核通过)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterBlock.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterBlock.java
index 76a1255..7d93859 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterBlock.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterBlock.java
@@ -96,7 +96,7 @@
 	 */
 	@ApiModelProperty(value = "主坝是否兼作交通公路 ")
 	@TableField("\"is_traffic\"")
-	private Integer isTraffic;
+	private String isTraffic;
 
 	/**
 	 * 防浪墙顶高程
@@ -110,21 +110,21 @@
 	 */
 	@ApiModelProperty(value = "上游护坝型式 ")
 	@TableField("\"up_dam_protect_type\"")
-	private Integer upDamProtectType;
+	private String upDamProtectType;
 
 	/**
 	 * 下游护坝型式
 	 */
 	@ApiModelProperty(value = "下游护坝型式 ")
 	@TableField("\"down_dam_protect_type\"")
-	private Integer downDamProtectType;
+	private String downDamProtectType;
 
 	/**
 	 * 主坝坝体防渗型式
 	 */
 	@ApiModelProperty(value = "主坝坝体防渗型式 ")
 	@TableField("\"dam_main_body_type\"")
-	private Integer damMainBodyType;
+	private String damMainBodyType;
 
 	/**
 	 * 主坝防渗体顶部高程
@@ -138,7 +138,7 @@
 	 */
 	@ApiModelProperty(value = "主坝排水形式 ")
 	@TableField("\"dam_main_drain_type\"")
-	private Integer damMainDrainType;
+	private String damMainDrainType;
 
 	/**
 	 * 坝基防渗型式
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterDelivery.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterDelivery.java
index a17ac63..f0700b6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterDelivery.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterDelivery.java
@@ -96,14 +96,14 @@
 	 */
 	@ApiModelProperty(value = "工作闸门型式 ")
 	@TableField("\"working_gate_type\"")
-	private Integer workingGateType;
+	private String workingGateType;
 
 	/**
 	 * 启闭方式
 	 */
 	@ApiModelProperty(value = "启闭方式 ")
 	@TableField("\"oc_type\"")
-	private Double ocType;
+	private String ocType;
 
 	/**
 	 * 填报状态(0:填写中,1:审核中,2:审核通过)

--
Gitblit v1.9.3