From 14b492e2b13706af7c13a77c5e47968666972f64 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 18 May 2022 16:28:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=BD=AC=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=20+=20gridId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/ShiftProjectFormDTO.java   | 2 ++
 .../src/main/java/com/epmet/service/impl/IssueServiceImpl.java  | 1 +
 .../main/java/com/epmet/service/impl/ProjectServiceImpl.java    | 1 +
 3 files changed, 4 insertions(+)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShiftProjectFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShiftProjectFormDTO.java
index adb4ed7409..49d2afd9de 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShiftProjectFormDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShiftProjectFormDTO.java
@@ -57,5 +57,7 @@ public class ShiftProjectFormDTO implements Serializable {
      */
     private String customerId;
 
+    private String gridId;
+
 }
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index fd4f54a866..8722a0c027 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -1014,6 +1014,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 
             //3:调用gov-project服务，新增项目各业务表初始数据
             formDTO.setCategoryList(categoryList);
+            formDTO.setGridId(entity.getGridId());
             List<IssueTagsDTO> tagList = issueTagsService.getTagsByIssue(formDTO.getIssueId());
             formDTO.setTagList(tagList);
             Result<IssueProjectResultDTO> resultDTO = govProjectFeignClient.issueShiftProject(formDTO);
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 76a3149704..e0c7df913d 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
@@ -1162,6 +1162,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		projectEntity.setTitle(issueDTO.getIssueTitle());
 		projectEntity.setStatus(ProjectConstant.PENDING);
 		projectEntity.setOrgIdPath(issueDTO.getOrgIdPath());
+		projectEntity.setGridId(formDTO.getGridId());
 		projectEntity.setLocateAddress(null == formDTO.getTopicDTO().getAddress() ? "" : formDTO.getTopicDTO().getAddress());
 		projectEntity.setLocateLongitude(null == formDTO.getTopicDTO().getLongitude() ? "" : formDTO.getTopicDTO().getLongitude());
 		projectEntity.setLocateDimension(null == formDTO.getTopicDTO().getDimension() ? "" : formDTO.getTopicDTO().getDimension());