diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectTestcaseVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectTestcaseVo.java index c1f06033d..a220d37d9 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectTestcaseVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectTestcaseVo.java @@ -37,4 +37,5 @@ public class PmsProjectTestcaseVo { private String identifier; private String testTracking; + } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectTestcaseServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectTestcaseServiceImpl.java index 40b2e37cd..465e79dc9 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectTestcaseServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectTestcaseServiceImpl.java @@ -564,7 +564,9 @@ public class PmsProjectTestcaseServiceImpl implements IPmsProjectTestcaseService List testcases = getTestcase(item); for (PmsProjectTestcaseVo testcase : testcases) { - if (testcase.getPmsModuleId() == moduleId) { + Long pmsModuleId = testcase.getPmsModuleId(); + boolean isEqual = Objects.equals(pmsModuleId, moduleId); + if (isEqual) { List steps = getTestcaseStep(testcase.getId()); PendingOutputDataVo pendingOutputData = new PendingOutputDataVo(); pendingOutputData.setId(testcase.getId()); @@ -1110,25 +1112,29 @@ public class PmsProjectTestcaseServiceImpl implements IPmsProjectTestcaseService } } - int chapter = 1; + int chapter = 0; while (!stack.isEmpty()) { TreeSelect current = stack.pop(); // 处理当前节点,这里简单打印节点信息,你可以根据需求修改 - //System.out.println("ID: " + current.getId() + ", 名称: " + current.getLabel() + ", 层级:" + current.getLevel() + ", 父ID: " + current.getParentId() + ", 是否叶子节点: " + current.getIsLeaf() ); +// System.out.println("ID: " + current.getId() + ", 名称: " + current.getLabel() + ", 层级:" + current.getLevel() + ", 父ID: " + current.getParentId() + ", 是否叶子节点: " + current.getIsLeaf() ); if (current.getIsLeaf()) { + if (current.getLevel() == 1){ + chapter = chapter + 1; + } if(current.getId() > 0){ addNumberedHeading(document, current.getLabel(), current.getLevel()); List pendingOutputDatas = GetPendingOutputData(projectId, current.getId()); insertTable(document, pendingOutputDatas, chapter); - chapter = chapter + 1; } else { addNumberedHeading(document, current.getLabel(), current.getLevel()); List pendingOutputDatas = GetPendingOutputData(projectId, null); insertTable(document, pendingOutputDatas, chapter); - chapter = chapter + 1; } } else{ + if (current.getLevel() == 1){ + chapter = chapter + 1; + } if(current.getId() > 0){ addNumberedHeading(document, current.getLabel(), current.getLevel()); }