From 1fd7ddbc38ab2389512e99b0a5ec125fa1e9686f Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 12 Nov 2020 14:31:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98=E8=A1=A8=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AE=AE=E9=A2=98=E6=A0=87=E8=AF=86=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/tools/constant/AppClientConstant.java      |  8 ++++++++
 .../java/com/epmet/dto/ProjectRelatedPersonnelDTO.java | 10 ++++++++++
 .../epmet/entity/ProjectRelatedPersonnelEntity.java    | 10 ++++++++++
 .../com/epmet/excel/ProjectRelatedPersonnelExcel.java  |  6 ++++++
 .../com/epmet/service/impl/ProjectServiceImpl.java     |  4 ++++
 .../V0.0.4__alter_project_related_personnel.sql        |  5 +++++
 6 files changed, 43 insertions(+)
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.4__alter_project_related_personnel.sql

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/AppClientConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/AppClientConstant.java
index 2d12ab77ce..7b08e851d5 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/AppClientConstant.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/AppClientConstant.java
@@ -54,4 +54,12 @@ public interface AppClientConstant {
      * app类型-工作端
      */
     String APP_WORK = "work";
+    /**
+     * 来源类型-话题：topic
+     */
+    String TOPIC = "topic";
+    /**
+     * 来源类型-议题：issue
+     */
+    String ISSUE = "issue";
 }
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectRelatedPersonnelDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectRelatedPersonnelDTO.java
index d01a0bc70d..4ac72f72cc 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectRelatedPersonnelDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectRelatedPersonnelDTO.java
@@ -58,6 +58,16 @@ public class ProjectRelatedPersonnelDTO implements Serializable {
      */
 	private String userId;
 
+    /**
+     * 来源类型(话题:topic 议题:issue)
+     */
+    private String sourceType;
+
+    /**
+     * 来源Id(话题或议题Id)
+     */
+    private String sourceId;
+
     /**
      * 删除标识
      */
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectRelatedPersonnelEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectRelatedPersonnelEntity.java
index b2ed014ced..6b99f72f4a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectRelatedPersonnelEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectRelatedPersonnelEntity.java
@@ -58,4 +58,14 @@ public class ProjectRelatedPersonnelEntity extends BaseEpmetEntity {
      */
 	private String userId;
 
+	/**
+	 * 来源类型(话题:topic 议题:issue)
+	 */
+	private String sourceType;
+
+	/**
+	 * 来源Id(话题或议题Id)
+	 */
+	private String sourceId;
+
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectRelatedPersonnelExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectRelatedPersonnelExcel.java
index 8cfb220d77..081bb9182d 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectRelatedPersonnelExcel.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectRelatedPersonnelExcel.java
@@ -46,6 +46,12 @@ public class ProjectRelatedPersonnelExcel {
     @Excel(name = "用户ID")
     private String userId;
 
+    @Excel(name = "来源类型")
+    private String sourceType;
+
+    @Excel(name = "来源ID")
+    private String sourceId;
+
     @Excel(name = "删除标识")
     private String delFlag;
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index fefc457aa8..c7a3d93804 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -839,8 +839,12 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		entity1.setApp(AppClientConstant.APP_RESI);
 		entity1.setGridId(issueDTO.getGridId());
 		entity1.setUserId(formDTO.getTopicDTO().getCreatedBy());
+		entity1.setSourceType(AppClientConstant.TOPIC);
+		entity1.setSourceId(formDTO.getTopicDTO().getId());
 		ProjectRelatedPersonnelEntity entity2 = ConvertUtils.sourceToTarget(entity1,ProjectRelatedPersonnelEntity.class);
 		entity2.setUserId(issueDTO.getCreatedBy());
+		entity2.setSourceType(AppClientConstant.ISSUE);
+		entity2.setSourceId(issueDTO.getId());
 		list.add(entity1);
 		list.add(entity2);
 		projectRelatedPersonnelService.insertBatch(list);
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.4__alter_project_related_personnel.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.4__alter_project_related_personnel.sql
new file mode 100644
index 0000000000..9a3bbf1344
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.4__alter_project_related_personnel.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `project_related_personnel` ADD COLUMN `SOURCE_TYPE` VARCHAR (32) CHARACTER
+SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '来源类型(话题:topic 议题:issue)' AFTER `GRID_ID`,
+ ADD COLUMN `SOURCE_ID` VARCHAR (64) CHARACTER
+SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '来源Id(话题或议题Id)' AFTER `SOURCE_TYPE`;
+