|
|
@@ -755,7 +755,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
/*检验单附表处理*/
|
|
|
List<FormData> inspectionList = new ArrayList<>();
|
|
|
/*0检验表1评定表*/
|
|
|
- this.tec.getTableAll().stream().filter(e -> e.getTableType().equals(1) || e.getNodeName().contains("评定表")).forEach(e -> {
|
|
|
+ this.tec.getTableAll().stream().filter(e -> e.getTableType().equals(1) ||e.getTableType().equals(5)).forEach(e -> {
|
|
|
/*获取所有挂在表里的元素映射关系*/
|
|
|
this.tec.getKeyMappers().stream().filter(p -> p.getPkId().equals(e.getPKeyId())).forEach(k -> {
|
|
|
/*元素长度筛选超页的元素*/
|
|
|
@@ -769,7 +769,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
/*检查是否存在附表，不存在挂载*/
|
|
|
List<NodeTable> subTabList = this.tec.getTableAll().stream().filter(e -> e.getNodeName().contains("附表")).collect(Collectors.toList());
|
|
|
if (subTabList.size() == 0) {
|
|
|
- boolean pd=tec.getTableAll().stream().anyMatch(e->e.getNodeName().contains("评定表"));
|
|
|
+ boolean pd=tec.getTableAll().stream().anyMatch(e->e.getTableType().equals(5));
|
|
|
WbsTreePrivate sub = wbsTreePrivateService.getOne(Wrappers.<WbsTreePrivate>lambdaQuery().and(e->e.eq(WbsTreePrivate::getNodeName, pd?"质量检验评定表（附表）":"质量检验表（附表）").or().eq(WbsTreePrivate::getFullName, pd?"质量检验评定表（附表）":"质量检验表（附表）")).eq(WbsTreePrivate::getProjectId, tec.getProjectId()).eq(WbsTreePrivate::getIsLinkTable,2));
|
|
|
if (sub == null) {
|
|
|
this.tec.getLog().append("该项目没有挂有附表信息");
|
|
|
@@ -779,7 +779,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
WbsTreeContract wtc = this.wbsTreeContractService.getOne(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getParentId, one.getParentId()).eq(WbsTreeContract::getContractId,tec.getContractId()).eq(WbsTreeContract::getWbsId, one.getWbsId()).and(e->e.eq(WbsTreeContract::getNodeName, pd?"质量检验评定表（附表）":"质量检验表（附表）").or().eq(WbsTreeContract::getFullName, pd?"质量检验评定表（附表）":"质量检验表（附表）")));
|
|
|
if (wtc != null) {
|
|
|
/*附表的顺序在检验单或者评定表之后*/
|
|
|
- int sort=this.tec.getTableAll().stream().filter(e ->e.getTableType().equals(1) || e.getNodeName().contains("评定表")).map(NodeTable::getSort).max(Integer::compareTo).orElse(30);
|
|
|
+ int sort=this.tec.getTableAll().stream().filter(e ->e.getTableType().equals(1) || e.getTableType().equals(5)).map(NodeTable::getSort).max(Integer::compareTo).orElse(30);
|
|
|
this.wbsTreeContractService.update(Wrappers.<WbsTreeContract>lambdaUpdate()
|
|
|
.set(WbsTreeContract::getSort,sort).set(WbsTreeContract::getContractType,-1).set(WbsTreeContract::getAncestors,one.getAncestors())
|
|
|
.set(WbsTreeContract::getIsCopeTab,2)
|
yangyj