手动同步优化

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/zrzysite/ZrzysiteConstructController.java

@@ -61,11 +61,11 @@ public class ZrzysiteConstructController extends BaseController {
         String projectId = paramMap.get("projectId");
         String nodeTableName = paramMap.get("nodeTableName");
         if(StringUtils.isNotBlank(projectId) && StringUtils.isNotBlank(nodeTableName)){
-            if(AloneWorkFlowEnum.NODE_4.getName().equalsIgnoreCase(nodeTableName)){
+            if(AloneWorkFlowEnum.NODE_4.getTableName().equalsIgnoreCase(nodeTableName)){
                 zrzysiteLandService.syncCurrentNodeInfo(projectId,nodeTableName);
-            }else if(AloneWorkFlowEnum.NODE_5.getName().equalsIgnoreCase(nodeTableName)){
+            }else if(AloneWorkFlowEnum.NODE_5.getTableName().equalsIgnoreCase(nodeTableName)){
                 zrzysiteConstructService.syncCurrentNodeInfo(projectId,nodeTableName);
-            } else if(AloneWorkFlowEnum.NODE_6.getName().equalsIgnoreCase(nodeTableName)){
+            } else if(AloneWorkFlowEnum.NODE_6.getTableName().equalsIgnoreCase(nodeTableName)){
                 zrzysiteGhhsService.syncCurrentNodeInfo(projectId,nodeTableName);
             }
         }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/zrzysite/impl/ZrzysiteCommonServiceImpl.java

@@ -202,7 +202,6 @@ public class ZrzysiteCommonServiceImpl implements IZrzysiteCommonService {
             constructList =  constructList.subList(0, 8);
         }
 
-
         List<Jsgcghxk> JsgcghxkList   = jsgcghxkMapper.get(projectId);
         Map<String,String> resSourceIdMap = JsgcghxkList.stream().filter(obj -> StringUtils.isNotBlank(obj.getSourceId())).collect(Collectors.toMap(Jsgcghxk::getSourceId, BaseId::getId));
         //找出需要更新的节点id
@@ -215,7 +214,7 @@ public class ZrzysiteCommonServiceImpl implements IZrzysiteCommonService {
             }else if (!needUpdateNodeIdList.isEmpty()) {  // 取出头部元素并从集合删除
                 needUpdateNodeId  = needUpdateNodeIdList.remove(0);
             }
-            addOrUpdatToTable(construct,projectId,needUpdateNodeId);
+            addNodeId = addOrUpdatToTable(construct,projectId,needUpdateNodeId);
             //这里进行文件处理
             getNodeAttachment(projectId,addNodeId,construct.getSqbh(),AloneWorkFlowEnum.NODE_5.getName());
         }//end for

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/zrzysite/impl/ZrzysiteGhhsServiceImpl.java

@@ -98,7 +98,6 @@ public class ZrzysiteGhhsServiceImpl implements IZrzysiteGhhsService {
         }
 
 
-
         List<Tdhyhs> tdhyhsList = tdhyhsMapper.get(projectId);
         Map<String, String> resSourceIdMap = tdhyhsList.stream()
                 .filter(obj -> StringUtils.isNotBlank(obj.getSourceId()))