Changes

jinlin

2023-11-20 316439a908d0b2363966ebbad23e3b8001291850

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

@@ -4,25 +4,27 @@
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;
import java.util.Map;
import java.text.SimpleDateFormat;
import java.util.*;


/**
 * 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,15 +44,21 @@
    @Autowired
    private EnvironAnalysisService environAnalysisService;

    public SoftwareTestOrderDto getDto(Long projectId, Long environId) {
    @Autowired
    private ProjectService projectService;

    @Autowired
    private TestAgencyInfoService testAgencyInfoService;


    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);
            data.setSoftwareResourcesList(softwareResourcesList);

@@ -60,13 +68,15 @@
            List<EnvironAnalysis> environAnalysesList = environAnalysisService.getList(environId);
            data.setEnvironAnalysisList(environAnalysesList);
        } else {
            SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(projectId);
            Environ environ =new Environ();
            data.setEnviron(environ);
        }

        if (projectId != null) {
            data.setOrderId(projectId);
            data.setSoftwareTestOrder(softwareTestOrderService.get(projectId));
            data.setProjectId(projectId);
            data.setProject(projectService.get(projectId));
        }
        if (data.getTestAgencyInfo() == null)
            data.setTestAgencyInfo(testAgencyInfoService.get(10000L));

        return data;
    }
@@ -95,8 +105,12 @@
        if (environId != null)
            baseDao.updateById(softwareTestOrderDto.getEnviron());
        else {
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
            String year = sdf.format(new Date());
            Map<String, String> map = new HashMap<>();
            map.put("funCode", "environ");
            map.put("year",year);
            softwareTestOrderDto.getEnviron().setYear(year);
            softwareTestOrderDto.getEnviron().setProjectId(softwareTestOrderDto.getProjectId());
            softwareTestOrderDto.getEnviron().setCode(sysCodeRuleService.getNewCode(map));
            baseDao.insert(softwareTestOrderDto.getEnviron());
@@ -132,7 +146,12 @@
                environAnalysisService.insert(environAnalysis);
            }
        }

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