Переглянути джерело

自动检测日期感叹号

cr 3 тижнів тому
батько
коміт
662368358a

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

@@ -4825,9 +4825,18 @@ public class ExcelTabController extends BladeController {
         List<WbsTreeContract>list= wbsTreeContractMapper.selectListForcheckAllNodeDate(projectId,contractId);
         //将表单通过pid分组
         Map<Long, List<WbsTreeContract>> map = list.stream().collect(Collectors.groupingBy(WbsTreeContract::getPId));
+        int i=map.size();
+        System.out.println("当前项目合同段有:"+i+"个节点");
         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));
+            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){
+                i--;
+                System.out.println("剩余:"+i+"个节点未检查");
+                continue;
+            }
             List<WbsTreeContract> wbsTreeContractList = entry.getValue();
             for (WbsTreeContract contract : wbsTreeContractList) {
                 Map<String, Object> dataInfo = excelTabService.getBussDataInfo(contract.getPKeyId(), 0, true);
@@ -4846,13 +4855,16 @@ public class ExcelTabController extends BladeController {
                             }
                         }
                         if(!dateFlag){
-                            wbsTreeContractMapper.update(contract,new LambdaUpdateWrapper<WbsTreeContract>().eq(WbsTreeContract::getPKeyId,contract.getPKeyId()).set(WbsTreeContract::getDateIsComplete,2));
+                            wbsTreeContractMapper.update(null,new LambdaUpdateWrapper<WbsTreeContract>().eq(WbsTreeContract::getPKeyId,contract.getPKeyId()).set(WbsTreeContract::getDateIsComplete,2));
                         }
                     }
                 }
             }
             wbsTreeContractService.checkNodeAllDate(parent);
+            i--;
+            System.out.println("剩余:"+i+"个节点未检查");
         }
+        System.out.println("检查完毕");
         return R.status(true);
     }
 }