Skip to content

T
test
Commit e0d593cb authored by 雍欢's avatar 雍欢
Browse files
Options

能够正常使用子流程

parent 90193e5d
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 73 deletions
huigou-common/pom.xml
View file @ e0d593cb
......@@ -6,7 +6,7 @@
<parent>
<groupId>com.huigou</groupId>
<artifactId>root</artifactId>
<version>1.2.6</version>
<version>1.2.7</version>
</parent>
<artifactId>huigou-common</artifactId>
<name>huigou-common</name>
......
huigou-core-api/pom.xml
View file @ e0d593cb
......@@ -6,7 +6,7 @@
<parent>
<groupId>com.huigou</groupId>
<artifactId>root</artifactId>
<version>1.2.6</version>
<version>1.2.7</version>
</parent>
<artifactId>huigou-core-api</artifactId>
<name>huigou-core-api</name>
......
huigou-core-impl/pom.xml
View file @ e0d593cb
......@@ -6,7 +6,7 @@
<parent>
<groupId>com.huigou</groupId>
<artifactId>root</artifactId>
<version>1.2.6</version>
<version>1.2.7</version>
</parent>
<artifactId>huigou-core-impl</artifactId>
<name>huigou-core-impl</name>
......
huigou-core-proxy/pom.xml
View file @ e0d593cb
......@@ -6,7 +6,7 @@
<parent>
<groupId>com.huigou</groupId>
<artifactId>root</artifactId>
<version>1.2.6</version>
<version>1.2.7</version>
</parent>
<artifactId>huigou-core-proxy</artifactId>
<name>huigou-core-proxy</name>
......
huigou-data/pom.xml
View file @ e0d593cb
......@@ -6,7 +6,7 @@
<parent>
<groupId>com.huigou</groupId>
<artifactId>root</artifactId>
<version>1.2.6</version>
<version>1.2.7</version>
</parent>
<artifactId>huigou-data</artifactId>
<name>huigou-data</name>
......
huigou-loader/pom.xml
View file @ e0d593cb
......@@ -5,7 +5,7 @@
<parent>
<groupId>com.huigou</groupId>
<artifactId>root</artifactId>
<version>1.2.6</version>
<version>1.2.7</version>
</parent>
<artifactId>huigou-loader</artifactId>
<packaging>jar</packaging>
......
huigou-system-common/pom.xml
View file @ e0d593cb
......@@ -5,7 +5,7 @@
<parent>
<groupId>com.huigou</groupId>
<artifactId>root</artifactId>
<version>1.2.6</version>
<version>1.2.7</version>
</parent>
<artifactId>huigou-system-common</artifactId>
......
huigou-uasp/pom.xml
View file @ e0d593cb
......@@ -4,7 +4,7 @@
<parent>
<groupId>com.huigou</groupId>
<artifactId>root</artifactId>
<version>1.2.6</version>
<version>1.2.7</version>
</parent>
<artifactId>huigou-uasp</artifactId>
<name>huigou-uasp</name>
......@@ -348,7 +348,7 @@
<dependency>
<groupId>com.topsunit</groupId>
<artifactId>query-spring</artifactId>
<version>1.2.6</version>
<version>1.2.7</version>
</dependency>
</dependencies>
<build>
......
huigou-uasp/src/main/java/com/huigou/uasp/bpm/FlowBroker.java
View file @ e0d593cb
package com.huigou.uasp.bpm;
import java.lang.reflect.InvocationTargetException;
import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import com.huigou.cache.SystemCache;
import com.huigou.context.*;
import com.huigou.data.domain.model.MessageConstants;
import com.huigou.exception.ApplicationException;
import com.huigou.uasp.bmp.common.application.BaseApplication;
import com.huigou.uasp.bmp.fn.impl.OrgFun;
import com.huigou.uasp.bmp.fn.impl.ProcessFun;
import com.huigou.uasp.bmp.opm.OpmUtil;
import com.huigou.uasp.bmp.opm.domain.model.agent.Agent;
import com.huigou.uasp.bmp.opm.domain.model.org.Org;
import com.huigou.uasp.bmp.opm.domain.model.org.Person;
import com.huigou.uasp.bmp.opm.proxy.AgentApplicationProxy;
import com.huigou.uasp.bmp.opm.proxy.OrgApplicationProxy;
import com.huigou.uasp.bpm.configuration.application.ApprovalRuleApplication;
import com.huigou.uasp.bpm.configuration.domain.model.*;
import com.huigou.uasp.bpm.engine.application.*;
import com.huigou.uasp.bpm.engine.domain.model.*;
import com.huigou.uasp.bpm.event.ProcessEventContext;
import com.huigou.uasp.bpm.managment.application.ProcDefinitionApplication;
import com.huigou.uasp.bpm.managment.domain.model.ProcDefinition;
import com.huigou.util.*;
import org.activiti.bpmn.model.EndEvent;
import org.activiti.bpmn.model.FlowNode;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.RepositoryService;
import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.ExecutionListener;
import org.activiti.engine.delegate.TaskListener;
import org.activiti.engine.delegate.VariableScope;
import org.activiti.engine.delegate.*;
import org.activiti.engine.impl.Condition;
import org.activiti.engine.impl.bpmn.parser.BpmnParse;
import org.activiti.engine.impl.context.Context;
......@@ -30,50 +41,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import com.huigou.cache.SystemCache;
import com.huigou.context.MessageSourceContext;
import com.huigou.context.Operator;
import com.huigou.context.OrgUnit;
import com.huigou.context.PersonMember;
import com.huigou.context.ThreadLocalUtil;
import com.huigou.context.User;
import com.huigou.data.domain.model.MessageConstants;
import com.huigou.exception.ApplicationException;
import com.huigou.uasp.bmp.common.application.BaseApplication;
import com.huigou.uasp.bmp.fn.impl.OrgFun;
import com.huigou.uasp.bmp.fn.impl.ProcessFun;
import com.huigou.uasp.bmp.opm.OpmUtil;
import com.huigou.uasp.bmp.opm.domain.model.agent.Agent;
import com.huigou.uasp.bmp.opm.domain.model.org.Org;
import com.huigou.uasp.bmp.opm.domain.model.org.Person;
import com.huigou.uasp.bmp.opm.proxy.AgentApplicationProxy;
import com.huigou.uasp.bmp.opm.proxy.OrgApplicationProxy;
import com.huigou.uasp.bpm.configuration.application.ApprovalRuleApplication;
import com.huigou.uasp.bpm.configuration.domain.model.ApprovalRule;
import com.huigou.uasp.bpm.configuration.domain.model.ApprovalRuleHandler;
import com.huigou.uasp.bpm.configuration.domain.model.ApprovalRuleHandlerAssist;
import com.huigou.uasp.bpm.configuration.domain.model.ApprovalRuleHandlerGroup;
import com.huigou.uasp.bpm.configuration.domain.model.HandlerKind;
import com.huigou.uasp.bpm.engine.application.ActApplication;
import com.huigou.uasp.bpm.engine.application.HandlerParseService;
import com.huigou.uasp.bpm.engine.application.ProcApprovalRuleParseService;
import com.huigou.uasp.bpm.engine.application.ProcUnitHandlerApplication;
import com.huigou.uasp.bpm.engine.application.WorkflowApplication;
import com.huigou.uasp.bpm.engine.domain.model.ApproveNotPassedHandleKind;
import com.huigou.uasp.bpm.engine.domain.model.HistoricTaskInstanceExtension;
import com.huigou.uasp.bpm.engine.domain.model.LimitTime;
import com.huigou.uasp.bpm.engine.domain.model.ProcUnitHandler;
import com.huigou.uasp.bpm.engine.domain.model.RuntimeTaskExtension;
import com.huigou.uasp.bpm.event.ProcessEventContext;
import com.huigou.uasp.bpm.managment.application.ProcDefinitionApplication;
import com.huigou.uasp.bpm.managment.domain.model.ProcDefinition;
import com.huigou.util.ClassHelper;
import com.huigou.util.CommonUtil;
import com.huigou.util.Constants;
import com.huigou.util.DateUtil;
import com.huigou.util.SDO;
import com.huigou.util.StringUtil;
import com.huigou.util.Util;
import javax.annotation.Resource;
import java.lang.reflect.InvocationTargetException;
import java.util.*;
public class FlowBroker extends BaseApplication implements TaskListener, ExecutionListener {
......@@ -117,6 +87,8 @@ public class FlowBroker extends BaseApplication implements TaskListener, Executi
private static final String IS_MAKE_A_COPY_FOR = "isMakeACopyFor";
private static final String PROC_UNIT_HANDLERS = "procUnitHandlers";
@Resource
protected OrgApplicationProxy orgApplication;
......@@ -1357,7 +1329,7 @@ public class FlowBroker extends BaseApplication implements TaskListener, Executi
private boolean isSelectEndFlowNode() {
if (isExclusiveGatewayManual()) {
List<Object> inputHandlers = this.getBizAndApprovalData().getList("procUnitHandlers");
List<Object> inputHandlers = this.getBizAndApprovalData().getList(PROC_UNIT_HANDLERS);
for (Object item : inputHandlers) {
@SuppressWarnings("unchecked")
Map<String, Object> m = (Map<String, Object>) item;
......@@ -1374,8 +1346,8 @@ public class FlowBroker extends BaseApplication implements TaskListener, Executi
@SuppressWarnings("unchecked")
private void calculateNextProcUnitHandlersForQueryAdvance(VariableScope variableScope, String processDefinitionKey, String nextProcUnitId) {
List<Object> inputHandlers = this.getBizAndApprovalData().getList("procUnitHandlers");
List<Map<String, Object>> handlerList = new ArrayList<>(inputHandlers.size());
List<Object> inputHandlers = this.getBizAndApprovalData().getList(PROC_UNIT_HANDLERS);
List<Map<String, Object>> handlerList = new ArrayList<Map<String, Object>>(inputHandlers.size());
checkQueryAdvance(inputHandlers);
......@@ -1558,7 +1530,7 @@ public class FlowBroker extends BaseApplication implements TaskListener, Executi
protected void doCalculateNextProcUnitHandlers(DelegateTask delegateTask) {
checkLicense();
String processDefinitionKey = processFun.getProcessApprovalDefinitionKey(delegateTask.getProcessDefinitionId());
if (getApprovalParameter().isQueryAdvanceProcessAction()) {
if (getApprovalParameter().isQueryAdvanceProcessAction() || getBizAndApprovalData().getList(PROC_UNIT_HANDLERS) != null) {
String nextProcUnitId = this.getNextProcUnitId(delegateTask);
calculateNextProcUnitHandlersForQueryAdvance(delegateTask, processDefinitionKey, nextProcUnitId);
return;
......@@ -1760,7 +1732,7 @@ public class FlowBroker extends BaseApplication implements TaskListener, Executi
}
String bizId = approvalParameter.getBizId();
if (StringUtil.isNotBlank(bizId)) {
if (approvalParameter.isQueryAdvanceProcessAction() || approvalParameter.getOnlyAdvance()) {
if (approvalParameter.isQueryAdvanceProcessAction() || getBizAndApprovalData().getList(PROC_UNIT_HANDLERS) != null || approvalParameter.getOnlyAdvance()) {
this.updateProcUnitHandlerResult();
} else {
saveBizAndApprovalData(delegateTask);
......
huigou-xt/pom.xml
View file @ e0d593cb
......@@ -4,7 +4,7 @@
<parent>
<groupId>com.huigou</groupId>
<artifactId>root</artifactId>
<version>1.2.6</version>
<version>1.2.7</version>
</parent>
<artifactId>huigou-xt</artifactId>
<name>huigou-xt</name>
......
pom.xml
View file @ e0d593cb
......@@ -6,7 +6,7 @@
<groupId>com.huigou</groupId>
<artifactId>root</artifactId>
<version>1.2.6</version>
<version>1.2.7</version>
<packaging>pom</packaging>
<modules>
......@@ -158,7 +158,7 @@
<!-- test -->
<junit.version>4.9</junit.version>
<spring-data-mongodb.version>1.9.3.RELEASE</spring-data-mongodb.version>
<huigou.uasp.version>1.2.6</huigou.uasp.version>
<huigou.uasp.version>1.2.7</huigou.uasp.version>
<classgraph.version>4.8.43</classgraph.version>
<fastjson.version>1.2.59</fastjson.version>
</properties>
......
query-spring/pom.xml
View file @ e0d593cb
......@@ -7,7 +7,7 @@
<parent>
<groupId>com.huigou</groupId>
<artifactId>root</artifactId>
<version>1.2.6</version>
<version>1.2.7</version>
</parent>
<groupId>com.topsunit</groupId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment