From a06e2ee701ee4b8d8553a164cdfaf4e45cb3a080 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 11 Oct 2022 17:58:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E8=BF=94=E5=9B=9Eorigin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/ProjectManageListResultDTO.java  | 11 ++++++++++-
 .../src/main/resources/mapper/ProjectDao.xml          |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectManageListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectManageListResultDTO.java
index 7c9bb481e8..daf846a3a5 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectManageListResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectManageListResultDTO.java
@@ -75,7 +75,15 @@ public class ProjectManageListResultDTO implements Serializable {
     private Boolean processable;
 
     private Boolean returnable;
-
+    /**
+     * 项目来源：
+     * 来源议题 issue
+     * 项目立项 agency
+     * 旧版事件上报 resi_event
+     * 工作人员上报(巡查) work_event
+     * 新版事件上报 ic_event
+     */
+    private String origin;
     public ProjectManageListResultDTO() {
         this.gridName = "";
         this.title = "";
@@ -86,5 +94,6 @@ public class ProjectManageListResultDTO implements Serializable {
         this.status = "";
         this.departmentNameList = new ArrayList<>();
         this.projectId = "";
+        this.origin="";
     }
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
index ba340a2464..b57ebeca72 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
@@ -612,6 +612,7 @@
             p.CREATED_TIME AS shiftProjectTime,
             ps.IS_HANDLE,
             ps.CREATED_TIME AS updatedTime,
+            p.ORIGIN,
             t.*
         FROM
             (SELECT