Changes

jinlin

2023-11-21 7ce2d2cc98ee4ed0361d8376b8d49d567af7b268

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

@@ -54,9 +54,9 @@
    public SoftwareTestOrderDto getDto(Long environId, Long projectId) {
        SoftwareTestOrderDto data = new SoftwareTestOrderDto();
        if (environId != null) {
            data.setId(environId);
            Environ environ = this.get(environId);
            data.setEnviron(environ);
            data.setTestAgencyInfo(testAgencyInfoService.get(environId));

            projectId = environ.getProjectId();
            List<EnvironSoftwareResources> softwareResourcesList = environSoftwareResourcesService.getList(environId);
@@ -68,16 +68,15 @@
            List<EnvironAnalysis> environAnalysesList = environAnalysisService.getList(environId);
            data.setEnvironAnalysisList(environAnalysesList);
        } else {
            Project project = projectService.get(projectId);
            Environ environ = new Environ();
            Environ environ =new Environ();
            data.setEnviron(environ);
            data.getEnviron().setSoftwareName(project.getSoftwareName());
            data.getEnviron().setSoftwareIdentity(project.getSoftwareIdentity());
            data.getEnviron().setProjectId(projectId);
        }
        if (projectId != null) {
            data.setProjectId(projectId);
            data.setProject(projectService.get(projectId));
        }
        if (data.getTestAgencyInfo() == null)
           data.getEnviron().setAgencyName(testAgencyInfoService.get(10000L).getAgencyName());
           data.getEnviron().setSite(testAgencyInfoService.get(10000L).getSite());
            data.setTestAgencyInfo(testAgencyInfoService.get(10000L));

        return data;
    }
@@ -118,37 +117,50 @@
            environId = softwareTestOrderDto.getEnviron().getId();
        }

        int i = 0;
        for (EnvironSoftwareResources environSoftwareResources : softwareTestOrderDto.getSoftwareResourcesList()) {
            environSoftwareResources.setEnvironId(environId);
            if (environSoftwareResources.getId() != null) {
                environSoftwareResourcesService.update(environSoftwareResources);
            } else {
                i++;
                environSoftwareResources.setNo(i);
                environSoftwareResources.setEnvironId(environId);
                environSoftwareResourcesService.insert(environSoftwareResources);
            }
        }

        i = 0;
        for (EnvironHardwareResources environHardwareResources : softwareTestOrderDto.getHardwareResourcesList()) {
            environHardwareResources.setEnvironId(environId);
            if (environHardwareResources.getId() != null) {
                environHardwareResourcesService.update(environHardwareResources);
            } else {
                i++;
                environHardwareResources.setNo(i);
                environHardwareResources.setEnvironId(environId);
                environHardwareResourcesService.insert(environHardwareResources);
            }
        }

        i = 0;
        for (EnvironAnalysis environAnalysis : softwareTestOrderDto.getEnvironAnalysisList()) {
            environAnalysis.setEnvironId(environId);
            if (environAnalysis.getId() != null) {
                environAnalysisService.update(environAnalysis);
            } else {
                i++;
                environAnalysis.setNo(i);
                environAnalysis.setEnvironId(environId);
                environAnalysisService.insert(environAnalysis);
            }
        }

        sysOssConfigService.updateOss(softwareTestOrderDto.getId(), softwareTestOrderDto.getFiles());// 保存附件
        if (softwareTestOrderDto.getTestAgencyInfo().getId() == 10000) {
            softwareTestOrderDto.getTestAgencyInfo().setId(environId);
            testAgencyInfoService.insert(softwareTestOrderDto.getTestAgencyInfo());
        } else {
            testAgencyInfoService.update(softwareTestOrderDto.getTestAgencyInfo());
        }
        sysOssConfigService.updateOss(softwareTestOrderDto.getEnviron().getId(), softwareTestOrderDto.getFiles());// 保存附件
        return true;
    }
}