Changes

jinlin

2023-11-10 ec5237992ac60b6eb0df07ad3f5038b52a582882

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

@@ -12,13 +12,13 @@
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.project.dto.ProjectDto;
import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
import com.zt.life.modules.project.model.SoftwareTestOrder;
import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
import com.zt.life.modules.project.service.ProjectService;
import com.zt.life.modules.project.service.SoftwareTestOrderDeliverableService;
import com.zt.life.modules.project.service.SoftwareTestOrderMeasuredService;
import com.zt.life.modules.project.service.SoftwareTestOrderService;
import com.zt.life.modules.sysBaseInfo.model.TestAgencyInfo;
import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -27,9 +27,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

import javax.servlet.http.HttpServletResponse;
import java.util.List;


/**
@@ -43,9 +40,10 @@
@Api(tags="software_test_order")
public class SoftwareTestOrderController {
    @Autowired
    private ProjectService projectService;
    @Autowired
    private SoftwareTestOrderService softwareTestOrderService;

    @Autowired
    private ProjectService projectService;
    @Autowired
    private SoftwareTestOrderDeliverableService softwareTestOrderDeliverableService;
    @Autowired
@@ -70,14 +68,29 @@

    @GetMapping("{id}")
    @ApiOperation("信息")
    public Result<ProjectDto> get(@PathVariable("id") Long id){
        ProjectDto data = new ProjectDto();
    public Result<SoftwareTestOrderDto> get(@PathVariable("id") Long id, @PathVariable("projectId") Long projectId) {
        SoftwareTestOrderDto data = new SoftwareTestOrderDto();

        if (id != null) {
            data.setId(id);
        SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(id);
        data.setSoftwareTestOrder(softwareTestOrder);
        data.setProject(projectService.get(softwareTestOrder.getProjectId()));
        data.setTestAgencyInfo(testAgencyInfoService.get(softwareTestOrder.getAgencyId()));
        data.setChildrenTable2(softwareTestOrderDeliverableService.childrenTables(softwareTestOrder.getId()));
        data.setChildrenTable1(softwareTestOrderMeasuredService.childrenTables(softwareTestOrder.getId()));

            if (projectId == null)
                projectId = softwareTestOrder.getProjectId();

            data.setTestAgencyInfo(testAgencyInfoService.get(id));
            data.setSoftwareTestOrderDeliverableList(softwareTestOrderDeliverableService.childrenTables(id));
            data.setSoftwareTestOrderMeasuredList(softwareTestOrderMeasuredService.childrenTables(id));
        } else {
            data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
        }
        if (projectId != null) {
            data.setProjectId(projectId);
            data.setProject(projectService.get(projectId));
        }


        return Result.ok(data);
    }

@@ -85,10 +98,13 @@
    @PostMapping
    @ApiOperation("新增")
    @LogOperation("新增")
    public Result insert(@RequestBody SoftwareTestOrder softwareTestOrder){
    public Result insert(@RequestBody SoftwareTestOrderDto softwareTestOrderDto) {
        //效验数据
        ValidatorUtils.validateEntity(softwareTestOrder, AddGroup.class, DefaultGroup.class);
        softwareTestOrderService.insert(softwareTestOrder);

        ValidatorUtils.validateEntity(softwareTestOrderDto.getSoftwareTestOrder(), AddGroup.class, DefaultGroup.class);

        Boolean result = softwareTestOrderService.save(softwareTestOrderDto);


        return Result.ok();
    }
@@ -96,11 +112,10 @@
    @PutMapping
    @ApiOperation("修改")
    @LogOperation("修改")
    public Result update(@RequestBody SoftwareTestOrder softwareTestOrder){
    public Result update(@RequestBody SoftwareTestOrderDto softwareTestOrderDtor) {
        //效验数据
        ValidatorUtils.validateEntity(softwareTestOrder, UpdateGroup.class, DefaultGroup.class);
        softwareTestOrderService.update(softwareTestOrder);

        ValidatorUtils.validateEntity(softwareTestOrderDtor.getSoftwareTestOrder(), UpdateGroup.class, DefaultGroup.class);
        Boolean result = softwareTestOrderService.save(softwareTestOrderDtor);
        return Result.ok();
    }