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/TbAttResStagChar.java | 124 ++++++++++++++++++++++-------------------
1 files changed, 66 insertions(+), 58 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResStagChar.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResStagChar.java
index 4fcf21c..961e444 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResStagChar.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResStagChar.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;
@@ -31,7 +30,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "主键")
- @TableField("\"guid\"")
+ @TableId(value = "\"guid\"",type = IdType.ASSIGN_ID)
private String guid;
/**
@@ -45,230 +44,230 @@
* 坝址以上控制流域
*/
@ApiModelProperty(value = "坝址以上控制流域")
- @TableField("\"con_area\"")
+ @TableField(value = "\"con_area\"",fill = FieldFill.UPDATE)
private Double conArea;
/**
* 多年平均降雨量
*/
@ApiModelProperty(value = "多年平均降雨量")
- @TableField("\"moyear_rain_avg\"")
+ @TableField(value = "\"moyear_rain_avg\"",fill = FieldFill.UPDATE)
private Double moyearRainAvg;
/**
* 多年平均径流量
*/
@ApiModelProperty(value = "多年平均径流量")
- @TableField("\"moyear_fl_avg\"")
+ @TableField(value = "\"moyear_fl_avg\"",fill = FieldFill.UPDATE)
private Double moyearFlAvg;
/**
* 下游河道安全泄量
*/
@ApiModelProperty(value = "下游河道安全泄量")
- @TableField("\"down_waco_safe_disc\"")
+ @TableField(value = "\"down_waco_safe_disc\"",fill = FieldFill.UPDATE)
private Double downWacoSafeDisc;
/**
* 设计洪水标准
*/
@ApiModelProperty(value = "设计洪水标准")
- @TableField("\"des_fl_sta\"")
+ @TableField(value = "\"des_fl_sta\"",fill = FieldFill.UPDATE)
private String desFlSta;
/**
* 设计洪水流量
*/
@ApiModelProperty(value = "设计洪水流量 ")
- @TableField("\"des_fl_flow\"")
+ @TableField(value = "\"des_fl_flow\"",fill = FieldFill.UPDATE)
private Double desFlFlow;
/**
* 设计洪水位
*/
@ApiModelProperty(value = "设计洪水位 ")
- @TableField("\"des_fl_stag\"")
+ @TableField(value = "\"des_fl_stag\"",fill = FieldFill.UPDATE)
private Double desFlStag;
/**
* 设计洪水1小时洪水洪量
*/
@ApiModelProperty(value = "设计洪水1小时洪水洪量 ")
- @TableField("\"des_fl_1h_cap\"")
+ @TableField(value = "\"des_fl_1h_cap\"",fill = FieldFill.UPDATE)
private Double desFl1hCap;
/**
* 设计洪水3小时洪水洪量
*/
@ApiModelProperty(value = "设计洪水3小时洪水洪量 ")
- @TableField("\"des_fl_3h_cap\"")
+ @TableField(value = "\"des_fl_3h_cap\"",fill = FieldFill.UPDATE)
private Double desFl3hCap;
/**
* 设计洪水6小时洪水洪量
*/
@ApiModelProperty(value = "设计洪水6小时洪水洪量 ")
- @TableField("\"des_fl_6h_cap\"")
+ @TableField(value = "\"des_fl_6h_cap\"",fill = FieldFill.UPDATE)
private Double desFl6hCap;
/**
* 设计洪水12小时洪水洪量
*/
@ApiModelProperty(value = "设计洪水12小时洪水洪量 ")
- @TableField("\"des_fl_12h_cap\"")
+ @TableField(value = "\"des_fl_12h_cap\"",fill = FieldFill.UPDATE)
private Double desFl12hCap;
/**
* 设计洪水1日洪水洪量
*/
@ApiModelProperty(value = "设计洪水1日洪水洪量 ")
- @TableField("\"des_fl_1day_cap\"")
+ @TableField(value = "\"des_fl_1day_cap\"",fill = FieldFill.UPDATE)
private Double desFl1dayCap;
/**
* 设计洪水3日洪水洪量
*/
@ApiModelProperty(value = "设计洪水3日洪水洪量 ")
- @TableField("\"des_fl_3day_cap\"")
+ @TableField(value = "\"des_fl_3day_cap\"",fill = FieldFill.UPDATE)
private Double desFl3dayCap;
/**
* 校核洪水标准
*/
@ApiModelProperty(value = "校核洪水标准")
- @TableField("\"chec_fl_sta\"")
+ @TableField(value = "\"chec_fl_sta\"",fill = FieldFill.UPDATE)
private String checFlSta;
/**
* 校核洪水流量
*/
@ApiModelProperty(value = "校核洪水流量")
- @TableField("\"chec_fl_flow\"")
+ @TableField(value = "\"chec_fl_flow\"",fill = FieldFill.UPDATE)
private Double checFlFlow;
/**
* 校核洪水位
*/
@ApiModelProperty(value = "校核洪水位")
- @TableField("\"chec_fl_stag\"")
+ @TableField(value = "\"chec_fl_stag\"",fill = FieldFill.UPDATE)
private Double checFlStag;
/**
* 校核洪水1小时洪水洪量
*/
@ApiModelProperty(value = "校核洪水1小时洪水洪量")
- @TableField("\"chec_fl_1h_cap\"")
+ @TableField(value = "\"chec_fl_1h_cap\"",fill = FieldFill.UPDATE)
private Double checFl1hCap;
/**
* 校核洪水3小时洪水洪量
*/
@ApiModelProperty(value = "校核洪水3小时洪水洪量")
- @TableField("\"chec_fl_3h_cap\"")
+ @TableField(value = "\"chec_fl_3h_cap\"",fill = FieldFill.UPDATE)
private Double checFl3hCap;
/**
* 校核洪水6小时洪水洪量
*/
@ApiModelProperty(value = "校核洪水6小时洪水洪量")
- @TableField("\"chec_fl_6h_cap\"")
+ @TableField(value = "\"chec_fl_6h_cap\"",fill = FieldFill.UPDATE)
private Double checFl6hCap;
/**
* 校核洪水12小时洪水洪量
*/
@ApiModelProperty(value = "校核洪水12小时洪水洪量")
- @TableField("\"chec_fl_12h_cap\"")
+ @TableField(value = "\"chec_fl_12h_cap\"",fill = FieldFill.UPDATE)
private Double checFl12hCap;
/**
* 校核洪水1日洪水洪量
*/
@ApiModelProperty(value = "校核洪水1日洪水洪量")
- @TableField("\"chec_fl_1day_cap\"")
+ @TableField(value = "\"chec_fl_1day_cap\"",fill = FieldFill.UPDATE)
private Double checFl1dayCap;
/**
* 校核洪水3日洪水洪量
*/
@ApiModelProperty(value = "校核洪水3日洪水洪量")
- @TableField("\"chec_fl_3day_cap\"")
+ @TableField(value = "\"chec_fl_3day_cap\"",fill = FieldFill.UPDATE)
private Double checFl3dayCap;
/**
* 调节性能
*/
@ApiModelProperty(value = "调节性能")
- @TableField("\"adjust_prop\"")
+ @TableField(value = "\"adjust_prop\"",fill = FieldFill.UPDATE)
private String adjustProp;
/**
* 防洪高水位
*/
@ApiModelProperty(value = "防洪高水位")
- @TableField("\"fl_con_top_stag\"")
+ @TableField(value = "\"fl_con_top_stag\"",fill = FieldFill.UPDATE)
private Double flConTopStag;
/**
* 正常蓄水位
*/
@ApiModelProperty(value = "正常蓄水位")
- @TableField("\"cor_norm_stag\"")
+ @TableField(value = "\"cor_norm_stag\"",fill = FieldFill.UPDATE)
private Double corNormStag;
/**
* 死水位
*/
@ApiModelProperty(value = "死水位")
- @TableField("\"dead_stag\"")
+ @TableField(value = "\"dead_stag\"",fill = FieldFill.UPDATE)
private Double deadStag;
/**
* 总库容
*/
@ApiModelProperty(value = "总库容")
- @TableField("\"total_cap\"")
+ @TableField(value = "\"total_cap\"",fill = FieldFill.UPDATE)
private Double totalCap;
/**
* 调洪库容
*/
@ApiModelProperty(value = "调洪库容")
- @TableField("\"flpr_cap\"")
+ @TableField(value = "\"flpr_cap\"",fill = FieldFill.UPDATE)
private Double flprCap;
/**
* 防洪库容
*/
@ApiModelProperty(value = "防洪库容")
- @TableField("\"fl_stor_cap\"")
+ @TableField(value = "\"fl_stor_cap\"",fill = FieldFill.UPDATE)
private Double flStorCap;
/**
* 兴利库容
*/
@ApiModelProperty(value = "兴利库容")
- @TableField("\"adjust_stor_cap\"")
+ @TableField(value = "\"adjust_stor_cap\"",fill = FieldFill.UPDATE)
private Double adjustStorCap;
/**
* 死库容
*/
@ApiModelProperty(value = "死库容")
- @TableField("\"dead_cap\"")
+ @TableField(value = "\"dead_cap\"",fill = FieldFill.UPDATE)
private Double deadCap;
/**
* 前汛期水位
*/
@ApiModelProperty(value = "前汛期水位")
- @TableField("\"before_flood_stag\"")
+ @TableField(value = "\"before_flood_stag\"",fill = FieldFill.UPDATE)
private Double beforeFloodStag;
/**
* 中汛期水位
*/
@ApiModelProperty(value = "中汛期水位")
- @TableField("\"mid_flood_stag\"")
+ @TableField(value = "\"mid_flood_stag\"",fill = FieldFill.UPDATE)
private Double midFloodStag;
@@ -276,74 +275,83 @@
* 后汛期水位
*/
@ApiModelProperty(value = "后汛期水位")
- @TableField("\"after_flood_stag\"")
+ @TableField(value = "\"after_flood_stag\"",fill = FieldFill.UPDATE)
private Double afterFloodStag;
+
+ /**
+ * 前汛期开始时间
+ */
+ @ApiModelProperty(value = "前汛期开始时间 ")
+ @TableField(value = "\"before_flood_start\"",fill = FieldFill.UPDATE)
+ @DateTimeFormat(pattern = "MM-dd")
+ @JsonFormat(pattern = "MM-dd")
+ private Date beforeFloodStart;
/**
* 前汛期结束时间
*/
@ApiModelProperty(value = "前汛期结束时间 ")
- @TableField("\"before_flood_end\"")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(value = "\"before_flood_end\"",fill = FieldFill.UPDATE)
+ @DateTimeFormat(pattern = "MM-dd")
+ @JsonFormat(pattern = "MM-dd")
private Date beforeFloodEnd;
/**
* 中汛期开始时间
*/
@ApiModelProperty(value = "中汛期开始时间 ")
- @TableField("\"mid_flood_start\"")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(value = "\"mid_flood_start\"",fill = FieldFill.UPDATE)
+ @DateTimeFormat(pattern = "MM-dd")
+ @JsonFormat(pattern = "MM-dd")
private Date midFloodStart;
/**
* 中汛期结束时间
*/
@ApiModelProperty(value = "中汛期结束时间 ")
- @TableField("\"mid_flood_end\"")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(value = "\"mid_flood_end\"",fill = FieldFill.UPDATE)
+ @DateTimeFormat(pattern = "MM-dd")
+ @JsonFormat(pattern = "MM-dd")
private Date midFloodEnd;
/**
* 后汛期开始时间
*/
@ApiModelProperty(value = "后汛期开始时间 ")
- @TableField("\"after_flood_start\"")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(value = "\"after_flood_start\"",fill = FieldFill.UPDATE)
+ @DateTimeFormat(pattern = "MM-dd")
+ @JsonFormat(pattern = "MM-dd")
private Date afterFloodStart;
/**
* 后汛期结束时间
*/
@ApiModelProperty(value = "后汛期结束时间 ")
- @TableField("\"after_flood_end\"")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(value = "\"after_flood_end\"",fill = FieldFill.UPDATE)
+ @DateTimeFormat(pattern = "MM-dd")
+ @JsonFormat(pattern = "MM-dd")
private Date afterFloodEnd;
/**
* 设计洪水位最大下泄流量
*/
@ApiModelProperty(value = "设计洪水位最大下泄流量 ")
- @TableField("\"des_flood_flow_max\"")
+ @TableField(value = "\"des_flood_flow_max\"",fill = FieldFill.UPDATE)
private Double desFloodFlowMax;
/**
* 校核洪水位是最大下泄流量
*/
@ApiModelProperty(value = "校核洪水位是最大下泄流量 ")
- @TableField("\"chec_flood_flow_max\"")
+ @TableField(value = "\"chec_flood_flow_max\"",fill = FieldFill.UPDATE)
private Double checFloodFlowMax;
/**
* 填报状态（0:填写中，1:审核中，2:审核通过）
*/
@ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
- @TableField("\"check_state\"")
+ @TableField(value = "\"check_state\"",fill = FieldFill.UPDATE)
@JsonSerialize(using = ToStringSerializer.class)
private Integer checkState;
@@ -351,14 +359,14 @@
* 审核记录
*/
@ApiModelProperty(value = "审核记录 ")
- @TableField("\"check_log\"")
+ @TableField(value = "\"check_log\"",fill = FieldFill.UPDATE)
private String checkLog;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间 ")
- @TableField("\"create_time\"")
+ @TableField(value = "\"create_time\"",fill = FieldFill.UPDATE)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@@ -367,7 +375,7 @@
* 操作记录
*/
@ApiModelProperty(value = "操作记录 ")
- @TableField("\"log\"")
+ @TableField(value = "\"log\"",fill = FieldFill.UPDATE)
private String log;
}
--
Gitblit v1.9.3