Browse Source

质检系统----资料填报-监理同步后测量数据需变动(未完成2)

LHB 3 months ago
parent
commit
b9b96a940d

+ 46 - 3
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -1656,8 +1656,9 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                     sgTabMaps.put(s + "---" + wbsTreeContract.getPKeyId(), wbsTreeContract.getInitTableName());
                 }
             }
-            //获取 CL08水准测量记录表(监理)的 实际标高、高程偏差 对应字段
+            //获取 CL08水准测量记录表(监理)的 实际标高、高程偏差 对应字段 m_20220928134702_1574999102784012288
             String leveling = "CL08水准测量记录表(监理)";
+            String levelingTableName = "m_20220928134702_1574999102784012288";
 
             String designedElevation = "设置标高";
             //负值+0/1 正值-0/1
@@ -1665,8 +1666,9 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
             //设置标高 + (高度偏差 / 100)
             String actualElevation = "实际标高";
 
-
+            //m_20220928134725_1574999197613031424
             String planePosition = "CL10平面位置检测记录表(监理)";
+            String planePositionTableName = "m_20220928134725_1574999197613031424";
 
             //负值+0/1 正值-0/1
             String difference = "差值";
@@ -1726,7 +1728,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                     }
 
                     //存储
-                    dataMaps.put(wbsTreeContract.getNodeName(),map);
+                    dataMaps.put(wbsTreeContract.getInitTableName(),map);
                 }
             }
 
@@ -1816,6 +1818,47 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                                 filedNames.add(vo.getName());
                             }
                         }
+
+                        Map<String, String> stringStringMap = dataMaps.get(initTabName);
+
+                        //CL08水准测量记录表(监理)
+                        if(levelingTableName.equals(initTabName)){
+                            String designedElevationNew = stringStringMap.get(designedElevation);
+                            HashMap<Integer, Double> designedElevationNewMap = new HashMap<>();
+
+                            String heightDeviationNew = stringStringMap.get(heightDeviation);
+                            HashMap<Integer, Double> heightDeviationNewMap = new HashMap<>();
+
+                            String actualElevationNew = stringStringMap.get(actualElevation);
+                            HashMap<Integer, Double> actualElevationNewMap = new HashMap<>();
+
+
+
+                            String[] split = designedElevationNew.split("_");
+                            String index = split[1];
+                            String key = keys.get(Integer.parseInt(index));
+                            if(designedElevationNew.equals(key)){
+                                String value = values.get(Integer.parseInt(index));
+                                //拆分数据
+                                String[] split1 = value.split("☆");
+                                for (String s : split1) {
+                                    String[] split2 = s.split("_");
+                                    designedElevationNewMap.put(Integer.parseInt(split2[0]),Double.parseDouble(split2[2]));
+                                }
+                            }
+
+
+
+
+
+                        }else if(planePositionTableName.equals(initTabName)){
+                            //CL10平面位置检测记录表(监理)
+
+                        }
+
+
+
+
                         if (keys.size() > 0 && values.size() > 0 && keys.size() == values.size()) {
                             //alter SQL(扩容字段长度)
                             StringBuilder exStrBuilder = new StringBuilder();