项目立项+报事-立项新增网格ID，协办单位，

报事-立项有个TODO

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectDTO.java

@@ -50,6 +50,8 @@ public class ProjectDTO implements Serializable {
      */
 	private String agencyId;
 
+	private String gridId;
+
     /**
      * 来源：议题issue
      */

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectProcessDTO.java

@@ -109,6 +109,16 @@ public class ProjectProcessDTO implements Serializable {
      */
 	private String costWorkdays;
 
+    /**
+     * 协办单位ID
+     */
+    private String assistanceUnitId;
+
+    /**
+     * 协办单位类型，1社区自组织，2联建单位
+     */
+    private String assistanceUnitType;
+
     /**
      * 删除标识：0.未删除 1.已删除
      */

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

@@ -94,4 +94,14 @@ public class EventToProjectFormDTO implements Serializable {
 
     private String app;
     private String client;
+
+    /**
+     * 协办单位ID
+     */
+    private String assistanceUnitId;
+
+    /**
+     * 协办单位类型，1社区自组织，2联建单位
+     */
+    private String assistanceUnitType;
 }

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

@@ -73,7 +73,17 @@ public class ProjectApprovalFormDTO implements Serializable {
     /**
      * 网格ID
      */
-    @NotBlank(message = "网格ID不能为空",groups = {AddGroup.class})
+    @NotBlank(message = "网格ID不能为空",groups = {AddGroup.class,ProjectApprovalFormDTO.ApprovalCategory.class})
     private String gridId;
+
+    /**
+     * 协办单位ID
+     */
+    private String assistanceUnitId;
+
+    /**
+     * 协办单位类型，1社区自组织，2联建单位
+     */
+    private String assistanceUnitType;
 }
 

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcessListV2ResultDTO.java

@@ -94,6 +94,8 @@ public class ProcessListV2ResultDTO implements Serializable {
         this.departmentName = "";
         this.publicReply = "";
         this.internalRemark = "";
+        this.assistanceUnitName = "";
+        this.assistanceUnitId = "";
         this.publicFile = new ArrayList<>();
         this.internalFile = new ArrayList<>();
         this.subProcess = new ArrayList<>();

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectEntity.java

@@ -45,6 +45,8 @@ public class ProjectEntity extends BaseEpmetEntity {
      */
 	private String agencyId;
 
+	private String gridId;
+
     /**
      * 来源：议题issue  项目立项:agency
      */

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java

@@ -112,4 +112,14 @@ public class ProjectProcessEntity extends BaseEpmetEntity {
 	 */
 	private Integer isSend;
 
+	/**
+	 * 协办单位ID
+	 */
+	private String assistanceUnitId;
+
+	/**
+	 * 协办单位类型，1社区自组织，2联建单位
+	 */
+	private String assistanceUnitType;
+
 }

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

@@ -408,6 +408,7 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 		ProjectEntity projectEntity = new ProjectEntity();
 		projectEntity.setCustomerId(formDTO.getCustomerId());
 		projectEntity.setAgencyId(loginUser.getAgencyId());
+		projectEntity.setGridId(formDTO.getGridId());
 		if (ProjectConstant.WORK_EVENT.equals(formDTO.getType())) {
 			projectEntity.setOrigin(ProjectConstant.WORK_EVENT);
 			projectEntity.setOriginId(formDTO.getGridId());
@@ -433,6 +434,8 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 		processEntity.setOperationName(ProjectConstant.OPERATION_PROJECT_APPROVAL);
 		processEntity.setPublicReply(formDTO.getPublicReply());
 		processEntity.setInternalRemark(formDTO.getInternalRemark());
+		processEntity.setAssistanceUnitType(formDTO.getAssistanceUnitType());
+		processEntity.setAssistanceUnitId(formDTO.getAssistanceUnitId());
 		agencyDeptGrid.getAgencyList().forEach(agency -> {
 			if (loginUser.getAgencyId().equals(agency.getId())) {
 				processEntity.setDepartmentName(agency.getOrganizationName());
@@ -701,6 +704,8 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 	public EventToProjectResultDTO eventToProject(EventToProjectFormDTO formDTO) {
 		//事件已经立项，不能重复操作
 		ResiEventEntity resiEventEntity=resiEventService.getById(formDTO.getEventId());
+		//TODO 兼容新事件表
+		String gridId = "";
 		if(null==resiEventEntity||resiEventEntity.getShiftProject()){
 			throw new RenException(EpmetErrorCode.RESI_EVENT_SHIFT_PROJECT.getCode(),EpmetErrorCode.RESI_EVENT_SHIFT_PROJECT.getMsg());
 		}
@@ -745,6 +750,7 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 		projectEntity.setOriginId(formDTO.getEventId());
 		projectEntity.setTitle(formDTO.getTitle());
 		projectEntity.setBackGround(formDTO.getPublicReply());
+		projectEntity.setGridId(gridId);
 		projectEntity.setStatus(ProjectConstant.PENDING);
 		projectEntity.setOrgIdPath(loginUser.getOrgIdPath());
 		projectEntity.setLocateAddress(null == formDTO.getLocateAddress() ? "" : formDTO.getLocateAddress());
@@ -761,6 +767,8 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 		processEntity.setOperationName(ProjectConstant.OPERATION_PROJECT_APPROVAL);
 		processEntity.setPublicReply(formDTO.getPublicReply());
 		processEntity.setInternalRemark(formDTO.getInternalRemark());
+		processEntity.setAssistanceUnitId(formDTO.getAssistanceUnitId());
+		processEntity.setAssistanceUnitType(formDTO.getAssistanceUnitType());
 		agencyDeptGrid.getAgencyList().forEach(agency -> {
 			if (loginUser.getAgencyId().equals(agency.getId())) {
 				processEntity.setDepartmentName(agency.getOrganizationName());