From 68981c58ea61ff4edc0479facfb8b76181d2a582 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 01 十二月 2023 10:54:37 +0800
Subject: [PATCH] 6
---
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java | 14 +++++++++++---
1 files changed, 11 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 738cd08..ff43239 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
@@ -120,7 +120,7 @@
Long bizId = itemCirculatOrderDto.getCirculatOrder().getId();
FlowInfoDto flowInfoDto = itemCirculatOrderDto.getFlowInfoDto();
- if (flowInfoDto != null && "tj,bl".contains(flowInfoDto.getSubmitType())) {
+ if (flowInfoDto != null && flowInfoDto.getBizId() != null && "tj,bl".contains(flowInfoDto.getSubmitType())) {
if ("tj".equals(flowInfoDto.getSubmitType())) {
workflowService.startFlow(flowInfoDto.getFlowCode(), bizId);
}
@@ -135,7 +135,7 @@
data.setId(circulatOrderid);
ItemCirculatOrder itemCirculatOrder = this.get(circulatOrderid);
data.setCirculatOrder(itemCirculatOrder);
- if (projectId==null){
+ if (projectId == null) {
projectId = itemCirculatOrder.getProjectId();
}
@@ -154,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