Changes

jinlin

2023-11-20 e72919b13b46b8ca3c70aecbb52cf76bef08a673

Changes

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

@@ -4,11 +4,14 @@
import com.zt.life.modules.project.dao.EnvironDao;
import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
import com.zt.life.modules.project.model.*;
import com.zt.life.modules.sysBaseInfo.model.TestAgencyInfo;
import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
@@ -18,11 +21,11 @@
/**
 * environ
 *
 * @author zt generator 
 * @author zt generator
 * @since 1.0.0 2023-11-17
 */
@Service
public class EnvironService  extends BaseService<EnvironDao, Environ> {
public class EnvironService extends BaseService<EnvironDao, Environ> {

    @Autowired
    private EnvironSoftwareResourcesService environSoftwareResourcesService;
@@ -42,6 +45,13 @@
    @Autowired
    private EnvironAnalysisService environAnalysisService;

    @Autowired
    private ProjectService projectService;

    @Autowired
    private TestAgencyInfoService testAgencyInfoService;


    public SoftwareTestOrderDto getDto(Long projectId, Long environId) {
        SoftwareTestOrderDto data = new SoftwareTestOrderDto();
        if (environId != null) {
@@ -60,9 +70,13 @@
            List<EnvironAnalysis> environAnalysesList = environAnalysisService.getList(environId);
            data.setEnvironAnalysisList(environAnalysesList);
        } else {
            SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(projectId);
            Project project = projectService.get(projectId);
            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));