质检系统----资料填报-监理同步后测量数据需变动 跳过空值处理

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

@@ -1876,20 +1876,22 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                                         //设计标高
                                         designedElevationNewMap.put(rowNum, new BigDecimal(split2[0]));
                                     } else if (keys.get(i).equals(heightDeviationNew)){
-                                        double v = Double.parseDouble(split2[0]);
-                                        //随机+ - 0/1
-                                        Random random = new Random();
-                                        int adjustment = random.nextInt(2);
-                                        if(v > 0){
-                                            v = v - adjustment;
-                                        }else{
-                                            v = v + adjustment;
-                                        }
+                                        if(StringUtils.isNotEmpty(split2[0])){
+                                            double v = Double.parseDouble(split2[0]);
+                                            //随机+ - 0/1
+                                            Random random = new Random();
+                                            int adjustment = random.nextInt(2);
+                                            if(v > 0){
+                                                v = v - adjustment;
+                                            }else{
+                                                v = v + adjustment;
+                                            }
 
-                                        //高度偏差
-                                        heightDeviationNewMap.put(rowNum, BigDecimal.valueOf(v));
+                                            //高度偏差
+                                            heightDeviationNewMap.put(rowNum, BigDecimal.valueOf(v));
 
-                                        heightDeviationList.add(v + "_^_"+ split2[1]);
+                                            heightDeviationList.add(new BigDecimal(v).setScale(0,RoundingMode.HALF_UP).intValue() + "_^_"+ split2[1]);
+                                        }
                                     }
                                 }
                                 //设置偏高的值
@@ -1969,23 +1971,25 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                                     }else if(rowMin > rowNum){
                                         rowMin = rowNum;
                                     }
-                                    Integer v = Integer.parseInt(split2[0]);
-                                    //随机+ - 0/1
-                                    Random random = new Random();
-                                    int adjustment = random.nextInt(2);
-                                    if(v > 0){
-                                        v = v - adjustment;
-                                    }else{
-                                        v = v + adjustment;
-                                    }
-                                    if (keys.get(i).equals(differenceNewX)) {
-                                        //偏差X
-                                        differenceNewXMap.put(rowNum, new BigDecimal(split2[0]));
-                                    } else if (keys.get(i).equals(differenceNewY)){
-                                        //偏差Y
-                                        differenceNewYMap.put(rowNum, BigDecimal.valueOf(v));
+                                    if(StringUtils.isNotEmpty(split2[0])){
+                                        Integer v = Integer.parseInt(split2[0]);
+                                        //随机+ - 0/1
+                                        Random random = new Random();
+                                        int adjustment = random.nextInt(2);
+                                        if(v > 0){
+                                            v = v - adjustment;
+                                        }else{
+                                            v = v + adjustment;
+                                        }
+                                        if (keys.get(i).equals(differenceNewX)) {
+                                            //偏差X
+                                            differenceNewXMap.put(rowNum, new BigDecimal(split2[0]));
+                                        } else if (keys.get(i).equals(differenceNewY)){
+                                            //偏差Y
+                                            differenceNewYMap.put(rowNum, BigDecimal.valueOf(v));
+                                        }
+                                        list.add(v + "_^_"+ split2[1]);
                                     }
-                                    list.add(v + "_^_"+ split2[1]);
                                 }
                                 values.set(i, String.join("☆",list));
                             }