Changes

jinlin

2023-11-10 cb573b4eee7426d0d614fd59f48c1e8575738b8e

Changes

 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));
        }

 web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue

@@ -76,15 +76,19 @@
    data() {
      return {
        dataForm: {
          id: '',
          projectId: ''
          id: null,
          projectId: null
        }
      }
    },
    methods: {
      // 获取信息
      async getInfo() {
        let res = await this.$http.get(`/project/SoftwareTestOrder/${this.dataForm.id}`)
        let params = {
          orderId: this.dataForm.id,
          projectId: this.dataForm.projectId
        }
        let res = await this.$http.get(`/project/SoftwareTestOrder/getDto`, {params: params})
        this.dataForm = {
          ...this.dataForm,
          ...res.data