From acf79177a6aaf082c97ade870e79600710d9fffc Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 11 Oct 2022 16:05:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6-=E9=A1=B9=E7=9B=AE=EF=BC=9B?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6-=E3=80=8B=E8=AE=AE=E9=A2=98-=E3=80=8B?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE;=E8=BF=992=E7=A7=8D=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E9=83=BD=E8=A6=81=E5=9B=9E=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectServiceImpl.java      | 37 ++++++++++++++++---
 1 file changed, 31 insertions(+), 6 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 bbc37a04b5..b2e1c6f381 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
@@ -862,17 +862,42 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		}
 
 		//2022-5-19 sun 需求完成时 来源事件管理的需求需要去修改事件数据 start
-		if ("ic_event".equals(projectEntity.getOrigin())) {
+		//2022-10-11 如果项目来源于议题且议题来源于事件，也需要去回写...
+		modifyIcEvent(projectEntity,fromDTO.getUserId(),current);
+		//2022-5-19 sun  end
+
+	}
+
+	/**
+	 * 事件-项目
+	 * 事件-议题-项目
+	 * 项目结案都需要回写事件
+	 * 单独提出来方法
+	 * @param projectEntity
+	 * @param userId
+	 * @param closeCaseTime 结案时间
+	 */
+	private void modifyIcEvent(ProjectEntity projectEntity,String userId,Date closeCaseTime) {
+		boolean icEventFlag=false;
+		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;
+				}
+			}
+		}
+		if ("ic_event".equals(projectEntity.getOrigin())||icEventFlag) {
 			ColseProjectOrDemandFormDTO dto = new ColseProjectOrDemandFormDTO();
-			dto.setCustomerId(fromDTO.getCustomerId());
-			dto.setUserId(fromDTO.getUserId());
+			dto.setCustomerId(projectEntity.getCustomerId());
+			dto.setUserId(projectEntity.getUpdatedBy());
 			dto.setIcEventId(projectEntity.getOriginId());
 			dto.setType("project");
-			dto.setCloseCaseTime(projectProcessEntity.getCreatedTime());
+			dto.setCloseCaseTime(closeCaseTime);
 			icEventService.closeProjectOrDemand(dto);
 		}
-		//2022-5-19 sun  end
-
 	}
 
 	@Override