Changes

jinlin

2023-11-17 6aaac065b98d29621590051084880fe36241624b

Changes

 modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java

@@ -67,10 +67,10 @@

    @GetMapping("getDto")
    @ApiOperation("信息")
    public Result<SoftwareTestOrderDto> getDto(Long orderId, Long environId) {
        SoftwareTestOrderDto data = environService.getDto(environId, orderId);
        if (orderId != null) {
            OssDto ossDto = sysOssConfigService.getOssByBusiType(orderId, "environ");
    public Result<SoftwareTestOrderDto> getDto(Long projectId, Long environId) {
        SoftwareTestOrderDto data = environService.getDto(environId, projectId);
        if (projectId != null) {
            OssDto ossDto = sysOssConfigService.getOssByBusiType(projectId, "environ");
            if (ossDto != null) {
                data.setFiles(ossDto);
            }

 modules/mainPart/src/main/java/com/zt/life/modules/project/model/Environ.java

@@ -26,8 +26,8 @@
    @ApiModelProperty(value = "编号")
    private String code;

    @ApiModelProperty(value = "委托单ID")
    private Long orderId;
    @ApiModelProperty(value = "项目ID")
    private Long projectId;

    @ApiModelProperty(value = "硬软件资源")
    private String hardSoftwareRes;

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

@@ -23,8 +23,6 @@
 */
@Service
public class EnvironService  extends BaseService<EnvironDao, Environ> {
    @Autowired
    private SoftwareTestOrder softwareTestOrder;

    @Autowired
    private EnvironSoftwareResourcesService environSoftwareResourcesService;
@@ -44,14 +42,14 @@
    @Autowired
    private EnvironAnalysisService environAnalysisService;

    public SoftwareTestOrderDto getDto(Long orderId, Long environId) {
    public SoftwareTestOrderDto getDto(Long projectId, Long environId) {
        SoftwareTestOrderDto data = new SoftwareTestOrderDto();
        if (environId != null) {
            data.setId(environId);
            Environ environ = this.get(environId);
            data.setEnviron(environ);

            orderId = softwareTestOrder.getId();
            projectId = environ.getProjectId();

            List<EnvironSoftwareResources> softwareResourcesList = environSoftwareResourcesService.getList(environId);
            data.setSoftwareResourcesList(softwareResourcesList);
@@ -62,12 +60,12 @@
            List<EnvironAnalysis> environAnalysesList = environAnalysisService.getList(environId);
            data.setEnvironAnalysisList(environAnalysesList);
        } else {
            SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(orderId);
            SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(projectId);
        }

        if (orderId != null) {
            data.setOrderId(orderId);
            data.setSoftwareTestOrder(softwareTestOrderService.get(orderId));
        if (projectId != null) {
            data.setOrderId(projectId);
            data.setSoftwareTestOrder(softwareTestOrderService.get(projectId));
        }

        return data;
@@ -99,7 +97,7 @@
        else {
            Map<String, String> map = new HashMap<>();
            map.put("funCode", "environ");
            softwareTestOrderDto.getEnviron().setOrderId(softwareTestOrderDto.getOrderId());
            softwareTestOrderDto.getEnviron().setProjectId(softwareTestOrderDto.getProjectId());
            softwareTestOrderDto.getEnviron().setCode(sysCodeRuleService.getNewCode(map));
            baseDao.insert(softwareTestOrderDto.getEnviron());
            environId = softwareTestOrderDto.getEnviron().getId();

 modules/mainPart/src/main/resources/mapper/sysBaseInfo/TestAgencyInfoDao.xml

@@ -8,8 +8,8 @@
        from test_agency_info a
        <where>
            a.is_delete = 0
            <if test="whereSql!=null">
                and ${whereSql}
            <if test="ID!=null">
                and a.ID = 10000
            </if>
        </where>
        <if test="orderBySql!=null">