From b260dfc0b511972e063403fbc8427054a93b059b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 12 Oct 2022 15:03:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=A1=88=EF=BC=8C?=
 =?UTF-8?q?=E6=9D=A5=E6=BA=90=E4=BA=8E=E4=BA=8B=E4=BB=B6-=E8=AE=AE?=
 =?UTF-8?q?=E9=A2=98-=E9=A1=B9=E7=9B=AE=E7=9A=84=EF=BC=8C=E5=9B=9E?=
 =?UTF-8?q?=E5=86=99=E4=BA=8B=E4=BB=B6=EF=BC=8Cbugfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/entity/ProjectEntity.java  |  7 +++++-
 .../service/impl/ProjectServiceImpl.java      | 23 +++++++++++--------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectEntity.java
index b5199a8392..4d8163c9ae 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectEntity.java
@@ -48,7 +48,12 @@ public class ProjectEntity extends BaseEpmetEntity {
 	private String gridId;
 
     /**
-     * 来源：议题issue  项目立项:agency
+     * 项目来源：
+	 * 来源议题 issue
+	 * 项目立项 agency
+	 * 旧版事件上报 resi_event
+	 * 工作人员上报(巡查) work_event
+	 * 新版事件上报 ic_event
      */
 	private String origin;
 
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 80d682cdff..6f58da119d 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
@@ -879,22 +879,27 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	 * @param closeCaseTime 结案时间
 	 */
 	private void modifyIcEvent(ProjectEntity projectEntity,String userId,Date closeCaseTime) {
-		boolean icEventFlag=false;
-		if("issue".equals(projectEntity.getOrigin())){
-			List<String> issueIds =new ArrayList<>();
+		boolean icEventFlag = false;
+		String icEventId = "";
+		if ("issue".equals(projectEntity.getOrigin())) {
+			List<String> issueIds = new ArrayList<>();
 			issueIds.add(projectEntity.getOrigin());
-			Result<List<IssueProfileDTO>> issueRes=govIssueOpenFeignClient.getIssueProfile(issueIds);
-			if(issueRes.success()&&CollectionUtils.isNotEmpty(issueRes.getData())){
-				if("ic_event".equals(issueRes.getData().get(NumConstant.ZERO).getIssueSourceType())){
-					icEventFlag=true;
+			Result<List<IssueProfileDTO>> issueRes = govIssueOpenFeignClient.getIssueProfile(issueIds);
+			if (issueRes.success() && CollectionUtils.isNotEmpty(issueRes.getData())) {
+				IssueProfileDTO issueProfileDTO = issueRes.getData().get(NumConstant.ZERO);
+				if ("ic_event".equals(issueProfileDTO.getIssueSourceType())) {
+					icEventFlag = true;
+					icEventId = issueProfileDTO.getSourceId();
 				}
 			}
+		} else if ("ic_event".equals(projectEntity.getOrigin())) {
+			icEventId = projectEntity.getOriginId();
 		}
-		if ("ic_event".equals(projectEntity.getOrigin())||icEventFlag) {
+		if ("ic_event".equals(projectEntity.getOrigin()) || icEventFlag) {
 			ColseProjectOrDemandFormDTO dto = new ColseProjectOrDemandFormDTO();
 			dto.setCustomerId(projectEntity.getCustomerId());
 			dto.setUserId(projectEntity.getUpdatedBy());
-			dto.setIcEventId(projectEntity.getOriginId());
+			dto.setIcEventId(icEventId);
 			dto.setType("project");
 			dto.setCloseCaseTime(closeCaseTime);
 			icEventService.closeProjectOrDemand(dto);