总期数优化

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

@@ -114,12 +114,12 @@ public class ZrzysiteCommonServiceImpl implements IZrzysiteCommonService {
             String nodeId =  nodeInfo.get("id");
             String preTableName = "";
 
-            if(AloneWorkFlowEnum.NODE_4.getName().equalsIgnoreCase(nodeTableName)){
-                preTableName = AloneWorkFlowEnum.NODE_3.getName();
-            }else if(AloneWorkFlowEnum.NODE_5.getName().equalsIgnoreCase(nodeTableName)){
-                preTableName = AloneWorkFlowEnum.NODE_4.getName();
-            }else if(AloneWorkFlowEnum.NODE_6.getName().equalsIgnoreCase(nodeTableName)){
-                preTableName = AloneWorkFlowEnum.NODE_5.getName();
+            if(AloneWorkFlowEnum.NODE_4.getTableName().equalsIgnoreCase(nodeTableName)){
+                preTableName = AloneWorkFlowEnum.NODE_3.getTableName();
+            }else if(AloneWorkFlowEnum.NODE_5.getTableName().equalsIgnoreCase(nodeTableName)){
+                preTableName = AloneWorkFlowEnum.NODE_4.getTableName();
+            }else if(AloneWorkFlowEnum.NODE_6.getTableName().equalsIgnoreCase(nodeTableName)){
+                preTableName = AloneWorkFlowEnum.NODE_5.getTableName();
             }
             if(StringUtils.isNotBlank(preTableName)){
                 Map<String, Object> geomInfo = nodeLandService.getGeomByProjectAndNodeTable(projectId, preTableName);
@@ -178,9 +178,6 @@ public class ZrzysiteCommonServiceImpl implements IZrzysiteCommonService {
 
 
 
-
-
-
     /**
      * 手动同步当前环节数据
      * @param projectId
@@ -207,6 +204,7 @@ public class ZrzysiteCommonServiceImpl implements IZrzysiteCommonService {
         //找出需要更新的节点id
         List<String>  needUpdateNodeIdList =  JsgcghxkList.stream().filter(s->StringUtils.isBlank(s.getSourceId())).map(BaseId::getId).collect(Collectors.toList());
         String addNodeId = "";
+        Integer zqs = constructList.size()+1;
         for (ZrzysiteConstruct construct : constructList) {
             String needUpdateNodeId  = "";
             if(resSourceIdMap.containsKey(construct.getSqbh())){
@@ -214,7 +212,7 @@ public class ZrzysiteCommonServiceImpl implements IZrzysiteCommonService {
             }else if (!needUpdateNodeIdList.isEmpty()) {  // 取出头部元素并从集合删除
                 needUpdateNodeId  = needUpdateNodeIdList.remove(0);
             }
-            addNodeId = addOrUpdatToTable(construct,projectId,needUpdateNodeId);
+            addNodeId = addOrUpdatToTable(construct,projectId,needUpdateNodeId,--zqs);
             //这里进行文件处理
             getNodeAttachment(projectId,addNodeId,construct.getSqbh(),AloneWorkFlowEnum.NODE_5.getName());
         }//end for
@@ -286,6 +284,7 @@ public class ZrzysiteCommonServiceImpl implements IZrzysiteCommonService {
             String sourceType = project.getCreatorId();
 
             String addNodeId = "";
+            Integer zqs = constructList.size()+1; //这里根据顺序获取期数
             if("2".equals(sourceType)){
                 //修改和新增的情况
                 List<Jsgcghxk> JsgcghxkList   = jsgcghxkMapper.get(projectId);
@@ -318,13 +317,13 @@ public class ZrzysiteCommonServiceImpl implements IZrzysiteCommonService {
                         needUpdateNodeId  = needUpdateNodeIdList.remove(0);
                     }
 
-                    addNodeId = addOrUpdatToTable(construct,projectId,needUpdateNodeId);
+                    addNodeId = addOrUpdatToTable(construct,projectId,needUpdateNodeId,--zqs);
                     //这里进行文件处理
                     getNodeAttachment(projectId,addNodeId,construct.getSqbh(),AloneWorkFlowEnum.NODE_5.getName());
                 }//end for
             }else if("1".equals(sourceType)){ //只存在新增情况
                 for (ZrzysiteConstruct construct : constructList) {
-                    addNodeId = addOrUpdatToTable(construct,projectId,"");
+                    addNodeId = addOrUpdatToTable(construct,projectId,"",--zqs);
                     //这里进行文件处理
                     getNodeAttachment(projectId,addNodeId,construct.getSqbh(),AloneWorkFlowEnum.NODE_5.getName());
                 }
@@ -335,7 +334,7 @@ public class ZrzysiteCommonServiceImpl implements IZrzysiteCommonService {
 
 
 
-    public String  addOrUpdatToTable(ZrzysiteConstruct construct,String projectId,String needUpdateNodeId) {
+    public String  addOrUpdatToTable(ZrzysiteConstruct construct,String projectId,String needUpdateNodeId,Integer djq) {
         String addNodeId = "";
         if(StringUtils.isNotBlank(needUpdateNodeId)){
             JsgcghxkUpdateVo jsgcghxkUpdateVo = new JsgcghxkUpdateVo();
@@ -347,6 +346,8 @@ public class ZrzysiteCommonServiceImpl implements IZrzysiteCommonService {
             jsgcghxkUpdateVo.setZsbh(construct.getZsbh());
             jsgcghxkUpdateVo.setFzjg(construct.getFadw());
             jsgcghxkUpdateVo.setSourceId(construct.getSqbh());
+            jsgcghxkUpdateVo.setDjq(djq);
+
             if (construct.getFzrq() != null) {
                 jsgcghxkUpdateVo.setFzDate(sdf.format(construct.getFzrq()));
             }
@@ -361,6 +362,8 @@ public class ZrzysiteCommonServiceImpl implements IZrzysiteCommonService {
             vo.setZsbh(construct.getZsbh());
             vo.setFzjg(construct.getFadw());
             vo.setSourceId(construct.getSqbh());
+            vo.setDjq(djq);
+
             if (construct.getFzrq() != null) {
                 vo.setFzDate(sdf.format(construct.getFzrq()));
             }