项目库-项目相关人员表添加话题议题标识字段

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";
 }

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;
+
     /**
      * 删除标识
      */

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;
+
 }

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;
 

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);

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`;
+