Merge branch 'test-merge' of http://219.151.181.73:3000/zhuwei/bladex into test-merge

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/ExcelTabClientImpl.java

@@ -90,6 +90,9 @@ public class ExcelTabClientImpl implements ExcelTabClient {
         dataArray = excelTabService.addLoadDataInfo(dataArray);
         dataArray = putIfAbsent(dataArray);
         List<TableInfo> tableInfoList = this.excelTabService.getTableInfoListTrial(dataArray, tabIds);
+        for (TableInfo tableInfo : tableInfoList) {
+            tableInfo.setTestGroupId(dto.getId()+"");
+        }
         try {
             //试验特殊处理
             RandomNumberHolder.setTrialSelfInspectionRecordGroupId(dto.getId());

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

@@ -2932,6 +2932,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         String sys_file_net_url = ParamCache.getValue(CommonConstant.SYS_FILE_NET_URL);
         List<Map<String, Object>> list = new ArrayList<>();
         Map<String, Object> reData = new HashMap<>();
+        Map<String, Object> reData1 = new HashMap<>();
         WbsTreePrivate wbsTreePrivate = wbsTreePrivateService.getBaseMapper().selectOne(Wrappers.<WbsTreePrivate>query().lambda()
                 .select(WbsTreePrivate::getInitTableName, WbsTreePrivate::getHtmlUrl, WbsTreePrivate::getPKeyId, WbsTreePrivate::getProjectId, WbsTreePrivate::getParentId, WbsTreePrivate::getTableType)
                 .eq(WbsTreePrivate::getPKeyId, pkeyId));
@@ -3091,7 +3092,6 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             Elements sgName = doc.select("el-input[placeholderxx~=施工单位.*]");
             Elements wtName = doc.select("el-input[placeholderxx~=委托单位.*]");
             Elements htdName = doc.select("el-input[placeholderxx~=合同段/工区.*]");
-
             ContractInfo contractInfo = jdbcTemplate.query("select construction_unit_name,supervision_unit_name,contract_name,laboratory_name,is_test_record from m_contract_info where id = " + contractId, new BeanPropertyRowMapper<>(ContractInfo.class)).stream().findAny().orElse(null);
             if (contractInfo != null) {
                 //承包单位
@@ -3198,7 +3198,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                         }
                     }
                 }
-
+                reData1=new HashMap<>(reData);
                 if (dataIn.size() >= 1) {
                     Map<String, Object> mysqlData = dataIn.get(0);
                     DataStructureFormatUtils.parseDataByKey(mysqlData);
@@ -3328,6 +3328,13 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 }
             }
         }
+        if(reData1.size()>0){
+            for (Map.Entry<String, Object> entry : reData1.entrySet()) {
+                if(reData.containsKey(entry.getKey())){
+                    reData.put(entry.getKey(), entry.getValue());
+                }
+            }
+        }
         list.add(reData);
         return list;
     }