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/TbAttResWaterDelivery.java | 68 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 17 deletions(-)
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 88bf1bc..3815aec 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
@@ -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,8 +29,22 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "主键")
- @TableField("\"guid\"")
+ @TableId(value = "\"guid\"",type = IdType.ASSIGN_ID)
private String guid;
+
+ /**
+ * 名称
+ */
+ @ApiModelProperty(value = "名称")
+ @TableField(value = "\"name\"",fill = FieldFill.UPDATE)
+ private String name;
+
+ /**
+ * 数量
+ */
+ @ApiModelProperty(value = "数量")
+ @TableField(value = "\"num\"",fill = FieldFill.UPDATE)
+ private Integer num;
/**
* 水库编码
@@ -44,57 +57,78 @@
* 输水道型式
*/
@ApiModelProperty(value = "输水道型式")
- @TableField("\"aqueduct_type\"")
- private Integer aqueductType;
+ @TableField(value = "\"aqueduct_type\"",fill = FieldFill.UPDATE)
+ private String aqueductType;
/**
* 输水道长度
*/
@ApiModelProperty(value = "输水道长度")
- @TableField("\"aqueduct_length\"")
+ @TableField(value = "\"aqueduct_length\"",fill = FieldFill.UPDATE)
private Double aqueductLength;
/**
* 进口底槛高程
*/
@ApiModelProperty(value = "进口底槛高程")
- @TableField("\"threshold_elevation\"")
+ @TableField(value = "\"threshold_elevation\"",fill = FieldFill.UPDATE)
private Double thresholdElevation;
/**
* 出口底槛高程
*/
@ApiModelProperty(value = "出口底槛高程")
- @TableField("\"export_elevation\"")
+ @TableField(value = "\"export_elevation\"",fill = FieldFill.UPDATE)
private Double exportElevation;
/**
- * 断面尺寸
+ * 断面尺寸/面积
*/
- @ApiModelProperty(value = "断面尺寸")
- @TableField("\"section_size\"")
- private Double sectionSize;
+ @ApiModelProperty(value = "断面尺寸/面积")
+ @TableField(value = "\"section_wide\"",fill = FieldFill.UPDATE)
+ private Double sectionWide;
+
+ /**
+ * 断面尺寸/高
+ */
+ @ApiModelProperty(value = "断面尺寸/高")
+ @TableField(value = "\"section_high\"",fill = FieldFill.UPDATE)
+ private Double sectionHigh;
/**
* 设计流量
*/
@ApiModelProperty(value = "设计流量 ")
- @TableField("\"design_flow\"")
+ @TableField(value = "\"design_flow\"",fill = FieldFill.UPDATE)
private Double designFlow;
/**
* 工作闸门型式
*/
@ApiModelProperty(value = "工作闸门型式 ")
- @TableField("\"working_gate_type\"")
- private Integer workingGateType;
+ @TableField(value = "\"working_gate_type\"",fill = FieldFill.UPDATE)
+ private String workingGateType;
/**
* 启闭方式
*/
@ApiModelProperty(value = "启闭方式 ")
- @TableField("\"oc_type\"")
- private Double 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(value = "\"is_across_dam_body\"",fill = FieldFill.UPDATE)
+ private String isAcrossDamBody;
/**
* 填报状态（0:填写中，1:审核中，2:审核通过）
--
Gitblit v1.9.3