6

jinlin

2023-12-04 4335ef915a6ed130588815256c977fe3ee0c721e

 modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java

@@ -135,8 +135,9 @@
            data.setId(circulatOrderid);
            ItemCirculatOrder itemCirculatOrder = this.get(circulatOrderid);
            data.setCirculatOrder(itemCirculatOrder);

            projectId = itemCirculatOrder.getProjectId();
            if (projectId == null) {
                projectId = itemCirculatOrder.getProjectId();
            }

            data.setTestAgencyInfo(testAgencyInfoService.get(circulatOrderid));

@@ -153,7 +154,15 @@

        if (projectId != null) {
            data.setProjectId(projectId);
            data.setProject(projectService.get(projectId));
            Project project = projectService.get(projectId);
            String type = project.getSoftwareType();
            if (type == "3") {
                type = "2";
            } else {
                type = "1";
            }
            project.setSoftwareType(type);
            data.setProject(project);
        }

        if (data.getTestAgencyInfo() == null)