项目结案，来源于事件-议题-项目的，回写事件，bugfix

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;
 

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;
+		boolean icEventFlag = false;
-		if("issue".equals(projectEntity.getOrigin())){
+		String icEventId = "";
-			List<String> issueIds =new ArrayList<>();
+		if ("issue".equals(projectEntity.getOrigin())) {
+			List<String> issueIds = new ArrayList<>();
 			issueIds.add(projectEntity.getOrigin());
-			Result<List<IssueProfileDTO>> issueRes=govIssueOpenFeignClient.getIssueProfile(issueIds);
+			Result<List<IssueProfileDTO>> issueRes = govIssueOpenFeignClient.getIssueProfile(issueIds);
-			if(issueRes.success()&&CollectionUtils.isNotEmpty(issueRes.getData())){
+			if (issueRes.success() && CollectionUtils.isNotEmpty(issueRes.getData())) {
-				if("ic_event".equals(issueRes.getData().get(NumConstant.ZERO).getIssueSourceType())){
+				IssueProfileDTO issueProfileDTO = issueRes.getData().get(NumConstant.ZERO);
-					icEventFlag=true;
+				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);