自动检测日期感叹号

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -4816,21 +4816,23 @@ public class ExcelTabController extends BladeController {
             List<WbsTreeContract> wbsTreeContractList = entry.getValue();
             for (WbsTreeContract contract : wbsTreeContractList) {
                 Map<String, Object> dataInfo = excelTabService.getBussDataInfo(contract.getPKeyId(), 0, true);
-                InputStream inputStreamByUrl = FileUtils.getInputStreamByUrl(contract.getHtmlUrl());
-                String htmlString = IoUtil.readToString(inputStreamByUrl);
-                Document doc = Jsoup.parse(htmlString);
-                Elements dateElements = doc.select("el-date-picker");
-                if(!dateElements.isEmpty()){
-                    Boolean dateFlag=true;
-                    for (Element element : dateElements) {
-                        String keyname = element.attr("keyname");
-                        if(!dataInfo.containsKey(keyname)||(StringUtils.isEmpty(dataInfo.get(keyname).toString()))){
-                            dateFlag=false;
-                            break;
+                if(dataInfo!=null){
+                    InputStream inputStreamByUrl = FileUtils.getInputStreamByUrl(contract.getHtmlUrl());
+                    String htmlString = IoUtil.readToString(inputStreamByUrl);
+                    Document doc = Jsoup.parse(htmlString);
+                    Elements dateElements = doc.select("el-date-picker");
+                    if(!dateElements.isEmpty()){
+                        Boolean dateFlag=true;
+                        for (Element element : dateElements) {
+                            String keyname = element.attr("keyname");
+                            if(!dataInfo.containsKey(keyname)||(StringUtils.isEmpty(dataInfo.get(keyname).toString()))){
+                                dateFlag=false;
+                                break;
+                            }
+                        }
+                        if(!dateFlag){
+                            wbsTreeContractMapper.update(contract,new LambdaUpdateWrapper<WbsTreeContract>().eq(WbsTreeContract::getPKeyId,contract.getPKeyId()).set(WbsTreeContract::getDateIsComplete,2));
                         }
-                    }
-                    if(!dateFlag){
-                        wbsTreeContractMapper.update(contract,new LambdaUpdateWrapper<WbsTreeContract>().eq(WbsTreeContract::getPKeyId,contract.getPKeyId()).set(WbsTreeContract::getDateIsComplete,2));
                     }
                 }
             }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.xml

@@ -981,8 +981,8 @@
         <if test="contractId!=null and contractId!=''">
           and  contract_id=#{contractId}
         </if>
-        and is_deleted=0 and is_buss_show !=2 and init_table_name !=null and html_url !=null and LENGTH(init_table_name) > 10 and LENGTH(html_url) > 10
-        and p_id !=null
+        and is_deleted=0 and is_buss_show !=2 and init_table_name is not null and html_url is not null and LENGTH(init_table_name) > 10 and LENGTH(html_url) > 10
+        and p_id is not null
     </select>
 
 </mapper>