Merge branch 'develop' into FOTON
This commit is contained in:
@@ -54,6 +54,12 @@ public class BussUtils {
|
|||||||
queryWrapper1.eq("TASK_ID", delegateTask.getId());
|
queryWrapper1.eq("TASK_ID", delegateTask.getId());
|
||||||
BusProcessNew one1 = busBean.getOne(queryWrapper1);
|
BusProcessNew one1 = busBean.getOne(queryWrapper1);
|
||||||
if (one1 != null) {
|
if (one1 != null) {
|
||||||
|
one1.setMsgType("clause");
|
||||||
|
one1.setPId(delegateTask.getProcessInstanceId());
|
||||||
|
one1.setMesg(object.toJSONString());
|
||||||
|
one1.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||||
|
one1.setFinishFlag("0");
|
||||||
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
one1.setPrcName(prcName);
|
one1.setPrcName(prcName);
|
||||||
one1.setCommitFlag(commitFlag);
|
one1.setCommitFlag(commitFlag);
|
||||||
one1.setCommitText(object.getString("commentText"));
|
one1.setCommitText(object.getString("commentText"));
|
||||||
@@ -78,6 +84,12 @@ public class BussUtils {
|
|||||||
queryWrapper1.eq("TASK_ID", delegateTask.getId());
|
queryWrapper1.eq("TASK_ID", delegateTask.getId());
|
||||||
BusProcessNew one1 = busBean.getOne(queryWrapper1);
|
BusProcessNew one1 = busBean.getOne(queryWrapper1);
|
||||||
if (one1 != null) {
|
if (one1 != null) {
|
||||||
|
one1.setMsgType("clause");
|
||||||
|
one1.setPId(delegateTask.getProcessInstanceId());
|
||||||
|
one1.setMesg(object.toJSONString());
|
||||||
|
one1.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||||
|
one1.setFinishFlag("0");
|
||||||
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
one1.setPrcName(prcName);
|
one1.setPrcName(prcName);
|
||||||
one1.setCommitFlag(commitFlag);
|
one1.setCommitFlag(commitFlag);
|
||||||
one1.setCommitText(object.getString("commentText"));
|
one1.setCommitText(object.getString("commentText"));
|
||||||
|
|||||||
Reference in New Issue
Block a user