质检系统----资料填报 CLO8数据调整完成，但是小数待处理

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

@@ -38,6 +38,7 @@ import org.springblade.manager.service.ITextdictInfoService;
 import org.springblade.manager.utils.FileUtils;
 import org.springblade.manager.vo.TextdictBy345VO;
 import org.springblade.manager.vo.TextdictInfoVO;
+import org.springblade.system.cache.ParamCache;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -1660,9 +1660,9 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
             String leveling = "CL08水准测量记录表（监理）";
             String levelingTableName = "m_20220928134702_1574999102784012288";
 
-            String designedElevation = "设置标高";
+            String designedElevation = "设计标高";
             //负值+0/1 正值-0/1
-            String heightDeviation = "高度偏差";
+            String heightDeviation = "高程偏差";
             //设置标高 + (高度偏差 / 100)
             String actualElevation = "实际标高";
 
@@ -1698,7 +1698,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                 HashMap<String, String> map = new HashMap<>();
 
                 //判断当前表单是否是CL08、CL10
-                if (wbsTreeContract.getNodeName().contains(leveling) || wbsTreeContract.getNodeName().contains(planePosition)) {
+                if (levelingTableName.equals(wbsTreeContract.getInitTableName()) || planePositionTableName.equals(wbsTreeContract.getInitTableName())) {
                     TableInfo tableInfo = tableInfoMapper.selectOne(Wrappers.<TableInfo>lambdaQuery()
                             .eq(TableInfo::getTabEnName, wbsTreeContract.getInitTableName()));
                     List<WbsFormElement> wbsFormElements = wbsFormElementMapper.selectList(Wrappers.<WbsFormElement>lambdaQuery()
@@ -1829,13 +1829,15 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                             //偏差
                             String heightDeviationNew = stringStringMap.get(heightDeviation);
                             HashMap<Integer, Double> heightDeviationNewMap = new HashMap<>();
+                            //实际标高
+                            String actualElevationNew = stringStringMap.get(actualElevation);
 
                             //记录数量
                             Integer rowMin = null;
                             Integer rowMax = null;
 
                             for (int i = 0; i < keys.size(); i++) {
-                                if(!Objects.equals(keys.get(i),designedElevation) || !Objects.equals(keys.get(i),heightDeviation)){
+                                if(!Objects.equals(keys.get(i),designedElevationNew) && !Objects.equals(keys.get(i),heightDeviationNew)){
                                     continue;
                                 }
 
@@ -1855,7 +1857,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                                         rowMax = rowNum;
                                     }
                                     //获取最小行数
-                                    if(rowMax == null){
+                                    if(rowMin == null){
                                         rowMin = rowNum;
                                     }else if(rowMin > rowNum){
                                         rowMin = rowNum;
@@ -1879,10 +1881,14 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                                         heightDeviationList.add(v + "_^_"+ split2[1]);
                                     }
                                 }
+                                //设置偏高的值
                                 if(CollectionUtil.isNotEmpty(heightDeviationList)){
                                     values.set(i, String.join("☆",heightDeviationList));
                                 }
                             }
+                            if(rowMin==null){
+                                continue;
+                            }
                             List<String> list = new ArrayList<>();
                             //按照最小行数来计算
                             for (int i = rowMin; i <= rowMax; i++) {
@@ -1895,8 +1901,8 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                                 //第5列，索引为4
                                 list.add(v + "_^_"+ i + "_4");
                             }
-                            //设置值
-                            values.set(keys.indexOf(actualElevation), String.join("☆",list));
+                            //设置实际标高的值
+                            values.set(keys.indexOf(actualElevationNew), String.join("☆",list));
                         }else if(planePositionTableName.equals(initTabName)){
                             //CL10平面位置检测记录表（监理）