Changes

jinlin

2023-11-20 a089845484b1c050adc2dab79d9713b9f0e949f1

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

@@ -52,7 +52,7 @@
    private TestAgencyInfoService testAgencyInfoService;


    public SoftwareTestOrderDto getDto(Long projectId, Long environId) {
    public SoftwareTestOrderDto getDto(Long environId, Long projectId) {
        SoftwareTestOrderDto data = new SoftwareTestOrderDto();
        if (environId != null) {
            data.setId(environId);
@@ -71,16 +71,14 @@
            data.setEnvironAnalysisList(environAnalysesList);
        } else {
            Project project = projectService.get(projectId);
            Environ environ = new Environ();
            data.setEnviron(environ);
            data.getEnviron().setSoftwareName(project.getSoftwareName());
            data.getEnviron().setSoftwareIdentity(project.getSoftwareIdentity());
        }
        if (data.getTestAgencyInfo() == null)
           data.getEnviron().setAgencyName(testAgencyInfoService.get(10000L).getAgencyName());
           data.getEnviron().setSite(testAgencyInfoService.get(10000L).getSite());
        if (projectId != null) {
            data.setOrderId(projectId);
            data.setSoftwareTestOrder(softwareTestOrderService.get(projectId));
        }

        return data;
    }