FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

标准化活动入会流程v3

Browse Source
This commit is contained in:
Kevin
2021-10-25 15:35:36 +08:00
parent 5f6a72a2d7
commit abc898e14f
19 changed files with 133 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ChargeVerifyAfter.java → src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java
+43 -21
View File
@@ -1,4 +1,4 @@
package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess;
package com.ydw.bat.wkflow.listener.standardApplyMeetProcess;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -11,13 +11,12 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import io.swagger.models.auth.In;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
@@ -55,26 +54,49 @@ public class ChargeVerifyAfter implements TaskListener {
delegateTask.setVariable("chargePassList", objects);
}
// 审批
if("1".equals(object.getString("passFlag"))){//通过
delegateTask.setVariable("pass2",1);//排他通道
count = delegateTask.getVariable("chargePassCount",Integer.class);
delegateTask.setVariable("chargePassCount",count + 1);
objects = delegateTask.getVariable("chargePassList",JSONArray.class);
objects.add(object);
delegateTask.setVariable("chargePassList",objects);
System.out.println(delegateTask.getVariable("chargePassList"));
if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){
if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
nextUserList.add(object.getString("engineerSum"));
delegateTask.setVariable("engineerSum", nextUserList);
}//下一节点
//防止重复审批同一对象
List<String> idList = new ArrayList<>();
if(null == delegateTask.getVariable("chargeIdList")){
delegateTask.setVariable("chargeIdList", idList);
}
int rat = 0;
idList = delegateTask.getVariable("chargeIdList",List.class);
if(!idList.isEmpty()){
for(String a : idList){
if(a.equals(object.getString("member"))){
rat = 1;
break;
}
}
}
if(rat == 0){
if("1".equals(object.getString("passFlag"))){//通过
idList.add(object.getString("member"));
delegateTask.setVariable("chargeIdList",idList);
delegateTask.setVariable("pass2",1);//排他通道
count = delegateTask.getVariable("chargePassCount",Integer.class);
delegateTask.setVariable("chargePassCount",count + 1);
objects = delegateTask.getVariable("chargePassList",JSONArray.class);
objects.add(object);
delegateTask.setVariable("chargePassList",objects);
System.out.println(delegateTask.getVariable("chargePassList"));
if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){
if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
nextUserList.add(object.getString("engineerSum"));
delegateTask.setVariable("engineerSum", nextUserList);
}//下一节点
}
}else{
delegateTask.setVariable("pass2",0);//排他通道
if(StringUtils.isNotBlank(object.getString("member"))) {
nextUserList.add(object.getString("member"));
delegateTask.setVariable("member", nextUserList);
}//驳回重写
}
}else{
delegateTask.setVariable("pass2",0);//排他通道
if(StringUtils.isNotBlank(object.getString("member"))) {
nextUserList.add(object.getString("member"));
delegateTask.setVariable("member", nextUserList);
}//驳回重写
throw new ActivitiException("审批过了");
}
// 存储当前节点意见
if (null != object.getString("commentText")) {
src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ChargeVerifyBefore.java → src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess;
package com.ydw.bat.wkflow.listener.standardApplyMeetProcess;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/DirectorChooseAfter.java → src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java
+34 -12
View File
@@ -1,4 +1,4 @@
package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess;
package com.ydw.bat.wkflow.listener.standardApplyMeetProcess;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,12 +10,11 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
@@ -48,16 +47,39 @@ public class DirectorChooseAfter implements TaskListener {
delegateTask.setVariable("memberList", passMemberList);
}
if("1".equals(object.getString("passFlag"))) {
nextUserList.add(object.getString("memberId"));
if (null!=delegateTask.getVariable("memberList")) {
List<String> middle=delegateTask.getVariable("memberList",List.class);
middle.addAll(nextUserList);
delegateTask.setVariable("memberList",middle);
}else {
delegateTask.setVariable("memberList",nextUserList);
//防止重复审批同一对象
List<String> idList = new ArrayList<>();
if(null == delegateTask.getVariable("memberIdList")){
delegateTask.setVariable("memberIdList", idList);
}
int rat = 0;
idList = delegateTask.getVariable("memberIdList",List.class);
if(!idList.isEmpty()){
for(String a : idList){
if(a.equals(object.getString("member"))){
rat = 1;
break;
}
}
delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size());
}
if(rat == 0){
if("1".equals(object.getString("passFlag"))) {
idList.add(object.getString("member"));
delegateTask.setVariable("memberIdList",idList);
nextUserList.add(object.getString("memberId"));
if (null!=delegateTask.getVariable("memberList")) {
List<String> middle=delegateTask.getVariable("memberList",List.class);
middle.addAll(nextUserList);
delegateTask.setVariable("memberList",middle);
}else {
delegateTask.setVariable("memberList",nextUserList);
}
delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size());
}
}else{
throw new ActivitiException("此对象已经审批过了");
}
src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/DirectorChooseBefore.java → src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess;
package com.ydw.bat.wkflow.listener.standardApplyMeetProcess;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseAfter.java → src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java
+1 -2
View File
@@ -1,4 +1,4 @@
package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess;
package com.ydw.bat.wkflow.listener.standardApplyMeetProcess;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -15,7 +15,6 @@ import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseBefore.java → src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess;
package com.ydw.bat.wkflow.listener.standardApplyMeetProcess;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseDoneAfter.java → src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java
+1 -3
View File
@@ -1,4 +1,4 @@
package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess;
package com.ydw.bat.wkflow.listener.standardApplyMeetProcess;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -12,11 +12,9 @@ import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.lang.StringUtils;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseDoneBefore.java → src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess;
package com.ydw.bat.wkflow.listener.standardApplyMeetProcess;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/Kev.java → src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/Kev.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess;
package com.ydw.bat.wkflow.listener.standardApplyMeetProcess;
/**
src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/LeaderVerifyAfter.java → src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess;
package com.ydw.bat.wkflow.listener.standardApplyMeetProcess;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/LeaderVerifyBefore.java → src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess;
package com.ydw.bat.wkflow.listener.standardApplyMeetProcess;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ManageSignAfter.java → src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java
+40 -16
View File
@@ -1,4 +1,4 @@
package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess;
package com.ydw.bat.wkflow.listener.standardApplyMeetProcess;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,6 +10,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.lang.StringUtils;
@@ -44,25 +45,48 @@ public class ManageSignAfter implements TaskListener {
if(null == delegateTask.getVariable("managePassCount")){
delegateTask.setVariable("managePassCount",count);
}
//999999999
if("1".equals(object.getString("passFlag"))) {//通过
count = delegateTask.getVariable("managePassCount",Integer.class);
count++;
delegateTask.setVariable("managePassCount",count);
if(delegateTask.getVariable("managePassCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){
if(StringUtils.isNotBlank(object.getString("president"))) {
nextUserList.add(object.getString("president"));
delegateTask.setVariable("president", nextUserList);
//防止重复审批同一对象
List<String> idList = new ArrayList<>();
if(null == delegateTask.getVariable("manageIdList")){
delegateTask.setVariable("manageIdList", idList);
}
int rat = 0;
idList = delegateTask.getVariable("manageIdList",List.class);
if(!idList.isEmpty()){
for(String a : idList){
if(a.equals(object.getString("manageDepartment"))){
rat = 1;
break;
}
delegateTask.setVariable("pass4",1);
}
}
if(rat == 0){
if("1".equals(object.getString("passFlag"))) {//通过
}else{
delegateTask.setVariable("pass4",0);
if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
nextUserList.add(object.getString("engineerSum"));
delegateTask.setVariable("engineerSum", nextUserList);
idList.add(object.getString("manageDepartment"));
delegateTask.setVariable("manageIdList",idList);
count = delegateTask.getVariable("managePassCount",Integer.class);
count++;
delegateTask.setVariable("managePassCount",count);
if(delegateTask.getVariable("managePassCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){
if(StringUtils.isNotBlank(object.getString("president"))) {
nextUserList.add(object.getString("president"));
delegateTask.setVariable("president", nextUserList);
}
delegateTask.setVariable("pass4",1);
}
}else{
delegateTask.setVariable("pass4",0);
if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
nextUserList.add(object.getString("engineerSum"));
delegateTask.setVariable("engineerSum", nextUserList);
}
}
}else{
throw new ActivitiException("此对象已经审批过了");
}
// 存储当前节点意见
if (null != object.getString("commentText")) {
src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ManageSignBefore.java → src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess;
package com.ydw.bat.wkflow.listener.standardApplyMeetProcess;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/PresidentVerifyAfter.java → src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java
+1 -2
View File
@@ -1,4 +1,4 @@
package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess;
package com.ydw.bat.wkflow.listener.standardApplyMeetProcess;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -15,7 +15,6 @@ import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/PresidentVerifyBefore.java → src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess;
package com.ydw.bat.wkflow.listener.standardApplyMeetProcess;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMaterialAfter.java → src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java
+1 -3
View File
@@ -1,4 +1,4 @@
package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess;
package com.ydw.bat.wkflow.listener.standardApplyMeetProcess;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -14,10 +14,8 @@ import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.lang.StringUtils;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMaterialBefore.java → src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess;
package com.ydw.bat.wkflow.listener.standardApplyMeetProcess;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMemberInfoAfter.java → src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java
+1 -2
View File
@@ -1,4 +1,4 @@
package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess;
package com.ydw.bat.wkflow.listener.standardApplyMeetProcess;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -15,7 +15,6 @@ import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMemberInfoBefore.java → src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess;
package com.ydw.bat.wkflow.listener.standardApplyMeetProcess;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;