From 02b03545dc9aabcef0543e86a57e23a382b8131e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 12 Oct 2022 16:03:42 +0800
Subject: [PATCH] =?UTF-8?q?api/resi/hall/issue/detail=E8=BF=94=E5=9B=9Esou?=
 =?UTF-8?q?rceId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/controller/ProjectController.java   |  5 +++++
 .../com/epmet/service/ProjectService.java     |  3 +++
 .../service/impl/ProjectServiceImpl.java      | 19 ++++++++++---------
 .../dto/result/IssueDetailResultDTO.java      |  2 ++
 .../com/epmet/dto/result/IssueResultDTO.java  |  2 ++
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
index 6968e62398..4330ea21a7 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
@@ -451,4 +451,9 @@ public class ProjectController {
         }
     }
 
+    @PostMapping("test-close/{projectId}")
+    public Result testClose(@LoginUser TokenDto tokenDto,@PathVariable("projectId")String projectId){
+        projectService.modifyIcEvent(null,tokenDto.getUserId(),new Date(),projectId);
+        return new Result();
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
index 33a42bb28f..f588edc374 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
@@ -11,6 +11,7 @@ import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -405,4 +406,6 @@ public interface ProjectService extends BaseService<ProjectEntity> {
 	 * @return
 	 */
 	Integer deleteByOriginId(String originId, String origin);
+
+	void modifyIcEvent(ProjectEntity projectEntity, String userId, Date closeCaseTime, String projectId);
 }
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 6f58da119d..82f79d586f 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
@@ -864,7 +864,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 
 		//2022-5-19 sun 需求完成时 来源事件管理的需求需要去修改事件数据 start
 		//2022-10-11 如果项目来源于议题且议题来源于事件，也需要去回写...
-		modifyIcEvent(projectEntity,fromDTO.getUserId(),current);
+		modifyIcEvent(projectEntity,fromDTO.getUserId(),current,projectEntity.getId());
 		//2022-5-19 sun  end
 
 	}
@@ -878,12 +878,13 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	 * @param userId
 	 * @param closeCaseTime 结案时间
 	 */
-	private void modifyIcEvent(ProjectEntity projectEntity,String userId,Date closeCaseTime) {
+	 public void modifyIcEvent(ProjectEntity projectEntity,String userId,Date closeCaseTime,String projectId) {
+		ProjectEntity projectEntity1=baseDao.selectById(projectId);
 		boolean icEventFlag = false;
 		String icEventId = "";
-		if ("issue".equals(projectEntity.getOrigin())) {
+		if ("issue".equals(projectEntity1.getOrigin())) {
 			List<String> issueIds = new ArrayList<>();
-			issueIds.add(projectEntity.getOrigin());
+			issueIds.add(projectEntity1.getOrigin());
 			Result<List<IssueProfileDTO>> issueRes = govIssueOpenFeignClient.getIssueProfile(issueIds);
 			if (issueRes.success() && CollectionUtils.isNotEmpty(issueRes.getData())) {
 				IssueProfileDTO issueProfileDTO = issueRes.getData().get(NumConstant.ZERO);
@@ -892,13 +893,13 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 					icEventId = issueProfileDTO.getSourceId();
 				}
 			}
-		} else if ("ic_event".equals(projectEntity.getOrigin())) {
-			icEventId = projectEntity.getOriginId();
+		} else if ("ic_event".equals(projectEntity1.getOrigin())) {
+			icEventId = projectEntity1.getOriginId();
 		}
-		if ("ic_event".equals(projectEntity.getOrigin()) || icEventFlag) {
+		if ("ic_event".equals(projectEntity1.getOrigin()) || icEventFlag) {
 			ColseProjectOrDemandFormDTO dto = new ColseProjectOrDemandFormDTO();
-			dto.setCustomerId(projectEntity.getCustomerId());
-			dto.setUserId(projectEntity.getUpdatedBy());
+			dto.setCustomerId(projectEntity1.getCustomerId());
+			dto.setUserId(userId);
 			dto.setIcEventId(icEventId);
 			dto.setType("project");
 			dto.setCloseCaseTime(closeCaseTime);
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java
index 80b6b03abc..8b9a00446d 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java
@@ -86,6 +86,8 @@ public class IssueDetailResultDTO implements Serializable {
      */
     private String sourceType;
 
+    private String sourceId;
+
     /**
      * 发布议题的图片
      */
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
index e28a6cb033..8c20128bca 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
@@ -55,6 +55,8 @@ public class IssueResultDTO implements Serializable {
      */
     private String sourceType;
 
+
+    private String sourceId;
     /**
      * 发布议题的图片
      */