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/TbAttResPowerStation.java |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java
index 5b84774..323d901 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.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;
 
 	/**
@@ -41,25 +40,39 @@
 	private String resGuid;
 
 	/**
+	 * 名称
+	 */
+	@ApiModelProperty(value = "名称")
+	@TableField(value = "\"name\"",fill = FieldFill.UPDATE)
+	private String name;
+
+	/**
+	 * 数量
+	 */
+	@ApiModelProperty(value = "数量")
+	@TableField(value = "\"num\"",fill = FieldFill.UPDATE)
+	private Integer num;
+
+	/**
 	 * 厂房布置型式
 	 */
 	@ApiModelProperty(value = "厂房布置型式")
-	@TableField("\"plant_layout_type\"")
-	private Integer plantLayoutType;
+	@TableField(value = "\"plant_layout_type\"",fill = FieldFill.UPDATE)
+	private String plantLayoutType;
 
 	/**
 	 * 装机容量
 	 */
 	@ApiModelProperty(value = "装机容量")
-	@TableField("\"installed_capacity\"")
-	private Integer installedCapacity;
+	@TableField(value = "\"installed_capacity\"",fill = FieldFill.UPDATE)
+	private double installedCapacity;
 
 	/**
 	 * 平均年利用小时
 	 */
 	@ApiModelProperty(value = "平均年利用小时")
-	@TableField("\"year_avg_hour\"")
-	private Integer yearAvgHour;
+	@TableField(value = "\"year_avg_hour\"",fill = FieldFill.UPDATE)
+	private double yearAvgHour;
 
 	/**
 	 * 填报状态(0:填写中,1:审核中,2:审核通过)

--
Gitblit v1.9.3