Changes

jinlin

2023-11-16 3255e92c69c8cdff4df710d5eb8a73af2fe681a7

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

@@ -13,10 +13,7 @@
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
import com.zt.life.modules.project.model.Project;
import com.zt.life.modules.project.model.SoftwareTestOrder;
import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
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;
@@ -27,18 +24,14 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;


/**
@@ -72,6 +65,7 @@
            @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
            @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
            @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
            @ApiImplicitParam(name = "softwareName", value = "软件名称", dataType = Constant.QT.STRING, format = "software_name^EQ"),
            @ApiImplicitParam(name = "testBasis", value = "测试依据", dataType = Constant.QT.STRING, format = "test_basis^EQ"),
            @ApiImplicitParam(name = "testType", value = "测试类型", dataType = Constant.QT.STRING, format = "test_type^EQ"),
            @ApiImplicitParam(name = "testStandard", value = "测试标准", dataType = Constant.QT.STRING, format = "test_standard^EQ"),
@@ -82,8 +76,8 @@

    @GetMapping("getDto")
    @ApiOperation("信息")
    public Result<SoftwareTestOrderDto> getDto(Long orderId, Long projectId) {
        SoftwareTestOrderDto data = softwareTestOrderService.getDto(orderId, projectId);
    public Result<SoftwareTestOrderDto> getDto(Long projectId,Long orderId) {
        SoftwareTestOrderDto data = softwareTestOrderService.getDto(projectId, orderId);
        return Result.ok(data);
    }

@@ -112,7 +106,7 @@
        return Result.ok();
    }

    @DeleteMapping
    @DeleteMapping("deleteOrder")
    @ApiOperation("删除")
    @LogOperation("删除")
    public Result delete(@RequestBody Long[] ids) {
@@ -123,10 +117,10 @@
        return Result.ok();
    }

    @GetMapping("exportWord/{id}")
    @GetMapping("exportWord")
    @ApiOperation("打印测试委托单")
    @LogOperation("打印测试委托单")
    public void exportWord(@PathVariable("id") Long id, HttpServletRequest request, HttpServletResponse response) {
    public void exportWord(Long id, HttpServletRequest request, HttpServletResponse response) {
        softwareTestOrderService.exportWord(id, request, response);
    }
}