From f20611265f7d34fd4fbcdfdaff6cb9cccd0b25fc Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 21 Jun 2024 11:53:21 +0800
Subject: [PATCH] 湖北水库:施工:项目查询过滤无效修复、根据角色查询用户

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbNorspi.java |   69 +++++++++++++++++++++++-----------
 1 files changed, 47 insertions(+), 22 deletions(-)

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 34868ab..bcc90c4 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
@@ -1,9 +1,6 @@
 package cn.gistack.sm.sjztmd.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-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;
@@ -39,8 +36,15 @@
 	 * 名称
 	 */
 	@ApiModelProperty(value = "名称")
-	@TableField("\"name\"")
+	@TableField(value = "\"name\"",fill = FieldFill.UPDATE)
 	private String name;
+
+	/**
+	 * 数量
+	 */
+	@ApiModelProperty(value = "数量")
+	@TableField(value = "\"num\"",fill = FieldFill.UPDATE)
+	private Integer num;
 
 	/**
 	 * 水库编码
@@ -53,71 +57,92 @@
 	 * 正常溢洪道型式
 	 */
 	@ApiModelProperty(value = "正常溢洪道型式")
-	@TableField("\"spillway_type\"")
-	private Integer spillwayType;
+	@TableField(value = "\"spillway_type\"",fill = FieldFill.UPDATE)
+	private String spillwayType;
 
 	/**
 	 * 是否位于坝身
 	 */
 	@ApiModelProperty(value = "是否位于坝身")
-	@TableField("\"is_loc_dam_body\"")
+	@TableField(value = "\"is_loc_dam_body\"",fill = FieldFill.UPDATE)
 	private String isLocDamBody;
 
 	/**
 	 * 是否有闸控制
 	 */
 	@ApiModelProperty(value = "是否有闸控制")
-	@TableField("\"is_gate\"")
+	@TableField(value = "\"is_gate\"",fill = FieldFill.UPDATE)
 	private String isGate;
 
 	/**
 	 * 堰顶高程
 	 */
 	@ApiModelProperty(value = "堰顶高程")
-	@TableField("\"weir_top_elevation\"")
+	@TableField(value = "\"weir_top_elevation\"",fill = FieldFill.UPDATE)
 	private Double weirTopElevation;
 
 	/**
 	 * 堰顶净宽
 	 */
 	@ApiModelProperty(value = "堰顶净宽")
-	@TableField("\"weir_top_width\"")
+	@TableField(value = "\"weir_top_width\"",fill = FieldFill.UPDATE)
 	private Double weirTopWidth;
 
 	/**
 	 * 工作闸门型式
 	 */
 	@ApiModelProperty(value = "工作闸门型式")
-	@TableField("\"working_gate_type\"")
-	private Integer workingGateType;
+	@TableField(value = "\"working_gate_type\"",fill = FieldFill.UPDATE)
+	private String workingGateType;
 
 	/**
-	 * 闸门尺寸
+	 * 闸门数量
 	 */
-	@ApiModelProperty(value = "闸门尺寸")
-	@TableField("\"gate_size\"")
-	private String gateSize;
+	@ApiModelProperty(value = "闸门数量")
+	@TableField(value = "\"gate_num\"",fill = FieldFill.UPDATE)
+	private Integer gateNum;
+
+	/**
+	 * 闸门长
+	 */
+	@ApiModelProperty(value = "闸门长")
+	@TableField(value = "\"gate_length\"",fill = FieldFill.UPDATE)
+	private Double gateLength;
+
+	/**
+	 * 闸门宽
+	 */
+	@ApiModelProperty(value = "闸门宽")
+	@TableField(value = "\"gate_wide\"",fill = FieldFill.UPDATE)
+	private Double gateWide;
 
 	/**
 	 * 最大泄洪流量
 	 */
 	@ApiModelProperty(value = "最大泄洪流量")
-	@TableField("\"checking_flood_discharge\"")
+	@TableField(value = "\"checking_flood_discharge\"",fill = FieldFill.UPDATE)
 	private Double checkingFloodDischarge;
 
 	/**
 	 * 启闭方式
 	 */
 	@ApiModelProperty(value = "启闭方式")
-	@TableField("\"oc_type\"")
-	private Integer ocType;
+	@TableField(value = "\"oc_type\"",fill = FieldFill.UPDATE)
+	private String ocType;
+
+	/**
+	 * 启闭动力
+	 */
+	@ApiModelProperty(value = "启闭动力")
+	@TableField(value = "\"oc_power\"",fill = FieldFill.UPDATE)
+	private String ocPower;
 
 	/**
 	 * 消能方式
 	 */
 	@ApiModelProperty(value = "消能方式")
-	@TableField("\"dis_energy_type\"")
-	private Integer disEnergyType;
+	@TableField(value = "\"dis_energy_type\"",fill = FieldFill.UPDATE)
+	private String disEnergyType;
 
 	/**
 	 * 填报状态(0:填写中,1:审核中,2:审核通过)

--
Gitblit v1.9.3