编号

zzw

2023-11-17 e39f90ae828bcb501c0d9d39b74a148b38d69869

编号

 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({
@@ -78,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);
    }

@@ -99,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();
    }


 modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java

@@ -16,9 +16,15 @@
public class SoftwareTestOrderDto {
    private Long id;
    private Long projectId;

    @ApiModelProperty(value = "测试委托单记录")
    private SoftwareTestOrder softwareTestOrder;
    @ApiModelProperty(value = "测试项目基本信息")
    private Project project;
    @ApiModelProperty(value = "测试机构信息")
    private TestAgencyInfo TestAgencyInfo;
    @ApiModelProperty(value = "测试委托单附件")
    private OssDto files;

    @ApiModelProperty(value = "被测件")
    private List<SoftwareTestOrderMeasured> measuredList = new ArrayList<>();

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

@@ -15,6 +15,7 @@
import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import com.zt.modules.sys.service.SysDictTypeService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -57,6 +58,9 @@
    private WordFileService wordFileService;
    @Autowired
    private GetShowDictList getShowDictList;

    @Autowired
    private SysOssConfigService sysOssConfigService;

    /**
     * 分页查询
@@ -119,6 +123,7 @@
        } else {
            testAgencyInfoService.update(softwareTestOrderDto.getTestAgencyInfo());
        }
        sysOssConfigService.updateOss(softwareTestOrderDto.getId(), softwareTestOrderDto.getFiles());// 保存附件
        return true;
    }


 zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java

@@ -58,7 +58,6 @@
    private SysDeptService sysDeptService;
    @Autowired
    private SysParamsService paramsService;

    @Autowired
    SysMapService sysMapService;

@@ -69,7 +68,6 @@
        if (!user.isSuperAdmin()) {
            queryFilter.addParam("deptIds", sysDeptService.getWithDescendantIds(user.getDeptId()));
        }

        // 查询
        return queryFilter.getPageList(baseDao.getList(queryFilter.getParams()));
    }
@@ -80,7 +78,6 @@
        if (!user.isSuperAdmin()) {
            queryFilter.addParam("deptIds", sysDeptService.getWithDescendantIds(user.getDeptId()));
        }

        return baseDao.getList(queryFilter.getParams());
    }