项目关闭，流转，响应添加协办单位

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectClosedFromDTO.java

@@ -55,4 +55,14 @@ public class ProjectClosedFromDTO implements Serializable {
 	 * 内部备注对应文件集合
 	 */
 	private List<FileDTO> internalFile;
+
+	/**
+	 * 协办单位ID
+	 */
+	private String assistanceUnitId;
+
+	/**
+	 * 协办单位类型，1社区自组织，2联建单位
+	 */
+	private String assistanceUnitType;
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectResponseFormDTO.java

@@ -55,4 +55,14 @@ public class ProjectResponseFormDTO implements Serializable {
 	 */
 	private List<FileDTO> internalFile;
 
+	/**
+	 * 协办单位ID
+	 */
+	private String assistanceUnitId;
+
+	/**
+	 * 协办单位类型，1社区自组织，2联建单位
+	 */
+	private String assistanceUnitType;
+
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java

@@ -40,5 +40,15 @@ public class TransferFormDTO implements Serializable {
      * 内部备注对应文件集合
      */
     private List<FileDTO> internalFile;
+
+    /**
+     * 协办单位ID
+     */
+    private String assistanceUnitId;
+
+    /**
+     * 协办单位类型，1社区自组织，2联建单位
+     */
+    private String assistanceUnitType;
 }
 

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

@@ -646,6 +646,8 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
         processEntity.setDepartmentId(staffEntity.getDepartmentId());
         processEntity.setGridId(staffEntity.getGridId());
         processEntity.setOrgIdPath(staffEntity.getOrgIdPath());
+        processEntity.setAssistanceUnitType(formDTO.getAssistanceUnitType());
+        processEntity.setAssistanceUnitId(formDTO.getAssistanceUnitId());
         projectProcessDao.insert(processEntity);
         //2-1.项目附件表新增数据
         if ((null != formDTO.getPublicFile() && formDTO.getPublicFile().size() > NumConstant.ZERO)

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

@@ -709,6 +709,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		ProjectDTO projectDto = ConvertUtils.sourceToTarget(projectEntity, ProjectDTO.class);
 		projectDto.setUpdatedTime(projectDto.getCreatedTime());
 		projectProcessEntity.setCostWorkdays(getDetentionDays(projectDto));
+		projectProcessEntity.setAssistanceUnitType(fromDTO.getAssistanceUnitType());
+		projectProcessEntity.setAssistanceUnitId(fromDTO.getAssistanceUnitId());
 		projectProcessService.insert(projectProcessEntity);
 
 		//保存附件
@@ -2282,6 +2284,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		projectProcessEntity.setPublicReply(formDTO.getPublicReply());
 		projectProcessEntity.setInternalRemark(formDTO.getInternalRemark());
 		projectProcessEntity.setStaffId(formDTO.getUserId());
+		projectProcessEntity.setAssistanceUnitId(formDTO.getAssistanceUnitId());
+		projectProcessEntity.setAssistanceUnitType(formDTO.getAssistanceUnitType());
 		projectProcessService.insert(projectProcessEntity);
 
 		//项目附件表新增数据  sun  2020.12.22