Changes

jinlin

2023-11-17 8caeb17c27473a748f97ced5ba6e78b5ad63c01d

 modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java

@@ -153,11 +153,12 @@
        } else {
            Project project = projectService.get(projectId);
            String projectCode = project.getCode();
            List<?> testItemResult = baseDao.dictList("testItem_type", projectCode);
            String softName =project.getSoftwareName();
            List<?> testItemResult = baseDao.dictList("testItem_type", projectCode,softName);
            List<?> measuredList = testItemResult;
            data.setMeasuredList((List<SoftwareTestOrderMeasured>) measuredList);

            List<?> productLibraryResult = baseDao.dictList("product_library_file", projectCode);
            List<?> productLibraryResult = baseDao.dictList("product_library_file", projectCode,null);
            List<?> deliverableList = productLibraryResult;
            data.setDeliverableList((List<SoftwareTestOrderDeliverable>) deliverableList);
        }
@@ -234,7 +235,7 @@
            String sortwareTypeStr = getShowDictList.getShowDictList(dataObj.getProject().getSoftwareType(), "software_type", false);
            dataObj.getSoftwareTestOrder().setSortwareTypeStr(sortwareTypeStr);

            String testBasisStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestBasis(), "test_basis", false);
            String testBasisStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestBasis(), "test_basis", true);
            dataObj.getSoftwareTestOrder().setTestBasisStr(testBasisStr);

            String testStandardStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestStandard(), "test_standard", true);