|
@@ -2782,7 +2782,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
|
|
|
@Override
|
|
|
public boolean checkNodeAllDate(WbsTreeContract contract) {
|
|
|
List<Integer>tableOwners=new ArrayList<>();
|
|
|
- if(contract.getTableOwner()==null){
|
|
|
+ if(StringUtils.isEmpty(contract.getTableOwner())){
|
|
|
tableOwners.add(1);
|
|
|
tableOwners.add(2);
|
|
|
tableOwners.add(3);
|
|
@@ -2818,6 +2818,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
/**
|
|
|
* 展开所有合并单元格并将值填充到每个单元格
|
|
|
* @param sheet Excel工作表
|
|
@@ -3934,4 +3935,20 @@ public static boolean hasConflictingCodes(List<ImportTreeDto> list) {
|
|
|
}
|
|
|
return false;
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public boolean checkAllNodeDate(Long projectId, Long contractId) {
|
|
|
+ //查询出当前项目或合同段下所有的表单
|
|
|
+ List<WbsTreeContract>list= baseMapper.selectListForcheckAllNodeDate(projectId,contractId);
|
|
|
+ //将表单通过pid分组
|
|
|
+ Map<Long, List<WbsTreeContract>> map = list.stream().collect(Collectors.groupingBy(WbsTreeContract::getPId));
|
|
|
+ for (Map.Entry<Long, List<WbsTreeContract>> entry : map.entrySet()) {
|
|
|
+ List<WbsTreeContract> wbsTreeContractList = entry.getValue();
|
|
|
+ for (WbsTreeContract contract : wbsTreeContractList) {
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+ }
|
|
|
}
|