From c5c469fafb56ea9c03f25e67e5808d2abc25f699 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 19 三月 2025 13:54:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
index 819c3bf..d080ac3 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
@@ -21,10 +21,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
@Service
public class ProcessStreamServiceImpl extends ServiceImpl<ProcessStreamMapper, ProcessStream> implements IProcessStreamService {
@@ -135,10 +132,10 @@
ProductMix productMix;
if (stream.getPsvId() != null) {
productMix = new ProductMix(Long.parseLong(stream.getProcessId()),Long.parseLong(stream.getPsvId())
- ,stream.getProcessName(),stream.getProcessCode(),5);
+ ,stream.getProcessName(),stream.getProcessCode(),5,new Date());
}else {
productMix = new ProductMix(Long.parseLong(stream.getProcessId()),Long.parseLong(stream.getComponentId())
- ,stream.getProcessName(),stream.getProcessCode(),5);
+ ,stream.getProcessName(),stream.getProcessCode(),5,new Date());
}
productMixService.save(productMix);
//娣诲姞鏉冮檺楠岃瘉
@@ -146,7 +143,7 @@
permissionStream.setUserId(userId);
permissionStream.setBusinessId(stream.getProcessId());
permissionStream.setBusinessType("5");
- return permissionStreamNewService.save(permissionStream);
+ return permissionStreamNewService.addPermissionStreamNew(permissionStream);
}
@Override
--
Gitblit v1.9.3