From f54545abf716d0af8b5a7f9cd749fa8cd95ea65a Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期一, 04 十二月 2023 15:58:21 +0800
Subject: [PATCH] 编号
---
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
index 901ef8d..03a5329 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
+++ b/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)
--
Gitblit v1.9.1