修改：

项目数据上链调整

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

@@ -1,5 +1,6 @@
 package com.epmet.service;
 
+import com.epmet.entity.ProjectEntity;
 import com.epmet.entity.ProjectProcessEntity;
 import com.epmet.entity.ProjectStaffEntity;
 
@@ -15,5 +16,5 @@ public interface BlockChainUploadService {
      * @param processEntity 处理进展entity
      * @param assignedStaffEntities 指派给的工作人员entity
      */
-    void send2BlockChain(ProjectProcessEntity processEntity, List<ProjectStaffEntity> assignedStaffEntities);
+    void send2BlockChain(ProjectEntity projectEntity, ProjectProcessEntity processEntity, List<ProjectStaffEntity> assignedStaffEntities);
 }

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

@@ -2,9 +2,8 @@ package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.dao.ProjectStaffDao;
-import com.epmet.dto.form.BlockChainProcessProjectFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.BlockChainProjectProcessAssignedStaffFormDTO;
+import com.epmet.entity.ProjectEntity;
-import com.epmet.dto.form.BlockChainProjectProcessFormDTO;
 import com.epmet.entity.ProjectProcessEntity;
 import com.epmet.entity.ProjectStaffEntity;
 import com.epmet.feign.EpmetThirdOpenFeignClient;
@@ -35,8 +34,30 @@ public class BlockChainUploadServiceImpl implements BlockChainUploadService {
      * @param processEntity 处理进展entity
      * @param assignedStaffEntities 指派给的工作人员entity
      */
-    public void send2BlockChain(ProjectProcessEntity processEntity, List<ProjectStaffEntity> assignedStaffEntities) {
+    public void send2BlockChain(ProjectEntity projectEntity, ProjectProcessEntity processEntity, List<ProjectStaffEntity> assignedStaffEntities) {
 
+        // 1.项目主信息
+        BlockChainProjectFormDTO project = null;
+        
+        if (projectEntity != null) {
+            project = new BlockChainProjectFormDTO();
+            project.setAgencyId(projectEntity.getAgencyId());
+            project.setProjectId(projectEntity.getId());
+            project.setCustomerId(projectEntity.getCustomerId());
+            project.setCreatedBy(projectEntity.getCreatedBy());
+            project.setCreatedTime(projectEntity.getCreatedTime());
+            project.setCloseStatus(projectEntity.getClosedStatus());
+            project.setLocateAddress(projectEntity.getLocateAddress());
+            project.setLocateDimension(projectEntity.getLocateDimension());
+            project.setLocateLongitude(projectEntity.getLocateLongitude());
+            project.setOrgIdPath(projectEntity.getOrgIdPath());
+            project.setOrigin(projectEntity.getOrigin());
+            project.setOriginId(projectEntity.getOriginId());
+            project.setStatus(projectEntity.getStatus());
+            project.setTitle(projectEntity.getTitle());
+        }
+
+        // 2.项目处理进展
         BlockChainProjectProcessFormDTO process = new BlockChainProjectProcessFormDTO();
         process.setProcessId(processEntity.getId());
         process.setCreatedBy(processEntity.getCreatedBy());
@@ -68,6 +89,7 @@ public class BlockChainUploadServiceImpl implements BlockChainUploadService {
             assignedStaffEntities = new ArrayList<>();
         }
 
+        // 3.指派人员列表
         List<BlockChainProjectProcessAssignedStaffFormDTO> assignedStaffs = assignedStaffEntities.stream().map(e -> {
             BlockChainProjectProcessAssignedStaffFormDTO assignedStaff = new BlockChainProjectProcessAssignedStaffFormDTO();
             assignedStaff.setStaffId(e.getStaffId());
@@ -86,9 +108,17 @@ public class BlockChainUploadServiceImpl implements BlockChainUploadService {
             return assignedStaff;
         }).collect(Collectors.toList());
         
-        BlockChainProcessProjectFormDTO form = new BlockChainProcessProjectFormDTO();
+        if (project == null) {
-        form.setProcess(process);
+            BlockChainProcessProjectFormDTO processForm = new BlockChainProcessProjectFormDTO();
-        form.setAssignedStaffs(assignedStaffs);
+            processForm.setProcess(process);
-        thirdOpenFeignClient.blockChainProcessProject(form);
+            processForm.setAssignedStaffs(assignedStaffs);
+            thirdOpenFeignClient.blockChainProcessProject(processForm);
+        } else {
+            BlockChainCreateProjectFormDTO createForm = new BlockChainCreateProjectFormDTO();
+            createForm.setProject(project);
+            createForm.setProcess(process);
+            createForm.setAssignedStaffs(assignedStaffs);
+            thirdOpenFeignClient.blockChainCreateProject(createForm);
+        }
     }
 }

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

@@ -413,7 +413,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
 
         // 数据上链
         try {
-            blockChainUploadService.send2BlockChain(processEntity, entityList);
+            blockChainUploadService.send2BlockChain(null, processEntity, entityList);
         } catch (Exception e) {
             String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
             log.error("【项目流转】上链失败，错误信息:{}", errorMsg);
@@ -803,7 +803,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
 
         // 数据上链
         try {
-            blockChainUploadService.send2BlockChain(processEntity, entityList);
+            blockChainUploadService.send2BlockChain(null, processEntity, entityList);
         } catch (Exception e) {
             String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
             log.error("【项目流转】上链失败，错误信息:{}", errorMsg);

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

@@ -583,7 +583,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 
 		// 数据上链
 		try {
-			blockChainUploadService.send2BlockChain(projectProcessEntity, null);
+			blockChainUploadService.send2BlockChain(null, projectProcessEntity, null);
 		} catch (Exception e) {
 			String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
 			log.error("【项目流转】上链失败，错误信息:{}", errorMsg);
@@ -802,7 +802,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 
 		// 数据上链
 		try {
-			blockChainUploadService.send2BlockChain(projectProcessEntity, null);
+			blockChainUploadService.send2BlockChain(null, projectProcessEntity, null);
 		} catch (Exception e) {
 			String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
 			log.error("【项目流转】上链失败，错误信息:{}", errorMsg);
@@ -978,7 +978,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 
 		// 数据上链
 		try {
-			blockChainUploadService.send2BlockChain(projectProcessEntity, null);
+			blockChainUploadService.send2BlockChain(null, projectProcessEntity, null);
 		} catch (Exception e) {
 			String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
 			log.error("【项目流转】上链失败，错误信息:{}", errorMsg);
@@ -1295,7 +1295,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 
 		// 数据上链
 		try {
-			blockChainUploadService.send2BlockChain(processEntity, entityList);
+			blockChainUploadService.send2BlockChain(projectEntity, processEntity, entityList);
 		} catch (Exception e) {
 			String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
 			log.error("【项目流转】上链失败，错误信息:{}", errorMsg);
@@ -1391,7 +1391,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 
 	// 数据上链
 		try {
-			blockChainUploadService.send2BlockChain(projectProcessEntity, new ArrayList<>());
+			blockChainUploadService.send2BlockChain(null, projectProcessEntity, new ArrayList<>());
 		} catch (Exception e) {
 			String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
 			log.error("【项目流转】上链失败，错误信息:{}", errorMsg);
@@ -2183,7 +2183,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 
 		// 数据上链
 		try {
-			blockChainUploadService.send2BlockChain(projectProcessEntity, null);
+			blockChainUploadService.send2BlockChain(null, projectProcessEntity, null);
 		} catch (Exception e) {
 			String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
 			log.error("【项目流转】上链失败，错误信息:{}", errorMsg);
@@ -2288,7 +2288,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 
 		// 数据上链
 		try {
-			blockChainUploadService.send2BlockChain(projectProcessEntity, new ArrayList<>());
+			blockChainUploadService.send2BlockChain(null, projectProcessEntity, new ArrayList<>());
 		} catch (Exception e) {
 			String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
 			log.error("【项目流转】上链失败，错误信息:{}", errorMsg);

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

@@ -534,7 +534,7 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 
 		// 数据上链
 		try {
-			blockChainUploadService.send2BlockChain(processEntity, entityList);
+			blockChainUploadService.send2BlockChain(projectEntity, processEntity, entityList);
 		} catch (Exception e) {
 			String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
 			log.error("【项目流转】上链失败，错误信息:{}", errorMsg);
@@ -858,7 +858,7 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 
 		// 数据上链
 		try {
-			blockChainUploadService.send2BlockChain(processEntity, entityList);
+			blockChainUploadService.send2BlockChain(projectEntity, processEntity, entityList);
 		} catch (Exception e) {
 			String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
 			log.error("【项目流转】上链失败，错误信息:{}", errorMsg);