|
@@ -16,6 +16,8 @@ import org.springframework.stereotype.Service;
|
|
|
import java.util.*;
|
|
|
import java.util.concurrent.atomic.AtomicReference;
|
|
|
|
|
|
+import static sun.security.krb5.internal.crypto.Nonce.value;
|
|
|
+
|
|
|
/**
|
|
|
* 离散型流程表单相关处理
|
|
|
*
|
|
@@ -61,10 +63,14 @@ public class EchoNodeFormData {
|
|
|
//查询表名、条件封装的集合
|
|
|
List<BpmRunNodeFormFilterConditionsVo> formDataVoList = bpmRunNodeFromVo.getFormDataVoList();
|
|
|
formDataVoList.forEach(item -> {
|
|
|
- //表单回填数据查询
|
|
|
+ //判断是否携带流程条件信息
|
|
|
if (item.isNodeOnlyData()) {//默认是带这个流程条件信息的
|
|
|
item.getCondition().put("task_process_key", bpmRunNodeFromVo.getTaskProcessKey());
|
|
|
item.getCondition().put("task_node_key", bpmRunNodeFromVo.getTaskNodeKey());
|
|
|
+ item.getCondition().put("del_flag", 0);
|
|
|
+ }else {
|
|
|
+ item.getCondition().remove("task_process_key");
|
|
|
+ item.getCondition().remove("task_node_key");
|
|
|
}
|
|
|
//是否是节点回填数据(默认是true)
|
|
|
String listKey = item.getListKey();
|
|
@@ -82,7 +88,8 @@ public class EchoNodeFormData {
|
|
|
commonEntity.get().getResultMap().putAll(common.getResultMap());
|
|
|
}else {
|
|
|
//不是节点数据的表名做Key\对象做键
|
|
|
- commonEntity.get().getResultMap().put(item.getTableName(), common.getResultMap());
|
|
|
+ String tableName = StringUtils.toCamelCase(item.getTableName());//转驼峰
|
|
|
+ commonEntity.get().getResultMap().put(tableName, common.getResultMap());
|
|
|
}
|
|
|
}
|
|
|
}
|