解决试验自检记录编号被覆盖的bug

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialSelfInspectionRecordServiceImpl.java

@@ -1376,7 +1376,7 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
         String key = first.attr("id");
         //记录编号或者报告编号的值
         String recordOrReportNo = jsonObject.getString(key);
-        if (!"".equals(recordOrReportNo) && !(recordOrReportNo == null)) {
+        if (!"".equals(recordOrReportNo) && recordOrReportNo != null && !"/".equals(recordOrReportNo)) {
             String updateSql = "update u_trial_self_inspection_record set " + fileVlue + "='" + recordOrReportNo + "' where id='" + dto.getId() + "'";
             if (fileVlue.equals("record_no")) {
                 dto.setRecordNo(recordOrReportNo);

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

@@ -3135,10 +3135,16 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 
             //匹配
             Elements bgBH = doc.select("el-input[placeholderxx~=报告编号.*]");
+            if (bgBH == null || bgBH.isEmpty()) {
+                bgBH = doc.select("el-input[placeholderxx~=报告编 号.*]");
+            }
             Elements cbdwBH = doc.select("el-input[placeholderxx~=承包单位.*]");
             Elements jldwBH = doc.select("el-input[placeholderxx~=监理单位.*]");
             Elements jcdwName = doc.select("el-input[placeholderxx~=检测单位名称.*]");
             Elements jlBH = doc.select("el-input[placeholderxx~=记录编号.*]");
+            if (jlBH == null || jlBH.isEmpty()) {
+                jlBH = doc.select("el-input[placeholderxx~=记录编 号.*]");
+            }
             Elements gcName = doc.select("el-input[placeholderxx~=工程名称.*]");
             Elements sgName = doc.select("el-input[placeholderxx~=施工单位.*]");
             Elements wtName = doc.select("el-input[placeholderxx~=委托单位.*]");