From 7fd52560d56c7ee17b5f662d8aca68f7b61e0973 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 2 Apr 2021 17:50:02 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectServiceImpl.java      | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

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 49ce81b9c5..bebf4654b5 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
@@ -2219,6 +2219,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			if (CollectionUtils.isNotEmpty(files)) {
 				String all = String.join(StrConstant.COMMA, files);
 				platformFileDTO.setTopicImages(all);
+				applyAssistFormDTO.setImageLink(all);
 			}
 		}
 		if (CollectionUtils.isNotEmpty(topicAttachment.getData().getVoiceList())) {
@@ -2238,6 +2239,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			if (CollectionUtils.isNotEmpty(files)) {
 				String all = String.join(StrConstant.COMMA, files);
 				platformFileDTO.setTopicVoices(all);
+				applyAssistFormDTO.setVoiceLink(all);
 			}
 		}
 		if (CollectionUtils.isNotEmpty(topicAttachment.getData().getVideoList())) {
@@ -2257,6 +2259,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			if (CollectionUtils.isNotEmpty(files)) {
 				String all = String.join(StrConstant.COMMA, files);
 				platformFileDTO.setTopicVideos(all);
+				applyAssistFormDTO.setVideoLink(all);
 			}
 		}
 		if (CollectionUtils.isNotEmpty(topicAttachment.getData().getDocList())) {
@@ -2414,18 +2417,18 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		}
 		String source = "议题标题：" + sourceDTO.getIssueTitle() + "\n" +
 				"针对话题\n" +  (null == sourceDTO.getTopicContent()?"":sourceDTO.getTopicContent()) + "\n";
-		if (StringUtils.isNotEmpty(platformFileDTO.getTopicImages())) {
-			source = source + "话题图片:" + platformFileDTO.getTopicImages() + "\n";
-		}
-		if (StringUtils.isNotEmpty(platformFileDTO.getTopicVoices())) {
-			source = source + "话题语音:" + platformFileDTO.getTopicVoices() + "\n";
-		}
-		if (StringUtils.isNotEmpty(platformFileDTO.getTopicVideos())) {
-			source = source + "话题视频:" + platformFileDTO.getTopicVideos() + "\n";
-		}
-		if (StringUtils.isNotEmpty(platformFileDTO.getTopicDocs())) {
-			source = source + "话题文档:" + platformFileDTO.getTopicDocs() + "\n";
-		}
+//		if (StringUtils.isNotEmpty(platformFileDTO.getTopicImages())) {
+//			source = source + "话题图片:" + platformFileDTO.getTopicImages() + "\n";
+//		}
+//		if (StringUtils.isNotEmpty(platformFileDTO.getTopicVoices())) {
+//			source = source + "话题语音:" + platformFileDTO.getTopicVoices() + "\n";
+//		}
+//		if (StringUtils.isNotEmpty(platformFileDTO.getTopicVideos())) {
+//			source = source + "话题视频:" + platformFileDTO.getTopicVideos() + "\n";
+//		}
+//		if (StringUtils.isNotEmpty(platformFileDTO.getTopicDocs())) {
+//			source = source + "话题文档:" + platformFileDTO.getTopicDocs() + "\n";
+//		}
 		source = source + "建议采用如下处理方式\n" + sourceDTO.getIssueSuggestion() + "\n" +
 				"所属网格：" + sourceDTO.getBelongsGridName() + "\n" +
 				"话题发表人：" + sourceDTO.getTopicPublisher() + sourceDTO.getTopicPublisherMobile() + "\n" +
@@ -2447,7 +2450,6 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 					DateUtils.formatTimestamp(item.getProcessTime(), DateUtils.DATE_TIME_PATTERN) + "\n" +
 					"处理部门：" + item.getDepartmentName() + "\n" +
 					"说明：" + item.getPublicReply() + "\n";
-			//TODO 上传图片
 			detail = detail + process;
 		}
 		System.out.println(detail);