From 9c00c5de75be77dfeb314a6fea96455af7cbf53e Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Tue, 10 Sep 2024 21:19:23 +0800
Subject: [PATCH] 湖北水库:审批修改

---
 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java |   41 +++++++++++++++++++++++++++++++----------
 1 files changed, 31 insertions(+), 10 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 6f0c4dc..de43ab8 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,5 +1,7 @@
 package cn.gistack.sm.sg.DO;
 
+import cn.gistack.sm.sg.VO.PreAcceVO;
+import cn.gistack.sm.sg.VO.PtypeVO;
 import cn.gistack.sm.sg.VO.SgTypeVO;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -80,12 +82,12 @@
     private String expTime;
 
     /**
-     * 总承包
+     * 省厅建办
      */
     private String generalContract;
 
     /**
-     * 总承包责任人
+     * 省厅建办责任人
      */
     private String generalPerson;
 
@@ -110,32 +112,32 @@
     private String controlPerson;
 
     /**
-     * 施工单位
+     * 土建施工单位
      */
     private String constructionUnit;
 
     /**
-     * 施工单位责任人
+     * 土建施工单位责任人
      */
     private String constructionPerson;
 
     /**
-     * 施工自检单位
+     * 设备施工单位
      */
     private String selfUnit;
 
     /**
-     * 施工自检单位责任人
+     * 设备施工单位责任人
      */
     private String selfPerson;
 
     /**
-     * 竣工验收检测单位
+     * 检测单位
      */
     private String acceptanceUnit;
 
     /**
-     * 竣工验收检测单位责任人
+     * 检测单位责任人
      */
     private String acceptancePerson;
 
@@ -171,13 +173,32 @@
 
 
 	@TableField(exist = false)
-	private List<SgTypeVO> sgGxDOS;
+	private List<PtypeVO> ptypeVOS;
+	@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; //片区
+
+	/**
+	 * 标段
+	 */
+	private String lot;
+
 }

--
Gitblit v1.9.3