日期检测 同一个key只要其中一个有值就忽略另外的

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

@@ -2239,7 +2239,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             }
             Elements dateElements = doc.select("el-date-picker");
             if(!dateElements.isEmpty()){
-                for (Element element : dateElements) {
+              a:  for (Element element : dateElements) {
                     String keyname = element.attr("keyname");
                     String placeholder = element.attr("placeholder");
                     if(StringUtils.isNotEmpty(placeholder)&&placeholder.equals("取样时间")){
@@ -2247,6 +2247,13 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                     }
                     dateKeyNames.add(keyname);
                     if(!DataInfo.containsKey(keyname)||(StringUtils.isEmpty(DataInfo.get(keyname).toString()))){
+                        String[] strings = keyname.split("__");
+                        Set<String> keySet = DataInfo.keySet();
+                        for (String key : keySet) {
+                            if(key.contains(strings[0])){
+                                continue  a;
+                            }
+                        }
                         dateFlag=false;
                     }
                 }