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

征求意见流程汇总bug修复

Browse Source
This commit is contained in:
yuezhihang
2021-12-16 09:46:06 +08:00
parent f8cdb28f09
commit e82ad2e967
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/StartSurveyAfter.java
+4
View File
@@ -15,6 +15,7 @@ import com.ydw.bat.wkflow.util.http.ResponseMessage;
import org.activiti.engine.ActivitiException; import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener; import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.lang.StringUtils;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
@@ -91,7 +92,9 @@ public class StartSurveyAfter implements TaskListener {
busBean.save(busProcessNew); busBean.save(busProcessNew);
if(nextUserList != null && !nextUserList.isEmpty()){ if(nextUserList != null && !nextUserList.isEmpty()){
int i=0;
for(String nextUser : nextUserList){ for(String nextUser : nextUserList){
object.put("onlyKey", i);
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause"); busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
@@ -102,6 +105,7 @@ public class StartSurveyAfter implements TaskListener {
busProcessNewNext.setUserId(nextUser); busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName); busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
i++;
} }
}else{ }else{
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step1After.java
+5 -11
View File
@@ -44,18 +44,12 @@ public class Step1After implements TaskListener {
nextUserList.add(object.getString("responUserList")); nextUserList.add(object.getString("responUserList"));
} }
delegateTask.setVariable("zrIdList",nextUserList); delegateTask.setVariable("zrIdList",nextUserList);
if (null==delegateTask.getVariable("zrList")){ if (null==delegateTask.getVariable("zrList"+object.getString("onlyKey"))){
delegateTask.setVariable("zrList",nextUserList); delegateTask.setVariable("zrList"+object.getString("onlyKey"),nextUserList);
}else { }else {
List<String> strings=delegateTask.getVariable("zrList",List.class); List<String> strings=delegateTask.getVariable("zrList"+object.getString("onlyKey"),List.class);
List<String> middle=new ArrayList<>(); strings.addAll(nextUserList);
nextUserList.forEach(s -> { delegateTask.setVariable("zrList"+object.getString("onlyKey"),strings);
if (!strings.contains(s)){
middle.add(s);
}
});
strings.addAll(middle);
delegateTask.setVariable("zrList",strings);
} }
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step2After.java
+7 -7
View File
@@ -37,16 +37,16 @@ public class Step2After implements TaskListener {
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList();
//整备数据 //整备数据
if (null==delegateTask.getVariable("count")){ if (null==delegateTask.getVariable("count"+object.getString("onlyKey"))){
delegateTask.setVariable("count",1); delegateTask.setVariable("count"+object.getString("onlyKey"),1);
}else { }else {
delegateTask.setVariable("count",delegateTask.getVariable("count",Integer.class)+1); delegateTask.setVariable("count"+object.getString("onlyKey"),delegateTask.getVariable("count"+object.getString("onlyKey"),Integer.class)+1);
} }
if (delegateTask.getVariable("count",Integer.class) == delegateTask.getVariable("zrIdList",List.class).size()){ if (delegateTask.getVariable("count"+object.getString("onlyKey"),Integer.class) == delegateTask.getVariable("zrList"+object.getString("onlyKey"),List.class).size()){
//对数据进行合并归属 //对数据进行合并归属
QueryWrapper<BusProcessNew> wrapper=new QueryWrapper<>(); QueryWrapper<BusProcessNew> wrapper=new QueryWrapper<>();
wrapper.eq("TASK_ID","SCN"); wrapper.eq("TASK_ID",object.getString("onlyKey"));
wrapper.eq("P_ID",delegateTask.getProcessInstanceId()); wrapper.eq("P_ID",delegateTask.getProcessInstanceId());
List<BusProcessNew> busProcessNews= busBean.list(wrapper); List<BusProcessNew> busProcessNews= busBean.list(wrapper);
@@ -101,8 +101,8 @@ public class Step2After implements TaskListener {
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
if (delegateTask.getVariable("count",Integer.class) < delegateTask.getVariable("zrIdList",List.class).size()){ if (delegateTask.getVariable("count"+object.getString("onlyKey"),Integer.class) < delegateTask.getVariable("zrList"+object.getString("onlyKey"),List.class).size()){
busProcessNewNext.setTaskId("SCN"); busProcessNewNext.setTaskId(object.getString("onlyKey"));
} }
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser); busProcessNewNext.setUserId(nextUser);