From adde2eee217564a8804a55765e5e790e49018260 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 18 May 2022 17:48:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=BD=AC=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8D=8F=E5=8A=9E=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/ShiftProjectFormDTO.java   | 10 ++++++++++
 .../com/epmet/service/impl/ProjectServiceImpl.java     |  2 ++
 2 files changed, 12 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 49d2afd9de..e136ff04fa 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
@@ -59,5 +59,15 @@ public class ShiftProjectFormDTO implements Serializable {
 
     private String gridId;
 
+    /**
+     * 协办单位ID
+     */
+    private String assistanceUnitId;
+
+    /**
+     * 协办单位类型，1社区自组织，2联建单位
+     */
+    private String assistanceUnitType;
+
 }
 
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 e0c7df913d..ad8d3ebbda 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
@@ -1177,6 +1177,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		processEntity.setOperationName(ProjectConstant.OPERATION_CREATED_NAME);
 		processEntity.setPublicReply(formDTO.getPublicReply());
 		processEntity.setInternalRemark(formDTO.getInternalRemark());
+		processEntity.setAssistanceUnitId(formDTO.getAssistanceUnitId());
+		processEntity.setAssistanceUnitType(formDTO.getAssistanceUnitType());
 		agencyDeptGrid.getAgencyList().forEach(agency -> {
 			if (issueDTO.getOrgId().equals(agency.getId())) {
 				processEntity.setDepartmentName(agency.getOrganizationName());