From 96d0fd6fb8e4dfb9763158b4ac89924b27a8db5c Mon Sep 17 00:00:00 2001
From: yxm <zhp1521624>
Date: Mon, 15 Jul 2024 16:53:44 +0800
Subject: [PATCH] 项目进度上报逻辑优化及工序配置v0.7

---
 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 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 ffdf2ae..b8cbef8 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,10 +1,13 @@
 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.*;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -169,7 +172,27 @@
 
 
 	@TableField(exist = false)
-	private List<SgGxDO> sgGxDOS;
+	private List<SgTypeVO> sgGxDOS;
+
+	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