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 issueIds =new ArrayList<>(); + issueIds.add(projectEntity.getOrigin()); + Result> 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