Changes

jinlin

2023-11-10 1c9bac5b899d0aad92b6c08afe9a7b9f2340c3f3

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

@@ -66,22 +66,22 @@
        return PageResult.ok(softwareTestOrderService.page(queryFilter));
    }

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

        if (id != null) {
            data.setId(id);
            SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(id);
        if (orderId != null) {
            data.setId(orderId);
            SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(orderId);
            data.setSoftwareTestOrder(softwareTestOrder);

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

            data.setTestAgencyInfo(testAgencyInfoService.get(id));
            data.setSoftwareTestOrderDeliverableList(softwareTestOrderDeliverableService.childrenTables(id));
            data.setSoftwareTestOrderMeasuredList(softwareTestOrderMeasuredService.childrenTables(id));
            data.setTestAgencyInfo(testAgencyInfoService.get(orderId));
            data.setSoftwareTestOrderDeliverableList(softwareTestOrderDeliverableService.childrenTables(orderId));
            data.setSoftwareTestOrderMeasuredList(softwareTestOrderMeasuredService.childrenTables(orderId));
        } else {
            data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
        }