Merge remote-tracking branch 'origin/master'

zzw

2023-11-17 ce06cb3e8167151290d68b76b3684ec49e8f31a4

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

@@ -19,6 +19,8 @@
import com.zt.life.modules.project.service.SoftwareTestOrderMeasuredService;
import com.zt.life.modules.project.service.SoftwareTestOrderService;
import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
import com.zt.life.sys.dto.OssDto;
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -58,6 +60,9 @@
    @Autowired
    private SysCodeRuleService sysCodeRuleService;

    @Autowired
    private SysOssConfigService sysOssConfigService;

    @GetMapping("page")
    @ApiOperation("分页")
    @ApiImplicitParams({
@@ -65,6 +70,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"),
@@ -77,6 +83,12 @@
    @ApiOperation("信息")
    public Result<SoftwareTestOrderDto> getDto(Long projectId,Long orderId) {
        SoftwareTestOrderDto data = softwareTestOrderService.getDto(projectId, orderId);
        if (orderId!=null) {
            OssDto ossDto = sysOssConfigService.getOssByBusiType(orderId, "test_order");
            if (ossDto != null) {
                data.setFiles(ossDto);
            }
        }
        return Result.ok(data);
    }

@@ -98,10 +110,10 @@
    @PutMapping
    @ApiOperation("修改")
    @LogOperation("修改")
    public Result update(@RequestBody SoftwareTestOrderDto softwareTestOrderDtor) {
    public Result update(@RequestBody SoftwareTestOrderDto softwareTestOrderDto) {
        //效验数据
        ValidatorUtils.validateEntity(softwareTestOrderDtor.getSoftwareTestOrder(), UpdateGroup.class, DefaultGroup.class);
        Boolean result = softwareTestOrderService.save(softwareTestOrderDtor);
        ValidatorUtils.validateEntity(softwareTestOrderDto.getSoftwareTestOrder(), UpdateGroup.class, DefaultGroup.class);
        Boolean result = softwareTestOrderService.save(softwareTestOrderDto);
        return Result.ok();
    }