Merge remote-tracking branch 'origin/test-merge-02' into test-merge-02

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/TextdictInfoVO.java

@@ -36,6 +36,6 @@ public class TextdictInfoVO extends TextdictInfo {
     //1.电签配置 2.系统识别
     private Integer showType;
 
-    @ApiModelProperty("是否引用系统级电签配置，1 系统级，0 项目级")
+    @ApiModelProperty("本表配置 绿色0，电签库 蓝色1，项目匹配 橙色2")
     private Integer isSystem = 0;
 }

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/controller/ArchiveController.java

@@ -90,8 +90,8 @@ public class ArchiveController {
                 }
             }
         }
-        System.out.println("队列数量_img" + executor.getQueue().size());
-        System.out.println("活跃数量_img" + executor.getActiveCount());
+        System.out.println("队列数量_img2" + executor.getQueue().size());
+        System.out.println("活跃数量_img2" + executor.getActiveCount());
         System.out.println("总共数量_img" + executor.getTaskCount());
         System.out.println("完成数量_img" + executor.getCompletedTaskCount());
     }

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

@@ -39,6 +39,8 @@ 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.springblade.system.cache.ParamCache;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -93,7 +95,6 @@ public class TextdictInfoServiceImpl extends ServiceImpl<TextdictInfoMapper, Tex
                         textdict = new ArrayList<>();
                     }
                     if (!keys.isEmpty()) {
-                        // 查询系统级电签配置
                         TextdictInfoVO temp = null;
                         if (textdict != null && !textdict.isEmpty()) {
                             temp = textdict.get(0);
@@ -105,6 +106,7 @@ public class TextdictInfoServiceImpl extends ServiceImpl<TextdictInfoMapper, Tex
                             temp.setTabId(privateInfo.getPKeyId() + "");
                             temp.setType(2);
                         }
+                        // 查询电签库配置
                         List<TextdictInfoVO> textdictList = iSignConfigService.hasSignConfig(privateInfo.getInitTableName(), keys, temp);
                         if (textdict == null || textdict.isEmpty()) {
                             textdict = textdictList;
@@ -127,7 +129,7 @@ public class TextdictInfoServiceImpl extends ServiceImpl<TextdictInfoMapper, Tex
                         Map<String, Map<String, TextdictInfoVO>> map = textdict.stream().collect(Collectors.groupingBy(TextdictInfoVO::getColKey, Collectors.toMap(TextdictInfoVO::getSigRoleId, v -> v, (v1, v2) -> v1)));
                         List<TextdictInfoVO> collect = textdictList.stream().filter(textdictInfoVO -> {
                             Map<String, TextdictInfoVO> voMap = map.get(textdictInfoVO.getColKey());
-                            textdictInfoVO.setIsSystem(1);
+                            textdictInfoVO.setIsSystem(2);
                             if (voMap != null && !voMap.isEmpty() ) {
                                 return voMap.get(textdictInfoVO.getSigRoleId()) == null;
                             }

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++) {
@@ -1892,11 +1898,12 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                                     continue;
                                 }
                                 double v = designed + (height / 100);
+
                                 //第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平面位置检测记录表（监理）