修改：

项目结案的时候将项目最新信息发送到区块链系统

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProcessProjectFormDTO.java

@@ -13,6 +13,12 @@ import java.util.List;
 public class BlockChainProcessProjectFormDTO implements Serializable {
 
     private static final long serialVersionUID = -7316616101790749793L;
+
+    /**
+     * 项目基础信息
+     */
+    private BlockChainProjectFormDTO project;
+
     @NotNull(message = "处理进展信息不能为空")
     private BlockChainProjectProcessFormDTO process;
 

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java

@@ -182,15 +182,20 @@ public class BlockChainProjectServiceImpl implements BlockChainProjectService, R
     @Override
     public void blockChainProcessProject(BlockChainProcessProjectFormDTO input) {
 
+        BlockChainProjectFormDTO project = input.getProject();
         BlockChainProjectProcessFormDTO process = input.getProcess();
         List<BlockChainProjectProcessAssignedStaffFormDTO> assignedStaffs = input.getAssignedStaffs();
         BlockChainProjectProcessAssignedStaffFormDTO handledStaff = input.getHandledStaff();
 
-        fill(null, process, assignedStaffs, handledStaff);
+        fill(project, process, assignedStaffs, handledStaff);
         
         String processString = JSON.toJSONString(process);
         blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_PROCESS, processString);
-        
+
+        if (project != null) {
+            blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_PROJECT, JSON.toJSONString(project));
+        }
+
         if (assignedStaffs != null && assignedStaffs.size() > 0) {
             String assignedStaffsString = JSON.toJSONString(assignedStaffs);
             blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_ASSIGNED_STAFFS, assignedStaffsString);

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

@@ -134,9 +134,10 @@ public class BlockChainUploadServiceImpl implements BlockChainUploadService {
         }
 
         Result result;
-        if (project == null) {
+        if (!"created".equals(processEntity.getOperation())) {
-            // 处理
+            // 处理。如果是结案，则会有project对象，因为要传递结案状态给区块链，其他状态则project==null
             BlockChainProcessProjectFormDTO processForm = new BlockChainProcessProjectFormDTO();
+            processForm.setProject(project);
             processForm.setProcess(process);
             processForm.setAssignedStaffs(assignedStaffs);
             processForm.setHandledStaff(handledStaff);

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

@@ -597,7 +597,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 
 		// 数据上链
 		try {
-			blockChainUploadService.send2BlockChain(null, projectProcessEntity, null, fromDTO.getProjectStaffId());
+			blockChainUploadService.send2BlockChain(projectEntity, projectProcessEntity, null, fromDTO.getProjectStaffId());
 		} catch (Exception e) {
 			String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
 			log.error("【项目流转】上链失败，错误信息:{}", errorMsg);
@@ -823,7 +823,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 
 		// 数据上链
 		try {
-			blockChainUploadService.send2BlockChain(null, projectProcessEntity, null, fromDTO.getProjectStaffId());
+			blockChainUploadService.send2BlockChain(projectEntity, projectProcessEntity, null, fromDTO.getProjectStaffId());
 		} catch (Exception e) {
 			String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
 			log.error("【项目流转】上链失败，错误信息:{}", errorMsg);