From 2cba01a6b6f67cfa97d0c4e0cc589302fab817ba Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Wed, 24 Jul 2024 11:41:37 +0800
Subject: [PATCH] 查询有变形水库

---
 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java |   44 ++++++++++++++++++++++++++++++++++++++------
 1 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java
index 25d5ac6..1cf33fe 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java
@@ -1,11 +1,14 @@
 package cn.gistack.sm.sg.DO;
 
+import cn.gistack.sm.sg.VO.PreAcceVO;
+import cn.gistack.sm.sg.VO.SgTypeVO;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * <p>
@@ -18,6 +21,9 @@
 @Getter
 @Setter
 @TableName("SG_PROJECT_INFO")
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
 public class SgProjectInfoDO implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -72,7 +78,7 @@
     /**
      * 注册到期时间
      */
-    private LocalDateTime expTime;
+    private String expTime;
 
     /**
      * 总承包
@@ -147,7 +153,7 @@
     /**
      * 创建时间
      */
-    private LocalDateTime createTime;
+    private String createTime;
 
     /**
      * 修改人
@@ -157,10 +163,36 @@
     /**
      * 修改时间
      */
-    private LocalDateTime updateTime;
+    private String updateTime;
 
     /**
      * 水库名
      */
     private String skName;
+
+
+	@TableField(exist = false)
+	private List<SgTypeVO> sgGxDOS;
+	@TableField(exist = false)
+	private List<PreAcceVO> preAcce;
+
+
+
+	private Integer status;
+
+	@TableField(exist = false)
+	private String projectProgress;
+
+	@TableField(exist = false)
+	private BigDecimal ProjectProgressNum;
+	@TableField(exist = false)
+	private String cityNm; //市
+	@TableField(exist = false)
+	private String countyNm; //县
+	@TableField(exist = false)
+	private String townNm; //乡
+	@TableField(exist = false)
+	private String engScal; //工程规模
+	@TableField(exist = false)
+	private String basGuid; //片区
 }

--
Gitblit v1.9.3