From 0dff85a422669f41ef6d8e88fa24bf26ca164cbd Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 12 十二月 2023 10:38:03 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java
index 6ab29bf..7b1b237 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java
@@ -69,7 +69,9 @@
* @return
*/
public List<ConfigItemChange> page(QueryFilter queryFilter) {
- return baseDao.getList(queryFilter.getQueryParams());
+ List<ConfigItemChange> list= baseDao.getList(queryFilter.getQueryParams());
+ workflowService.getRunFlow(list,"pzxbg");
+ return list;
}
/**
@@ -97,7 +99,13 @@
for (WarehouseConfigItem configItem : configItemDto.getConfigChangeList()) {
configItem.setWarehouseId(changeId);
- configItemService.update(configItem);
+ if (configItem.getId() != null) {
+ configItemService.update(configItem);
+ } else {
+ configItem.setWarehouseId(changeId);
+ configItem.setProjectId(configItemDto.getConfigItemChange().getProjectId());
+ configItemService.insert(configItem);
+ }
Long checkId = configItem.getCheckId();
if (checkId != null) {
TestCheckOrder testCheckOrder = testCheckOrderService.get(checkId);
--
Gitblit v1.9.1