From da4cb0bcbb9c35105afe449b31b3e2b03828d5d2 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 06 十二月 2023 11:32:29 +0800
Subject: [PATCH] 6
---
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
index f2734d2..61b9549 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
@@ -15,6 +15,8 @@
import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
import com.zt.life.modules.project.service.ProjectService;
import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
+import com.zt.life.modules.testCheckOrder.model.TestCheckOrder;
+import com.zt.life.modules.testCheckOrder.service.TestCheckOrderService;
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import com.zt.modules.oss.service.SysOssService;
@@ -62,6 +64,9 @@
@Autowired
private WarehouseConfigItemService configItemService;
+ @Autowired
+ private TestCheckOrderService testCheckOrderService;
+
/**
* 鍒嗛〉鏌ヨ
*
@@ -103,6 +108,15 @@
configItem.setWarehouseId(warehouseId);
configItemService.insert(configItem);
}
+ Long checkId = configItem.getCheckId();
+ if (checkId != null) {
+ TestCheckOrder testCheckOrder = testCheckOrderService.get(checkId);
+ if (testCheckOrder.getConfigItemId() == null) {
+ Long configItemId = configItem.getId();
+ testCheckOrder.setConfigItemId(configItemId);
+ testCheckOrderService.update(testCheckOrder);
+ }
+ }
sysOssConfigService.updateOss(configItem.getId(), configItem.getFiles());// 淇濆瓨闄勪欢
}
@@ -129,7 +143,7 @@
Long bizId = configItemDto.getConfigItemWarehouse().getId();
FlowInfoDto flowInfoDto = configItemDto.getFlowInfoDto();
- if (flowInfoDto != null && "tj,bl".contains(flowInfoDto.getSubmitType())) {
+ if (flowInfoDto != null && flowInfoDto.getSubmitType() != null && "tj,bl".contains(flowInfoDto.getSubmitType())) {
if ("tj".equals(flowInfoDto.getSubmitType())) {
workflowService.startFlow(flowInfoDto.getFlowCode(), bizId);
}
--
Gitblit v1.9.1