From 01d1bdf0076da23faaab48a6d6606ebc03aae625 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 15 Oct 2021 10:22:12 +0800
Subject: [PATCH] =?UTF-8?q?/project/uploadprojectinfo,3=E4=B8=AA=E8=A1=97?=
 =?UTF-8?q?=E9=81=93=E4=B8=8A=E4=BC=A0=E5=85=A5=E5=8F=82=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?categoryCode=EF=BC=8C=E5=80=BC=E4=B8=BA=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=9C=A8=E5=85=B6=E5=AE=A2=E6=88=B7=E4=B8=AD=E7=9A=84=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/screen/form/ScreenProjectDataInfoFormDTO.java | 11 +++++++++++
 .../screen/ScreenProjectDataEntity.java               | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java
index f0f6422e94..9202158945 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java
@@ -81,6 +81,17 @@ public class ScreenProjectDataInfoFormDTO implements Serializable {
      */
     private String projectAddress;
 
+    /**
+     *  add 20211014
+     * 项目所属编码，如果有多个，以英文顿号隔开
+     */
+    private String categoryCode;
+    /**
+     *  add 20211014
+     * 来源：议题issue  项目立项:agency 事件:resi_event
+     */
+    private String origin;
+
     /**
      * 所有分类名，用 - 连接
      */
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectDataEntity.java
index 52c9a19ab3..ac4775c311 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectDataEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectDataEntity.java
@@ -109,6 +109,17 @@ public class ScreenProjectDataEntity extends BaseEpmetEntity {
      */
 	private String projectAddress;
 
+	/**
+	 *  add 20211014
+	 * 项目所属编码，如果有多个，以英文顿号隔开
+	 */
+	private String categoryCode;
+	/**
+	 *  add 20211014
+	 * 来源：议题issue  项目立项:agency 事件:resi_event
+	 */
+	private String origin;
+
     /**
      * 所有分类名，用 - 连接
      */