浏览代码

自动检查日期感叹号

cr 1 月之前
父节点
当前提交
bfe0b0c766

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

@@ -4815,6 +4815,11 @@ public class ExcelTabController extends BladeController {
         for (Map.Entry<Long, List<WbsTreeContract>> entry : map.entrySet()) {
             Long pId = entry.getKey();
             WbsTreeContract parent = wbsTreeContractMapper.selectOne(new LambdaQueryWrapper<>(WbsTreeContract.class).eq(WbsTreeContract::getPKeyId, pId));
+            if(parent==null){
+                i--;
+                System.out.println("剩余:"+i+"个节点未检查");
+                continue;
+            }
             String informationSql="select * from u_information_query where wbs_id="+parent.getPKeyId()+" and contract_id="+contractId+" and is_deleted=0";
             List<InformationQuery> query = jdbcTemplate.query(informationSql, new BeanPropertyRowMapper<>(InformationQuery.class));
             if(query.isEmpty()||query.get(0).getStatus()!=0){
@@ -4826,22 +4831,26 @@ public class ExcelTabController extends BladeController {
             for (WbsTreeContract contract : wbsTreeContractList) {
                 Map<String, Object> dataInfo = excelTabService.getBussDataInfo(contract.getPKeyId(), 0, true);
                 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;
+                    try {
+                        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(null,new LambdaUpdateWrapper<WbsTreeContract>().eq(WbsTreeContract::getPKeyId,contract.getPKeyId()).set(WbsTreeContract::getDateIsComplete,2));
                             }
                         }
-                        if(!dateFlag){
-                            wbsTreeContractMapper.update(null,new LambdaUpdateWrapper<WbsTreeContract>().eq(WbsTreeContract::getPKeyId,contract.getPKeyId()).set(WbsTreeContract::getDateIsComplete,2));
-                        }
+                    }catch (Exception e){
+
                     }
                 }
             }

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

@@ -982,7 +982,7 @@
           and  contract_id=#{contractId}
         </if>
         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
+        and p_id is not null and type=2
     </select>
 
 </mapper>