From 0b0470e84eae17190898f79151028ac4deacd689 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Mon, 22 Mar 2021 16:26:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=91=E9=80=81=E5=88=B0?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0=20sql=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/ProjectDetailDTO.java     | 11 ++++++++++-
 .../com/epmet/service/impl/ProjectServiceImpl.java    | 11 +++++++++--
 .../{V0.0.7__platform.sql => V0.0.8__platform.sql}    |  0
 3 files changed, 19 insertions(+), 3 deletions(-)
 rename epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/{V0.0.7__platform.sql => V0.0.8__platform.sql} (100%)

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectDetailDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectDetailDTO.java
index a3fa6c0ae7..8fb394aa93 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectDetailDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectDetailDTO.java
@@ -3,6 +3,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.hibernate.validator.constraints.Length;
 
 import java.io.Serializable;
 import java.util.List;
@@ -67,8 +68,16 @@ public class ProjectDetailDTO implements Serializable {
 
 	/**
 	 * 话题发表人电话
-	 * */
+	 */
 	private String topicPublisherMobile;
+	/**
+	 * 公开答复
+	 */
+	private String publicReply;
+	/**
+	 * 内部备注
+	 */
+	private String internalRemark;
 
 	@Override
 	public String toString() {
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 3429a814b6..5a6ffdd448 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
@@ -2075,9 +2075,14 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			if (CollectionUtils.isNotEmpty(imageList)) {
 				applyAssistFormDTO.setVideoLink(String.join(StrConstant.COMMA, videoList));
 			}
-
 		}
-
+		//获取工作人员信息
+		Result<CustomerStaffDTO> staffInfo = epmetUserOpenFeignClient.getCustomerStaff(formDTO.getUserId());
+		if (!staffInfo.success()) {
+			throw new RenException(staffInfo.getCode(), staffInfo.getMsg());
+		}
+		applyAssistFormDTO.setPersonName(staffInfo.getData().getRealName());
+		applyAssistFormDTO.setMobile(staffInfo.getData().getMobile());
 		//获取网格信息
 		List<ProjectRelatedPersonnelDTO> relatedPersonnel =  projectRelatedPersonnelService.getPersonnelListByProjectId(formDTO.getProjectId());
 		CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO();
@@ -2098,6 +2103,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		}
 		ProjectDetailDTO projectDetailDTO = ConvertUtils.sourceToTarget(issueDetail.getData(), ProjectDetailDTO.class);
 		projectDetailDTO = ConvertUtils.sourceToTarget(issueDetail.getData().getTopicInfo(), ProjectDetailDTO.class);
+		projectDetailDTO.setPublicReply(formDTO.getPublicReply());
+		projectDetailDTO.setInternalRemark(formDTO.getInternalRemark());
 		applyAssistFormDTO.setDetail(projectDetailDTO.toString());
 		applyAssistFormDTO.setDetailAddress(projectDetailDTO.getBelongsGridName());
 		Result result = epmetThirdOpenFeignClient.applyAssist(applyAssistFormDTO);
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.7__platform.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.8__platform.sql
similarity index 100%
rename from epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.7__platform.sql
rename to epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.8__platform.sql