Browse Source

projectEntity

dev
yinzuomei 3 years ago
parent
commit
a727a11282
  1. 12
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

12
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@ -884,9 +884,9 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
} }
boolean icEventFlag = false; boolean icEventFlag = false;
String icEventId = ""; String icEventId = "";
if ("issue".equals(projectEntity1.getOrigin())) { if ("issue".equals(projectEntity.getOrigin())) {
List<String> issueIds = new ArrayList<>(); List<String> issueIds = new ArrayList<>();
issueIds.add(projectEntity1.getOriginId()); issueIds.add(projectEntity.getOriginId());
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())) {
IssueProfileDTO issueProfileDTO = issueRes.getData().get(NumConstant.ZERO); IssueProfileDTO issueProfileDTO = issueRes.getData().get(NumConstant.ZERO);
@ -895,12 +895,12 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
icEventId = issueProfileDTO.getSourceId(); icEventId = issueProfileDTO.getSourceId();
} }
} }
} else if ("ic_event".equals(projectEntity1.getOrigin())) { } else if ("ic_event".equals(projectEntity.getOrigin())) {
icEventId = projectEntity1.getOriginId(); icEventId = projectEntity.getOriginId();
} }
if ("ic_event".equals(projectEntity1.getOrigin()) || icEventFlag) { if ("ic_event".equals(projectEntity.getOrigin()) || icEventFlag) {
ColseProjectOrDemandFormDTO dto = new ColseProjectOrDemandFormDTO(); ColseProjectOrDemandFormDTO dto = new ColseProjectOrDemandFormDTO();
dto.setCustomerId(projectEntity1.getCustomerId()); dto.setCustomerId(projectEntity.getCustomerId());
dto.setUserId(userId); dto.setUserId(userId);
dto.setIcEventId(icEventId); dto.setIcEventId(icEventId);
dto.setType("project"); dto.setType("project");

Loading…
Cancel
Save