|
|
@@ -1235,10 +1235,11 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
|
|
|
List<WbsTreeContract> tabs = baseMapper.selectList(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getParentId, node.getId())
|
|
|
.eq(WbsTreeContract::getContractId, node.getContractId()).eq(WbsTreeContract::getType, 2)
|
|
|
.eq(WbsTreeContract::getWbsId, node.getWbsId())
|
|
|
+ .eq(WbsTreeContract::getIsDeleted,0)
|
|
|
.apply("(wbs_type is null OR wbs_type = " + node.getWbsType() + ")")
|
|
|
.eq(WbsTreeContract::getStatus, 1)
|
|
|
.ne(WbsTreeContract::getIsBussShow, 2)); //隐藏的表单不操作
|
|
|
-
|
|
|
+ //临时处理，先复制一张表，将施工有编号问题的表更正。
|
|
|
Map<String, List<WbsTreeContract>> collect = tabs.stream().collect(Collectors.groupingBy(WbsTreeContract::getNodeName));
|
|
|
for (Map.Entry<String, List<WbsTreeContract>> stringListEntry : collect.entrySet()) {
|
|
|
if(stringListEntry.getValue().size()>1){
|
|
|
@@ -1317,6 +1318,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
|
|
|
tabs = baseMapper.selectList(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getParentId, node.getId())
|
|
|
.eq(WbsTreeContract::getContractId, node.getContractId()).eq(WbsTreeContract::getType, 2)
|
|
|
.eq(WbsTreeContract::getWbsId, node.getWbsId())
|
|
|
+ .eq(WbsTreeContract::getIsDeleted,0)
|
|
|
.apply("(wbs_type is null OR wbs_type = " + node.getWbsType() + ")")
|
|
|
.eq(WbsTreeContract::getStatus, 1)
|
|
|
.ne(WbsTreeContract::getIsBussShow, 2)); //隐藏的表单不操作
|
chenr