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 | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 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 61432bf..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;
@@ -23,6 +25,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
+
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
@@ -32,11 +35,11 @@
/**
* config_item_warehouse
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2023-11-27
*/
@Service
-public class ConfigItemWarehouseService extends BaseService<ConfigItemWarehouseDao, ConfigItemWarehouse> {
+public class ConfigItemWarehouseService extends BaseService<ConfigItemWarehouseDao, ConfigItemWarehouse> {
@Autowired
private SysOssConfigService sysOssConfigService;
@@ -60,6 +63,9 @@
@Autowired
private WarehouseConfigItemService configItemService;
+
+ @Autowired
+ private TestCheckOrderService testCheckOrderService;
/**
* 鍒嗛〉鏌ヨ
@@ -87,7 +93,7 @@
else {
Map<String, String> map = new HashMap<>();
map.put("funCode", "config_item_warehouse");
- map.put("projectId",configItemDto.getProjectId().toString());
+ map.put("projectId", configItemDto.getProjectId().toString());
configItemDto.getConfigItemWarehouse().setProjectId(configItemDto.getProjectId());
configItemDto.getConfigItemWarehouse().setCode(sysCodeRuleService.getNewCode(map));
baseDao.insert(configItemDto.getConfigItemWarehouse());
@@ -101,6 +107,15 @@
} else {
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());// 淇濆瓨闄勪欢
}
@@ -128,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);
}
@@ -144,7 +159,7 @@
ConfigItemWarehouse configItemWarehouse = this.get(warehouseId);
data.setConfigItemWarehouse(configItemWarehouse);
- if (projectId==null) {
+ if (projectId == null) {
projectId = configItemWarehouse.getProjectId();
}
List<WarehouseCmAudit> CmAuditList = cmAuditService.getList(warehouseId);
@@ -155,7 +170,7 @@
data.setConfigItemList(ConfigItemList);
} else {
- ConfigItemWarehouse configItemWarehouse =new ConfigItemWarehouse();
+ ConfigItemWarehouse configItemWarehouse = new ConfigItemWarehouse();
data.setConfigItemWarehouse(configItemWarehouse);
List<?> cmList = baseDao.itemList("warehouse_cm_audit");
List<?> CmAuditList = cmList;
--
Gitblit v1.9.1