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/TbResGeneralInvestigation.java |   72 +++++++++++++++++++++++++++++++++++-
 1 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResGeneralInvestigation.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResGeneralInvestigation.java
index 80a5143..96547f6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResGeneralInvestigation.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResGeneralInvestigation.java
@@ -35,6 +35,34 @@
 	private String guid;
 
 	/**
+	 * 填报年度
+	 */
+	@ApiModelProperty(value = "填报年度")
+	@TableField("\"tb_year\"")
+	private Integer tbYear;
+
+	/**
+	 * 填报季度
+	 */
+	@ApiModelProperty(value = "填报季度")
+	@TableField(value = "\"tb_quarter\"", fill = FieldFill.UPDATE)
+	private String tbQuarter;
+
+	/**
+	 * 是否普查完成
+	 */
+	@ApiModelProperty(value = "是否普查完成")
+	@TableField("\"is_inv_com\"")
+	private Integer isInvCom;
+
+	/**
+	 * 年度填报状态表id
+	 */
+	@ApiModelProperty(value = "年度填报状态表id")
+	@TableField(value = "\"tb_state_id\"", fill = FieldFill.UPDATE)
+	private String tbStateId;
+
+	/**
 	 * 水库编码
 	 */
 	@ApiModelProperty(value = "水库编码")
@@ -54,6 +82,31 @@
 	@ApiModelProperty(value = "普查种类(白蚁、獾、狐、鼠等)")
 	@TableField(value = "\"investigation_variety\"", fill = FieldFill.UPDATE)
 	private String investigationVariety;
+
+	/**
+	 * 是否蚁患
+	 */
+	@ApiModelProperty(value = "是否蚁患")
+	@TableField(value = "\"is_ant_infestation\"", fill = FieldFill.UPDATE)
+	private String isAntInfestation;
+	/**
+	 * 是否蚁源
+	 */
+	@ApiModelProperty(value = "是否蚁源")
+	@TableField(value = "\"is_ant_source\"", fill = FieldFill.UPDATE)
+	private String isAntSource;
+	/**
+	 * 部位
+	 */
+	@ApiModelProperty(value = "部位")
+	@TableField(value = "\"part_place\"", fill = FieldFill.UPDATE)
+	private String partPlace;
+	/**
+	 * 部位
+	 */
+	@ApiModelProperty(value = "部位描述")
+	@TableField(value = "\"part_place_info\"", fill = FieldFill.UPDATE)
+	private String partPlaceInfo;
 
 	/**
 	 * 普查面积
@@ -82,6 +135,14 @@
 	@ApiModelProperty(value = "危害等级")
 	@TableField(value = "\"hazard_rating\"", fill = FieldFill.UPDATE)
 	private String hazardRating;
+
+	/**
+	 * 普查长度
+	 */
+	@ApiModelProperty(value = "普查长度")
+	@TableField(value = "\"investigation_length\"", fill = FieldFill.UPDATE)
+	private Double investigationLength;
+
 
 	/**
 	 * 白蚁活动迹象
@@ -116,14 +177,14 @@
 	 */
 	@ApiModelProperty(value = "图片数组")
 	@TableField(value = "\"image_urls\"", fill = FieldFill.UPDATE, typeHandler = FastjsonTypeHandler.class)
-	private Object imageUrls;
+	private Object[] imageUrls;
 
 	/**
 	 * 视频数组
 	 */
 	@ApiModelProperty(value = "视频数组")
 	@TableField(value = "\"video_urls\"", fill = FieldFill.UPDATE, typeHandler = FastjsonTypeHandler.class)
-	private Object videoUrls;
+	private Object[] videoUrls;
 
 	/**
 	 * 经度
@@ -156,4 +217,11 @@
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date createTime;
 
+	/**
+	 * 纬度
+	 */
+	@ApiModelProperty(value = "纬度")
+	@TableField(value = "\"create_user\"", fill = FieldFill.UPDATE)
+	private String createUser;
+
 }

--
Gitblit v1.9.3