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/TbAttResEngBene.java | 60 ++++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResEngBene.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResEngBene.java
index 1b4fc03..a0c07bd 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResEngBene.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResEngBene.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,7 +29,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "主键")
- @TableField("\"guid\"")
+ @TableId(value = "\"guid\"",type = IdType.ASSIGN_ID)
private String guid;
/**
@@ -44,115 +43,136 @@
* 防洪保护对象
*/
@ApiModelProperty(value = "防洪保护对象")
- @TableField("\"fl_control_project\"")
- private Integer flControlProject;
+ @TableField(value = "\"fl_control_project\"",fill = FieldFill.UPDATE)
+ private String flControlProject;
/**
* 城市
*/
@ApiModelProperty(value = "城市")
- @TableField("\"city\"")
+ @TableField(value = "\"city\"",fill = FieldFill.UPDATE)
private String city;
/**
* 集镇
*/
@ApiModelProperty(value = "集镇")
- @TableField("\"town\"")
+ @TableField(value = "\"town\"",fill = FieldFill.UPDATE)
private String town;
/**
* 铁站
*/
@ApiModelProperty(value = "铁站")
- @TableField("\"railway\"")
+ @TableField(value = "\"railway\"",fill = FieldFill.UPDATE)
private String railway;
/**
* 公路
*/
@ApiModelProperty(value = "公路")
- @TableField("\"highway\"")
+ @TableField(value = "\"highway\"",fill = FieldFill.UPDATE)
private String highway;
/**
* 重要管线通信设施
*/
@ApiModelProperty(value = "重要管线通信设施 ")
- @TableField("\"import_communication\"")
+ @TableField(value = "\"import_communication\"",fill = FieldFill.UPDATE)
private String importCommunication;
/**
* 重要厂矿企业
*/
@ApiModelProperty(value = "重要厂矿企业 ")
- @TableField("\"import_factory\"")
+ @TableField(value = "\"import_factory\"",fill = FieldFill.UPDATE)
private String importFactory;
/**
* 其他重要设施
*/
@ApiModelProperty(value = "其他重要设施 ")
- @TableField("\"import_other_fac\"")
+ @TableField(value = "\"import_other_fac\"",fill = FieldFill.UPDATE)
private String importOtherFac;
/**
* 防洪保护人口
*/
@ApiModelProperty(value = "防洪保护人口 ")
- @TableField("\"fl_control_person\"")
+ @TableField(value = "\"fl_control_person\"",fill = FieldFill.UPDATE)
private Integer flControlPerson;
/**
* 防洪保护耕地
*/
@ApiModelProperty(value = "防洪保护耕地 ")
- @TableField("\"fl_control_land\"")
+ @TableField(value = "\"fl_control_land\"",fill = FieldFill.UPDATE)
private Double flControlLand;
/**
* 多年平均灌溉水量
*/
@ApiModelProperty(value = "多年平均灌溉水量 ")
- @TableField("\"moyear_irr_avg\"")
+ @TableField(value = "\"moyear_irr_avg\"",fill = FieldFill.UPDATE)
private Double moyearIrrAvg;
/**
* 灌溉对象
*/
@ApiModelProperty(value = "灌溉对象 ")
- @TableField("\"irr_object\"")
+ @TableField(value = "\"irr_object\"",fill = FieldFill.UPDATE)
private String irrObject;
/**
* 供水对象
*/
@ApiModelProperty(value = "供水对象 ")
- @TableField("\"supply_object\"")
+ @TableField(value = "\"supply_object\"",fill = FieldFill.UPDATE)
private String supplyObject;
+
+ /**
+ * 供水人口
+ */
+ @ApiModelProperty(value = "供水人口 ")
+ @TableField(value = "\"supply_population\"",fill = FieldFill.UPDATE)
+ private String supplyPopulation;
/**
* 多年平均供水量
*/
@ApiModelProperty(value = "多年平均供水量 ")
- @TableField("\"moyear_supply_avg\"")
+ @TableField(value = "\"moyear_supply_avg\"",fill = FieldFill.UPDATE)
private Double moyearSupplyAvg;
/**
* 多年平均年发电量
*/
@ApiModelProperty(value = "多年平均年发电量 ")
- @TableField("\"moyear_power_avg\"")
+ @TableField(value = "\"moyear_power_avg\"",fill = FieldFill.UPDATE)
private Double moyearPowerAvg;
/**
* 生态流量
*/
@ApiModelProperty(value = "生态流量 ")
- @TableField("\"ecological_flow\"")
+ @TableField(value = "\"ecological_flow\"",fill = FieldFill.UPDATE)
private Double ecologicalFlow;
/**
+ * 设计灌溉面积
+ */
+ @ApiModelProperty(value = "设计灌溉面积 ")
+ @TableField(value = "\"des_irr_area\"",fill = FieldFill.UPDATE)
+ private Double desIrrArea;
+
+ /**
+ * 校核灌溉面积
+ */
+ @ApiModelProperty(value = "校核灌溉面积 ")
+ @TableField(value = "\"chec_irr_area\"",fill = FieldFill.UPDATE)
+ private Double checIrrArea;
+
+ /**
* 填报状态（0:填写中，1:审核中，2:审核通过）
*/
@ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
--
Gitblit v1.9.3