From 32bb5cccaf33ed425c414b85cb39a33a3b79f81c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 20 七月 2023 16:49:23 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 2 +-
Source/UBCS-WEB/src/components/template/SetPersonnel.vue | 10 ++++++++--
Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/envent/FlowExecutionStartListener.java | 8 +++++++-
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
index 22644e7..82011b5 100644
--- a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
+++ b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
@@ -94,7 +94,9 @@
parameter:{
handler(newval,oldval){
console.log('瀛�',newval)
- }
+ this.saveParam=newval
+ },deep:true,
+ immediate:true
}
},
data() {
@@ -105,7 +107,7 @@
tags: [],
typeName: [],
collectParam: {},
- saveParam: this.setSaveParam(),
+ saveParam: {},
users: [],
rules: {
processName: [
@@ -145,7 +147,9 @@
this.collectParam = { modelKey, templateId, flowTaskUsers: flowTaskUsers }
this.users = response.data.data.user
console.log(this.collectParam)
+ console.log('this.saveParam.before',this.saveParam)
this.saveParam = { ...this.saveParam, modelKey, templateId, modelName }
+ console.log('this.saveParam',this.saveParam)
if (this.tags.length !== 0) this.handleClickTag(this.tags[0])
}
},
@@ -201,6 +205,7 @@
console.log(this.collectParam.flowTaskUsers)
console.log(len == 0)
console.log(len != this.initFrom.length)
+ console.log('saveParam',this.saveParam)
if (len == 0 && len != this.initFrom.length) {
this.$message({
type: "error",
@@ -209,6 +214,7 @@
} else {
const {modelKey,modelName,processDesc,processName,templateId,topName,vars,ids} = this.saveParam
const vals= {modelKey,modelName,processDesc,processName,templateId,topName,ids,...vars}
+ console.log('vals',vals);
const response = await personnelSave({ variables:vals, flowTaskUsers: this.collectParam.flowTaskUsers, })
if (response.status === 200) {
console.log(response)
diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/envent/FlowExecutionStartListener.java b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/envent/FlowExecutionStartListener.java
index a76039d..7cf0d5e 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/envent/FlowExecutionStartListener.java
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/envent/FlowExecutionStartListener.java
@@ -1,19 +1,25 @@
package com.vci.ubcs.flow.engine.envent;
+import com.vci.ubcs.code.feign.IFlowEventClient;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.delegate.DelegateExecution;
import org.flowable.engine.delegate.ExecutionListener;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import java.util.Map;
@Slf4j
-@Component
+//@Component
public class FlowExecutionStartListener implements ExecutionListener {
+ @Autowired(required = false)
+ private IFlowEventClient iFlowEventClient;
@Override
public void notify(DelegateExecution execution) {
Map var = execution.getVariableInstances();
+ iFlowEventClient.flowStart(var);
log.info("鎵ц娴佺▼FlowExecutionStartListener",var);
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index c07bd0f..277e6a1 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -1417,7 +1417,7 @@
maps.stream().forEach(map -> {
Map<String, String> data = new HashMap<>();
for (String s : map.keySet()) {
- data.put(s.toLowerCase(Locale.ROOT), String.valueOf(map.get(s)));
+ data.put(s.toLowerCase(Locale.ROOT), map.get(s)==null?null:String.valueOf(map.get(s)));
}
// map.forEach((key, value) -> {
// data.put(((String) key).toLowerCase(Locale.ROOT), String.valueOf(value));
--
Gitblit v1.9.3