Эх сурвалжийг харах

划分导入模板时 不设置日期感叹号

cr 3 долоо хоног өмнө
parent
commit
062613f2c3

+ 6 - 13
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -2508,6 +2508,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                     unit.setIsTypePrivatePid(null);
                     unit.setSort(i);
                     unit.setTreePId(null);
+                    unit.setDateIsComplete(null);
                     unit.setPId(wbsTreeContractRoot.getPKeyId());
                     unit.setAncestorsPId(wbsTreeContractRoot.getAncestorsPId() + "," + wbsTreeContractRoot.getPKeyId());
                     baseMapper.insert(unit);
@@ -2534,6 +2535,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                     subUnit.setIsTypePrivatePid(null);
                     subUnit.setSort(i);
                     subUnit.setTreePId(null);
+                    subUnit.setDateIsComplete(null);
                     subUnit.setPId(fatherNode.getPKeyId());
                     subUnit.setAncestorsPId(fatherNode.getAncestorsPId() + "," + fatherNode.getPKeyId());
                     baseMapper.insert(subUnit);
@@ -2580,6 +2582,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                                 division.setIsTypePrivatePid(null);
                                 division.setSort(i);
                                 division.setTreePId(null);
+                                division.setDateIsComplete(null);
                                 division.setPId(contract.getPKeyId());
                                 division.setAncestorsPId(contract.getAncestorsPId() + "," + contract.getPKeyId());
                                 baseMapper.insert(division);
@@ -2633,6 +2636,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                                 subDivision.setIsTypePrivatePid(null);
                                 subDivision.setSort(i);
                                 subDivision.setTreePId(null);
+                                subDivision.setDateIsComplete(null);
                                 subDivision.setPId(contract.getPKeyId());
                                 subDivision.setAncestorsPId(contract.getAncestorsPId() + "," + contract.getPKeyId());
                                 baseMapper.insert(subDivision);
@@ -2690,6 +2694,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                                 item.setIsTypePrivatePid(null);
                                 item.setSort(i);
                                 item.setTreePId(null);
+                                item.setDateIsComplete(null);
                                 item.setPId(contract.getPKeyId());
                                 item.setAncestorsPId(contract.getAncestorsPId() + "," + contract.getPKeyId());
                                 baseMapper.insert(item);
@@ -2750,6 +2755,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                                 subItem.setIsTypePrivatePid(null);
                                 subItem.setSort(i);
                                 subItem.setTreePId(null);
+                                subItem.setDateIsComplete(null);
                                 subItem.setPId(contract.getPKeyId());
                                 subItem.setAncestorsPId(contract.getAncestorsPId() + "," + contract.getPKeyId());
                                 baseMapper.insert(subItem);
@@ -3937,18 +3943,5 @@ public static boolean hasConflictingCodes(List<ImportTreeDto> list) {
     }
 
 
-    @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;
-    }
 }