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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yuezhihang
2021-07-08 21:02:10 +08:00
parent 7ee390bf08 6f2f1d8b1a
commit 2bc3aa4c01
27 changed files with 430 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
+10 -10
View File
@@ -144,17 +144,17 @@ public class TodoTaskController extends BaseAction {
BusProcessName busProcessName = iBusProcessNameService.getOne(queryWrapper);
String taskIds = "";
for (Map<String, Object> map : entry.getValue()) {
taskIds += map.get("id").toString() + ",";
}
if (busProcessName != null) {
busProcessName.setTaskIds(taskIds);
busProcessName.setTaskInfo(entry.getValue().get(0).get("name").toString());
busProcessName.setMes(null);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String data = sdf.format(entry.getValue().get(0).get("createTime"));
busProcessName.setAcceptTime(data);
todoList.add(busProcessName);
if (busProcessName != null) {
busProcessName.setTaskIds(map.get("id").toString());
busProcessName.setTaskInfo(entry.getValue().get(0).get("name").toString());
busProcessName.setMes(null);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String data = sdf.format(entry.getValue().get(0).get("createTime"));
busProcessName.setAcceptTime(data);
todoList.add(busProcessName);
}
}
}
return todoList;
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DirectorSignAfter.java
+35 -12
View File
@@ -28,30 +28,29 @@ public class DirectorSignAfter implements TaskListener {
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson", object);
List<String> nextUserList = new ArrayList();
if(delegateTask.getVariable("activeFlag",Integer.class)==0){
if("1".equals(object.getString("activeFlag"))){
delegateTask.setVariable("activeFlag",1);
if (delegateTask.getVariable("actionFlag", Integer.class) == 0) {
if ("1".equals(object.getString("actionFlag"))) {
delegateTask.setVariable("actionFlag", 1);
}
}
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String standName = "";
String prcName = standName+"标准调研流程";
String prcName = standName + "标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
if (one1 != null) {
one1.setOverTime(OVERTIME);
one1.setPrcType("1");
one1.setPrcName(prcName);
@@ -70,10 +69,14 @@ public class DirectorSignAfter implements TaskListener {
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId());
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
@@ -84,6 +87,26 @@ public class DirectorSignAfter implements TaskListener {
busProcessNewNext.setUserId(nextUser);
busBean.save(busProcessNewNext);
}
} else {
if (delegateTask.getVariable("actionFlag", Integer.class) == 0) {
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("工程研究总院院长批准");
busProcessNewNext.setUserId(delegateTask.getVariable("presidentUser", String.class));
busBean.save(busProcessNewNext);
} else {
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
busBean.save(busProcessNewNext);
}
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DirectorSignBefore.java
+1
View File
@@ -15,6 +15,7 @@ public class DirectorSignBefore implements TaskListener {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.isNull("TASK_ID");
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalAfter.java
+32 -12
View File
@@ -9,13 +9,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.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
public class DockingApprovalAfter implements TaskListener {
@Override
@@ -31,7 +30,7 @@ public class DockingApprovalAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson", object);
List<String> nextUserList = new ArrayList();
List<String> nextUserList = null;
if ("1".equals(object.getString("actionFlag"))) {
delegateTask.setVariable("actionFlag", 1);
} else {
@@ -45,7 +44,7 @@ public class DockingApprovalAfter implements TaskListener {
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String standName = "";
String prcName = standName + "标准调研流程";
String prcName = standName + "标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -68,20 +67,41 @@ public class DockingApprovalAfter implements TaskListener {
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId());
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
Integer responUserCompletedCount=delegateTask.getVariable("responUserCompletedCount",Integer.class);
if(responUserCompletedCount==null)responUserCompletedCount=0;
responUserCompletedCount++;
delegateTask.setVariable("responUserCompletedCount",responUserCompletedCount);
Collection responUserList=delegateTask.getVariable("zqazqazqaUserList",Collection.class);
if(responUserCompletedCount>=responUserList.size()){
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
busProcessNewNext.setUserId(delegateTask.getVariable("startUser",String.class));
busBean.save(busProcessNewNext);
}
}else{
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("责任人上传调研结果");
busProcessNewNext.setUserId(object.getString("responUser"));
busBean.save(busProcessNewNext);
}
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalBefore.java
+6
View File
@@ -13,12 +13,18 @@ public class DockingApprovalBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.isNull("TASK_ID");
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java
+49 -14
View File
@@ -32,16 +32,12 @@ public class MinisterAndDockerSignAfter implements TaskListener {
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
List<String> userList=delegateTask.getVariable("userList",List.class);
if(delegateTask.getVariable("activeFlag",Integer.class)==0){
if("1".equals(object.getString("activeFlag"))){
delegateTask.setVariable("activeFlag",1);
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
if("1".equals(object.getString("actionFlag"))){
delegateTask.setVariable("actionFlag",1);
}
}
if(delegateTask.getVariable("activeFlag",Integer.class)==1){
nextUserList=userList;
}
@@ -52,7 +48,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String standName = "";
String prcName = standName+"标准调研流程";
String prcName = standName+"标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -65,6 +61,10 @@ public class MinisterAndDockerSignAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
@@ -75,21 +75,56 @@ public class MinisterAndDockerSignAfter implements TaskListener {
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId());
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
Integer count=delegateTask.getVariable("task3OKCount",Integer.class);
List<String> userList=delegateTask.getVariable("userList",List.class);
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
if(count==null)count=0;
count++;
delegateTask.setVariable("task3OKCount",count);
}
if(count>=userList.size()){
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busBean.save(busProcessNewNext);
}
}else {
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定");
busProcessNewNext.setUserId(delegateTask.getVariable("directorUser", String.class));
busBean.save(busProcessNewNext);
}
}else{
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
busBean.save(busProcessNewNext);
}
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignBefore.java
+3
View File
@@ -15,10 +15,13 @@ public class MinisterAndDockerSignBefore implements TaskListener {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.isNull("TASK_ID");
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignAfter.java
+6 -2
View File
@@ -45,7 +45,7 @@ public class PresidentSignAfter implements TaskListener {
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String standName = "";
String prcName = standName + "标准调研流程";
String prcName = standName + "标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -68,7 +68,11 @@ public class PresidentSignAfter implements TaskListener {
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId());
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignBefore.java
+2
View File
@@ -15,10 +15,12 @@ public class PresidentSignBefore implements TaskListener {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.isNull("TASK_ID");
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java
+40 -11
View File
@@ -35,12 +35,12 @@ public class ResponUserSignAfter implements TaskListener {
List<String> userList=delegateTask.getVariable("userList",List.class);
String startUser=delegateTask.getVariable("startUser",String.class);
if(delegateTask.getVariable("activeFlag",Integer.class)==0){
if("1".equals(object.getString("activeFlag"))){
delegateTask.setVariable("activeFlag",1);
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
if("1".equals(object.getString("actionFlag"))){
delegateTask.setVariable("actionFlag",1);
}
}
if(delegateTask.getVariable("activeFlag",Integer.class)==0){
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
nextUserList=userList;
}
@@ -53,7 +53,7 @@ public class ResponUserSignAfter implements TaskListener {
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String standName = "";
String prcName = standName+"标准调研流程";
String prcName = standName+"标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -76,18 +76,47 @@ public class ResponUserSignAfter implements TaskListener {
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId());
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
Integer count=delegateTask.getVariable("task2OKCount",Integer.class);
List<String> responUserList=delegateTask.getVariable("responUserList",List.class);
if(count==null)count=0;
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
count++;
delegateTask.setVariable("task2OKCount",count);
}
if(count>=responUserList.size()){
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busBean.save(busProcessNewNext);
}
}
}else {
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
busBean.save(busProcessNewNext);
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignBefore.java
+2
View File
@@ -15,10 +15,12 @@ public class ResponUserSignBefore implements TaskListener {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.isNull("TASK_ID");
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java
+76 -23
View File
@@ -1,5 +1,7 @@
package com.ydw.bat.wkflow.listener.StandardCommentProcess;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
@@ -13,10 +15,7 @@ import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.*;
public class SelectResponsibleUserAfter implements TaskListener {
@Override
@@ -32,17 +31,53 @@ public class SelectResponsibleUserAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
String userListString=object.getString("responUserList");
List<String> responUserList1 = delegateTask.getVariable("responUserList", List.class);
if(responUserList1==null)responUserList1=new ArrayList<>();
List<String> responUserListName1 = delegateTask.getVariable("responUserListName", List.class);
if(responUserListName1==null)responUserListName1=new ArrayList<>();
List<String> userList = Arrays.asList(userListString.split(","));
for (int i = 0; i < userList.size(); i++) {
nextUserList.add(userList.get(i).trim());
List<String> dockUserList=delegateTask.getVariable("dockUserList",List.class);
List<String> nextUserList;
String userListString=object.getString("responUserList");
String userListStringName=object.getString("responUserListName");
String userListStringDepartment=object.getString("responUserListNameDepartment");
List<String> responUserList = Arrays.asList(userListString.split(","));
for (int i = 0; i < responUserList.size(); i++) {
responUserList1.add(responUserList.get(i).trim());
}
delegateTask.setVariable("responUserList",nextUserList);
List<String> responUserListName= Arrays.asList(userListStringName.split(","));
for (String name : responUserListName) {
responUserListName1.add(name.trim());
}
nextUserList=responUserList1;
List<String> responUserListNameDepartment= Arrays.asList(userListStringDepartment.split(",").clone());
JSONArray userListJson= JSON.parseArray(delegateTask.getVariable("responUserListInfo",String.class));
if(userListJson==null)userListJson=new JSONArray();
for (int i = 0; i < responUserList.size()&&i<responUserListName.size(); i++) {
JSONObject json=new JSONObject();
json.put("id",responUserList.get(i));
json.put("name",responUserListName.get(i));
json.put("department",responUserListNameDepartment.get(i));
json.put("dockUser",delegateTask.getAssignee());
json.put("info",new JSONArray());
userListJson.add(json);
}
delegateTask.setVariable("responUserListInfo",userListJson.toJSONString());
delegateTask.setVariable("responUserList",responUserList1);
delegateTask.setVariable("responUserListName",responUserListName1);
delegateTask.setVariable("responUserCompletedCount",0);
Integer selectResponCompletedCount=delegateTask.getVariable("selectResponCompletedCount",Integer.class);
if(selectResponCompletedCount==null)selectResponCompletedCount=0;
selectResponCompletedCount++;
delegateTask.setVariable("selectResponCompletedCount",selectResponCompletedCount);
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
@@ -50,7 +85,7 @@ public class SelectResponsibleUserAfter implements TaskListener {
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String standName = "";
String prcName = standName+"标准调研流程";
String prcName = standName+"标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -73,19 +108,37 @@ public class SelectResponsibleUserAfter implements TaskListener {
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busBean.save(busProcessNewNext);
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId());
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
if(selectResponCompletedCount>=dockUserList.size()){
Collection<Object> values = userListJson;
Collection<Map<String,Object>> respon=new ArrayList<>();
for (Object value : values) {
respon.add(((JSONObject)value).getInnerMap());
}
delegateTask.setVariable("zqazqazqaUserList",respon);
if(nextUserList != null && !nextUserList.isEmpty()){
for(Map<String,Object> zqa : respon){
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
object.put("dockUser",(String)zqa.get("dockUser"));
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId((String) zqa.get("id"));
busBean.save(busProcessNewNext);
}
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserBefore.java
+3
View File
@@ -15,10 +15,13 @@ public class SelectResponsibleUserBefore implements TaskListener {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.isNull("TASK_ID");
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java
+27 -5
View File
@@ -33,18 +33,27 @@ public class StartSurveyAfter implements TaskListener {
List<String> nextUserList = new ArrayList();
List<String> userList=new ArrayList<>();
List<String> dockUserList=new ArrayList<>();
for (String dockUser : object.getString("dockUserList").split(",")) {
dockUserList.add(dockUser.trim());
}
nextUserList=dockUserList;
delegateTask.setVariable("startUser",object.getString("startUser"));
delegateTask.setVariable("dockUser",object.getString("dockUser"));
delegateTask.setVariable("dockUserList",dockUserList);
delegateTask.setVariable("ministerUser",object.getString("ministerUser"));
delegateTask.setVariable("directorUser",object.getString("directorUser"));
delegateTask.setVariable("presidentUser",object.getString("presidentUser"));
userList.add(object.getString("dockUser"));
userList.add(object.getString("ministerUser"));
userList.addAll(dockUserList);
delegateTask.setVariable("userList",userList);
delegateTask.setVariable("activeFlag",0);
delegateTask.setVariable("actionFlag",0);
delegateTask.setVariable("selectResponCompletedCount",0);
//截止时间 流程描述 创建人
@@ -53,7 +62,7 @@ public class StartSurveyAfter implements TaskListener {
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String standName = "";
String prcName = standName+"标准调研流程";
String prcName = standName+"标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -66,16 +75,20 @@ public class StartSurveyAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setUserId(delegateTask.getAssignee());
busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
if(nextUserList != null && !nextUserList.isEmpty()){
@@ -90,6 +103,15 @@ public class StartSurveyAfter implements TaskListener {
busProcessNewNext.setUserId(nextUser);
busBean.save(busProcessNewNext);
}
}else{
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("责任对接人选择责任人");
busProcessNewNext.setUserId(delegateTask.getVariable("dockUser",String.class));
busBean.save(busProcessNewNext);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyBefore.java
+2
View File
@@ -15,10 +15,12 @@ public class StartSurveyBefore implements TaskListener {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.isNull("TASK_ID");
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyAfter.java
+12 -3
View File
@@ -34,7 +34,12 @@ public class SummarySurveyAfter implements TaskListener {
List<String> responUserList=delegateTask.getVariable("responUserList",List.class);
delegateTask.setVariable("activeFlag",0);
for (int i=1;i<10;i++){
delegateTask.setVariable("task"+ i +"Count",0);
}
delegateTask.setVariable("actionFlag",0);
delegateTask.setVariable("responUserList",responUserList);
nextUserList=responUserList;
@@ -45,7 +50,7 @@ public class SummarySurveyAfter implements TaskListener {
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String standName = "";
String prcName = standName+"标准调研流程";
String prcName = standName+"标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -68,7 +73,11 @@ public class SummarySurveyAfter implements TaskListener {
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId());
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyBefore.java
+41
View File
@@ -1,5 +1,8 @@
package com.ydw.bat.wkflow.listener.StandardCommentProcess;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
@@ -15,10 +18,48 @@ public class SummarySurveyBefore implements TaskListener {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.isNull("TASK_ID");
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
JSONObject obj= JSON.parseObject(one1.getMesg());
//看全局变量里有没有存Summary,有的话就直接走，没的话就就初始化
JSONArray summaryList=JSON.parseArray(delegateTask.getVariable("summaryList",String.class));
JSONArray array = JSON.parseArray(delegateTask.getVariable("responUserListInfo",String.class));
if(summaryList==null){
summaryList=new JSONArray();
for (Object o : array) {
JSONObject object=(JSONObject)o;
JSONArray infoList=object.getObject("info",JSONArray.class);
for (Object o1 : infoList) {
JSONObject summaryEntity=new JSONObject();
JSONObject info=(JSONObject)o1;//info 具体反馈的信息
summaryEntity.put("responUser",object.getString("id"));
summaryEntity.put("responUserName",object.getString("name"));
summaryEntity.put("department",object.getString("department"));
summaryEntity.put("dockUser",object.getString("dockUser"));
summaryEntity.put("chapterNumber",info.getString("chapterNumber"));//章节编号
summaryEntity.put("chapterName",info.getString("chapterName"));//章节名称
summaryEntity.put("commentText",info.getString("commentText"));//修改意见内容
summaryEntity.put("state",null);//修改意见内容
summaryEntity.put("stateInfo",null);//修改意见内容
summaryList.add(summaryEntity);
}
}
}
obj.put("summaryList",summaryList);
delegateTask.setVariable("summaryList",summaryList.toJSONString());
one1.setMesg(obj.toJSONString());
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java
+38 -3
View File
@@ -1,5 +1,7 @@
package com.ydw.bat.wkflow.listener.StandardCommentProcess;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
@@ -17,6 +19,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Slf4j
public class UploadResearchResultAfter implements TaskListener {
@@ -31,11 +34,29 @@ public class UploadResearchResultAfter implements TaskListener {
Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
JSONArray responUserListInfo = JSON.parseArray(delegateTask.getVariable("responUserListInfo", String.class));
for (int i=0;i<responUserListInfo.size();i++) {
JSONObject jsonObject= (JSONObject) responUserListInfo.get(i);
if(jsonObject.getString("id").equals(delegateTask.getAssignee())){
if(jsonObject.getString("dockUser").equals(object.getString("dockUser"))){
JSONArray info = jsonObject.getObject("info", JSONArray.class);
info.add(object.get("info"));
object.put("responUser",jsonObject.getString("id"));
object.put("responUserName",jsonObject.getString("name"));
break;
}
}
}
delegateTask.setVariable("responUserListInfo",responUserListInfo.toJSONString());
List<String> nextUserList = new ArrayList();
delegateTask.setVariable("objectJson",object);
//截止时间 流程描述 创建人
@@ -44,7 +65,7 @@ public class UploadResearchResultAfter implements TaskListener {
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String standName = "";
String prcName = standName+"标准调研流程";
String prcName = standName+"标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -67,7 +88,11 @@ public class UploadResearchResultAfter implements TaskListener {
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId());
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
@@ -81,6 +106,16 @@ public class UploadResearchResultAfter implements TaskListener {
busProcessNewNext.setUserId(nextUser);
busBean.save(busProcessNewNext);
}
}else{
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("责任对接人审批");
busProcessNewNext.setUserId((String) delegateTask.getVariable("responUser", Map.class).get("dockUser"));
busBean.save(busProcessNewNext);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultBefore.java
+3
View File
@@ -15,10 +15,13 @@ public class UploadResearchResultBefore implements TaskListener {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.isNull("TASK_ID");
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignAfter.java
+4 -4
View File
@@ -33,9 +33,9 @@ public class DirectorSignAfter implements TaskListener {
List<String> nextUserList = new ArrayList();
if (delegateTask.getVariable("activeFlag", Integer.class) == 0) {
if ("1".equals(object.getString("activeFlag"))) {
delegateTask.setVariable("activeFlag", 1);
if (delegateTask.getVariable("actionFlag", Integer.class) == 0) {
if ("1".equals(object.getString("actionFlag"))) {
delegateTask.setVariable("actionFlag", 1);
}
}
@@ -88,7 +88,7 @@ public class DirectorSignAfter implements TaskListener {
busBean.save(busProcessNewNext);
}
} else {
if (delegateTask.getVariable("activeFlag", Integer.class) == 0) {
if (delegateTask.getVariable("actionFlag", Integer.class) == 0) {
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignBefore.java
-1
View File
@@ -20,7 +20,6 @@ public class DirectorSignBefore implements TaskListener {
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalAfter.java
+16 -15
View File
@@ -1,20 +1,21 @@
package com.ydw.bat.wkflow.listener.StandardSurvey;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
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.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
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.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import java.text.SimpleDateFormat;
import java.util.*;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class DockingApprovalAfter implements TaskListener {
@Override
@@ -86,7 +87,7 @@ public class DockingApprovalAfter implements TaskListener {
busBean.save(busProcessNewNext);
}
}else{
if(delegateTask.getVariable("activeFlag",Integer.class)==0){
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
Integer count=delegateTask.getVariable("task1Count",Integer.class);
List<String> responUserList=delegateTask.getVariable("responUserList",List.class);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java
+5 -5
View File
@@ -33,9 +33,9 @@ public class MinisterAndDockerSignAfter implements TaskListener {
List<String> nextUserList = new ArrayList();
if(delegateTask.getVariable("activeFlag",Integer.class)==0){
if("1".equals(object.getString("activeFlag"))){
delegateTask.setVariable("activeFlag",1);
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
if("1".equals(object.getString("actionFlag"))){
delegateTask.setVariable("actionFlag",1);
}
}
@@ -84,13 +84,13 @@ public class MinisterAndDockerSignAfter implements TaskListener {
Integer count=delegateTask.getVariable("task3OKCount",Integer.class);
List<String> userList=delegateTask.getVariable("userList",List.class);
if(delegateTask.getVariable("activeFlag",Integer.class)==0){
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
if(count==null)count=0;
count++;
delegateTask.setVariable("task3OKCount",count);
}
if(count>=userList.size()){
if(delegateTask.getVariable("activeFlag",Integer.class)==0){
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
BusProcessNew busProcessNewNext = new BusProcessNew();
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java
+10 -7
View File
@@ -36,12 +36,12 @@ public class ResponUserSignAfter implements TaskListener {
List<String> userList=delegateTask.getVariable("userList",List.class);
String startUser=delegateTask.getVariable("startUser",String.class);
if(delegateTask.getVariable("activeFlag",Integer.class)==0){
if("1".equals(object.getString("activeFlag"))){
delegateTask.setVariable("activeFlag",1);
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
if("1".equals(object.getString("actionFlag"))){
delegateTask.setVariable("actionFlag",1);
}
}
if(delegateTask.getVariable("activeFlag",Integer.class)==0){
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
nextUserList=userList;
}
@@ -86,14 +86,17 @@ public class ResponUserSignAfter implements TaskListener {
Integer count=delegateTask.getVariable("task2OKCount",Integer.class);
List<String> responUserList=delegateTask.getVariable("responUserList",List.class);
if(delegateTask.getVariable("activeFlag",Integer.class)==0){
if(count==null)count=0;
if(count==null)count=0;
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
count++;
delegateTask.setVariable("task2OKCount",count);
}
if(count>=responUserList.size()){
if(delegateTask.getVariable("activeFlag",Integer.class)==0){
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
BusProcessNew busProcessNewNext = new BusProcessNew();
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class StartSurveyAfter implements TaskListener {
userList.add(object.getString("ministerUser"));
delegateTask.setVariable("userList",userList);
delegateTask.setVariable("activeFlag",0);
delegateTask.setVariable("actionFlag",0);
//截止时间 流程描述 创建人
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class SummarySurveyAfter implements TaskListener {
}
delegateTask.setVariable("activeFlag",0);
delegateTask.setVariable("actionFlag",0);
delegateTask.setVariable("responUserList",responUserList);
nextUserList=responUserList;
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java
+5 -2
View File
@@ -44,8 +44,11 @@ public class UploadResearchResultAfter implements TaskListener {
delegateTask.setVariable("responUserListMap",map.toJSONString());
List<String> nextUserList = new ArrayList();
object.put("responUser",object.getString("id"));
object.put("responUserName",object.getString("name"));
object.put("responUser",jsonObject.getString("id"));
object.put("responUserName",jsonObject.getString("name"));
delegateTask.setVariable("objectJson",object);