BUG: 修改企标制修订的发送OA连接的新旧数据判断
This commit is contained in:
@@ -6,8 +6,10 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessHistoryService;
|
|||||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||||
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
||||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||||
|
import org.activiti.engine.ProcessEngine;
|
||||||
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.activiti.engine.history.HistoricProcessInstance;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -31,8 +33,17 @@ public class BLApplicantC1Before implements TaskListener{
|
|||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
busBean.saveOrUpdate(one1);
|
busBean.saveOrUpdate(one1);
|
||||||
|
|
||||||
|
ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class);
|
||||||
|
HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据(历史表)相关的Service
|
||||||
|
.createHistoricProcessInstanceQuery()//创建历史流程实例查询
|
||||||
|
.processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询
|
||||||
|
.singleResult();
|
||||||
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
||||||
one1.setLink("bussLibraryC1?prcType=buss1");
|
String link = "bussLibraryC1?prcType=buss1";
|
||||||
|
if (pi != null && pi.getStartTime().after(BussUtils.oldAndNew)) {
|
||||||
|
link = link + "&taskDefinitionKey=bussLibraryC1&oldAndNew=new";
|
||||||
|
}
|
||||||
|
one1.setLink(link);
|
||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
oaService.sendTodoMq(one1);
|
oaService.sendTodoMq(one1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,8 +6,10 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessHistoryService;
|
|||||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||||
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
||||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||||
|
import org.activiti.engine.ProcessEngine;
|
||||||
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.activiti.engine.history.HistoricProcessInstance;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -31,8 +33,17 @@ public class BussLibrary10Before implements TaskListener{
|
|||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
busBean.saveOrUpdate(one1);
|
busBean.saveOrUpdate(one1);
|
||||||
|
|
||||||
|
ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class);
|
||||||
|
HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据(历史表)相关的Service
|
||||||
|
.createHistoricProcessInstanceQuery()//创建历史流程实例查询
|
||||||
|
.processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询
|
||||||
|
.singleResult();
|
||||||
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
||||||
one1.setLink("bussLibrary10?prcType=buss1");
|
String link = "bussLibrary10?prcType=buss1";
|
||||||
|
if (pi != null && pi.getStartTime().after(BussUtils.oldAndNew)) {
|
||||||
|
link = link + "&taskDefinitionKey=bussLibrary10&oldAndNew=new";
|
||||||
|
}
|
||||||
|
one1.setLink(link);
|
||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
oaService.sendTodoMq(one1);
|
oaService.sendTodoMq(one1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,8 +6,10 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessHistoryService;
|
|||||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||||
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
||||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||||
|
import org.activiti.engine.ProcessEngine;
|
||||||
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.activiti.engine.history.HistoricProcessInstance;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -31,8 +33,17 @@ public class BussLibrary11Before implements TaskListener{
|
|||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
busBean.saveOrUpdate(one1);
|
busBean.saveOrUpdate(one1);
|
||||||
|
|
||||||
|
ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class);
|
||||||
|
HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据(历史表)相关的Service
|
||||||
|
.createHistoricProcessInstanceQuery()//创建历史流程实例查询
|
||||||
|
.processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询
|
||||||
|
.singleResult();
|
||||||
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
||||||
one1.setLink("bussLibrary11?prcType=buss1");
|
String link = "bussLibrary11?prcType=buss1";
|
||||||
|
if (pi != null && pi.getStartTime().after(BussUtils.oldAndNew)) {
|
||||||
|
link = link + "&taskDefinitionKey=bussLibrary11&oldAndNew=new";
|
||||||
|
}
|
||||||
|
one1.setLink(link);
|
||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
oaService.sendTodoMq(one1);
|
oaService.sendTodoMq(one1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,8 +9,10 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessHistoryService;
|
|||||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||||
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
||||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||||
|
import org.activiti.engine.ProcessEngine;
|
||||||
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.activiti.engine.history.HistoricProcessInstance;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -34,8 +36,17 @@ public class BussLibrary12Before implements TaskListener{
|
|||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
busBean.saveOrUpdate(one1);
|
busBean.saveOrUpdate(one1);
|
||||||
|
|
||||||
|
ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class);
|
||||||
|
HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据(历史表)相关的Service
|
||||||
|
.createHistoricProcessInstanceQuery()//创建历史流程实例查询
|
||||||
|
.processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询
|
||||||
|
.singleResult();
|
||||||
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
||||||
one1.setLink("bussLibrary12?prcType=buss1");
|
String link = "bussLibrary12?prcType=buss1";
|
||||||
|
if (pi != null && pi.getStartTime().after(BussUtils.oldAndNew)) {
|
||||||
|
link = link + "&taskDefinitionKey=bussLibrary12&oldAndNew=new";
|
||||||
|
}
|
||||||
|
one1.setLink(link);
|
||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
oaService.sendTodoMq(one1);
|
oaService.sendTodoMq(one1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,8 +6,10 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessHistoryService;
|
|||||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||||
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
||||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||||
|
import org.activiti.engine.ProcessEngine;
|
||||||
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.activiti.engine.history.HistoricProcessInstance;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -31,8 +33,17 @@ public class BussLibrary13Before implements TaskListener{
|
|||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
busBean.saveOrUpdate(one1);
|
busBean.saveOrUpdate(one1);
|
||||||
|
|
||||||
|
ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class);
|
||||||
|
HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据(历史表)相关的Service
|
||||||
|
.createHistoricProcessInstanceQuery()//创建历史流程实例查询
|
||||||
|
.processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询
|
||||||
|
.singleResult();
|
||||||
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
||||||
one1.setLink("bussLibrary13?prcType=buss1");
|
String link = "bussLibrary13?prcType=buss1";
|
||||||
|
if (pi != null && pi.getStartTime().after(BussUtils.oldAndNew)) {
|
||||||
|
link = link + "&taskDefinitionKey=bussLibrary13&oldAndNew=new";
|
||||||
|
}
|
||||||
|
one1.setLink(link);
|
||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
oaService.sendTodoMq(one1);
|
oaService.sendTodoMq(one1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,9 +7,12 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessHistoryService;
|
|||||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||||
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
||||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||||
|
import org.activiti.engine.ProcessEngine;
|
||||||
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.activiti.engine.history.HistoricProcessInstance;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -39,8 +42,17 @@ public class BussLibrary2Before implements TaskListener{
|
|||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
busBean.saveOrUpdate(one1);
|
busBean.saveOrUpdate(one1);
|
||||||
|
|
||||||
|
ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class);
|
||||||
|
HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据(历史表)相关的Service
|
||||||
|
.createHistoricProcessInstanceQuery()//创建历史流程实例查询
|
||||||
|
.processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询
|
||||||
|
.singleResult();
|
||||||
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
||||||
one1.setLink("bussLibrary2?prcType=buss1");
|
String link = "bussLibrary2?prcType=buss1";
|
||||||
|
if (pi != null && pi.getStartTime().after(BussUtils.oldAndNew)) {
|
||||||
|
link = link + "&taskDefinitionKey=bussLibrary2&oldAndNew=new";
|
||||||
|
}
|
||||||
|
one1.setLink(link);
|
||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
oaService.sendTodoMq(one1);
|
oaService.sendTodoMq(one1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,8 +9,10 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessHistoryService;
|
|||||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||||
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
||||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||||
|
import org.activiti.engine.ProcessEngine;
|
||||||
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.activiti.engine.history.HistoricProcessInstance;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -43,8 +45,17 @@ public class BussLibrary3Before implements TaskListener{
|
|||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
busBean.saveOrUpdate(one1);
|
busBean.saveOrUpdate(one1);
|
||||||
|
|
||||||
|
ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class);
|
||||||
|
HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据(历史表)相关的Service
|
||||||
|
.createHistoricProcessInstanceQuery()//创建历史流程实例查询
|
||||||
|
.processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询
|
||||||
|
.singleResult();
|
||||||
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
||||||
one1.setLink("bussLibrary3?prcType=buss1");
|
String link = "bussLibrary3?prcType=buss1";
|
||||||
|
if (pi != null && pi.getStartTime().after(BussUtils.oldAndNew)) {
|
||||||
|
link = link + "&taskDefinitionKey=bussLibrary3&oldAndNew=new";
|
||||||
|
}
|
||||||
|
one1.setLink(link);
|
||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
oaService.sendTodoMq(one1);
|
oaService.sendTodoMq(one1);
|
||||||
|
|
||||||
|
|||||||
@@ -6,8 +6,10 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessHistoryService;
|
|||||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||||
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
||||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||||
|
import org.activiti.engine.ProcessEngine;
|
||||||
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.activiti.engine.history.HistoricProcessInstance;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -31,8 +33,17 @@ public class BussLibrary4Before implements TaskListener{
|
|||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
busBean.saveOrUpdate(one1);
|
busBean.saveOrUpdate(one1);
|
||||||
|
|
||||||
|
ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class);
|
||||||
|
HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据(历史表)相关的Service
|
||||||
|
.createHistoricProcessInstanceQuery()//创建历史流程实例查询
|
||||||
|
.processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询
|
||||||
|
.singleResult();
|
||||||
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
||||||
one1.setLink("bussLibrary4?prcType=buss1");
|
String link = "bussLibrary4?prcType=buss1";
|
||||||
|
if (pi != null && pi.getStartTime().after(BussUtils.oldAndNew)) {
|
||||||
|
link = link + "&taskDefinitionKey=bussLibrary4&oldAndNew=new";
|
||||||
|
}
|
||||||
|
one1.setLink(link);
|
||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
oaService.sendTodoMq(one1);
|
oaService.sendTodoMq(one1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,8 +7,10 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessHistoryService;
|
|||||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||||
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
||||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||||
|
import org.activiti.engine.ProcessEngine;
|
||||||
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.activiti.engine.history.HistoricProcessInstance;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -38,8 +40,17 @@ public class BussLibrary5Before implements TaskListener{
|
|||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
busBean.saveOrUpdate(one1);
|
busBean.saveOrUpdate(one1);
|
||||||
|
|
||||||
|
ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class);
|
||||||
|
HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据(历史表)相关的Service
|
||||||
|
.createHistoricProcessInstanceQuery()//创建历史流程实例查询
|
||||||
|
.processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询
|
||||||
|
.singleResult();
|
||||||
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
||||||
one1.setLink("bussLibrary5?prcType=buss1");
|
String link = "bussLibrary5?prcType=buss1";
|
||||||
|
if (pi != null && pi.getStartTime().after(BussUtils.oldAndNew)) {
|
||||||
|
link = link + "&taskDefinitionKey=bussLibrary5&oldAndNew=new";
|
||||||
|
}
|
||||||
|
one1.setLink(link);
|
||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
oaService.sendTodoMq(one1);
|
oaService.sendTodoMq(one1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,8 +9,10 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessHistoryService;
|
|||||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||||
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
||||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||||
|
import org.activiti.engine.ProcessEngine;
|
||||||
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.activiti.engine.history.HistoricProcessInstance;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -44,8 +46,17 @@ public class BussLibrary6Before implements TaskListener{
|
|||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
busBean.saveOrUpdate(one1);
|
busBean.saveOrUpdate(one1);
|
||||||
|
|
||||||
|
ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class);
|
||||||
|
HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据(历史表)相关的Service
|
||||||
|
.createHistoricProcessInstanceQuery()//创建历史流程实例查询
|
||||||
|
.processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询
|
||||||
|
.singleResult();
|
||||||
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
||||||
one1.setLink("bussLibrary5?prcType=buss1");
|
String link = "bussLibrary6?prcType=buss1";
|
||||||
|
if (pi != null && pi.getStartTime().after(BussUtils.oldAndNew)) {
|
||||||
|
link = link + "&taskDefinitionKey=bussLibrary6&oldAndNew=new";
|
||||||
|
}
|
||||||
|
one1.setLink(link);
|
||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
oaService.sendTodoMq(one1);
|
oaService.sendTodoMq(one1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,8 +6,10 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessHistoryService;
|
|||||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||||
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
||||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||||
|
import org.activiti.engine.ProcessEngine;
|
||||||
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.activiti.engine.history.HistoricProcessInstance;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -32,7 +34,19 @@ public class BussLibrary7Before implements TaskListener{
|
|||||||
busBean.saveOrUpdate(one1);
|
busBean.saveOrUpdate(one1);
|
||||||
|
|
||||||
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
||||||
one1.setLink("bussLibrary7?prcType=buss1");
|
String link = "bussLibrary7?prcType=buss1";
|
||||||
|
ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class);
|
||||||
|
HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据(历史表)相关的Service
|
||||||
|
.createHistoricProcessInstanceQuery()//创建历史流程实例查询
|
||||||
|
.processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询
|
||||||
|
.singleResult();
|
||||||
|
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
||||||
|
if (pi != null && pi.getStartTime().after(BussUtils.oldAndNew)) {
|
||||||
|
link = link + "&taskDefinitionKey=bussLibrary7&oldAndNew=new";
|
||||||
|
one1.setLink(link);
|
||||||
|
} else {
|
||||||
|
one1.setLink(link);
|
||||||
|
}
|
||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
oaService.sendTodoMq(one1);
|
oaService.sendTodoMq(one1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,8 +6,10 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessHistoryService;
|
|||||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||||
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
||||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||||
|
import org.activiti.engine.ProcessEngine;
|
||||||
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.activiti.engine.history.HistoricProcessInstance;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -31,8 +33,17 @@ public class BussLibrary8Before implements TaskListener{
|
|||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
busBean.saveOrUpdate(one1);
|
busBean.saveOrUpdate(one1);
|
||||||
|
|
||||||
|
ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class);
|
||||||
|
HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据(历史表)相关的Service
|
||||||
|
.createHistoricProcessInstanceQuery()//创建历史流程实例查询
|
||||||
|
.processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询
|
||||||
|
.singleResult();
|
||||||
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
||||||
one1.setLink("bussLibrary8?prcType=buss1");
|
String link = "bussLibrary8?prcType=buss1";
|
||||||
|
if (pi != null && pi.getStartTime().after(BussUtils.oldAndNew)) {
|
||||||
|
link = link + "&taskDefinitionKey=bussLibrary8&oldAndNew=new";
|
||||||
|
}
|
||||||
|
one1.setLink(link);
|
||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
oaService.sendTodoMq(one1);
|
oaService.sendTodoMq(one1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,8 +6,10 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessHistoryService;
|
|||||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||||
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
||||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||||
|
import org.activiti.engine.ProcessEngine;
|
||||||
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.activiti.engine.history.HistoricProcessInstance;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -31,8 +33,17 @@ public class BussLibrary9Before implements TaskListener{
|
|||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
busBean.saveOrUpdate(one1);
|
busBean.saveOrUpdate(one1);
|
||||||
|
|
||||||
|
ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class);
|
||||||
|
HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据(历史表)相关的Service
|
||||||
|
.createHistoricProcessInstanceQuery()//创建历史流程实例查询
|
||||||
|
.processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询
|
||||||
|
.singleResult();
|
||||||
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
||||||
one1.setLink("bussLibrary9?prcType=buss1");
|
String link = "bussLibrary9?prcType=buss1";
|
||||||
|
if (pi != null && pi.getStartTime().after(BussUtils.oldAndNew)) {
|
||||||
|
link = link + "&taskDefinitionKey=bussLibrary9&oldAndNew=new";
|
||||||
|
}
|
||||||
|
one1.setLink(link);
|
||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
oaService.sendTodoMq(one1);
|
oaService.sendTodoMq(one1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,8 +7,10 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
|||||||
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
||||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||||
import com.ydw.bat.wkflow.util.enums.BussLibraryNodeKeyEnum;
|
import com.ydw.bat.wkflow.util.enums.BussLibraryNodeKeyEnum;
|
||||||
|
import org.activiti.engine.ProcessEngine;
|
||||||
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.activiti.engine.history.HistoricProcessInstance;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -33,8 +35,17 @@ public class BussLibraryC3Before implements TaskListener{
|
|||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
busBean.saveOrUpdate(one1);
|
busBean.saveOrUpdate(one1);
|
||||||
|
|
||||||
|
ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class);
|
||||||
|
HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据(历史表)相关的Service
|
||||||
|
.createHistoricProcessInstanceQuery()//创建历史流程实例查询
|
||||||
|
.processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询
|
||||||
|
.singleResult();
|
||||||
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
||||||
one1.setLink("bussLibraryC3?prcType=buss1");
|
String link = "bussLibraryC3?prcType=buss1";
|
||||||
|
if (pi != null && pi.getStartTime().after(BussUtils.oldAndNew)) {
|
||||||
|
link = link + "&taskDefinitionKey=bussLibraryC3&oldAndNew=new";
|
||||||
|
}
|
||||||
|
one1.setLink(link);
|
||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
oaService.sendTodoMq(one1);
|
oaService.sendTodoMq(one1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,8 +7,10 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
|||||||
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
|
||||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||||
import com.ydw.bat.wkflow.util.enums.BussLibraryNodeKeyEnum;
|
import com.ydw.bat.wkflow.util.enums.BussLibraryNodeKeyEnum;
|
||||||
|
import org.activiti.engine.ProcessEngine;
|
||||||
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.activiti.engine.history.HistoricProcessInstance;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -33,8 +35,17 @@ public class BussLibraryC6Before implements TaskListener{
|
|||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
busBean.saveOrUpdate(one1);
|
busBean.saveOrUpdate(one1);
|
||||||
|
|
||||||
|
ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class);
|
||||||
|
HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据(历史表)相关的Service
|
||||||
|
.createHistoricProcessInstanceQuery()//创建历史流程实例查询
|
||||||
|
.processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询
|
||||||
|
.singleResult();
|
||||||
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
||||||
one1.setLink("bussLibraryC6?prcType=buss1");
|
String link = "bussLibraryC6?prcType=buss1";
|
||||||
|
if (pi != null && pi.getStartTime().after(BussUtils.oldAndNew)) {
|
||||||
|
link = link + "&taskDefinitionKey=bussLibraryC6&oldAndNew=new";
|
||||||
|
}
|
||||||
|
one1.setLink(link);
|
||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
oaService.sendTodoMq(one1);
|
oaService.sendTodoMq(one1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,6 +24,9 @@ import java.util.List;
|
|||||||
*/
|
*/
|
||||||
public class BussUtils {
|
public class BussUtils {
|
||||||
|
|
||||||
|
// 初始化一个时间,用于判断数据是否为新数据,2024-04-01 00:00:00后的数据为新数据
|
||||||
|
public static final Date oldAndNew = new Date(1711900800000L);
|
||||||
|
|
||||||
public static void evalSave(DelegateTask delegateTask, JSONObject object, String prcName, String localUser) {
|
public static void evalSave(DelegateTask delegateTask, JSONObject object, String prcName, String localUser) {
|
||||||
SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
|
SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
|
||||||
IBusProcessEvaluationHisService evaluationHisService = SpringContextUtil.getBean(IBusProcessEvaluationHisService.class);
|
IBusProcessEvaluationHisService evaluationHisService = SpringContextUtil.getBean(IBusProcessEvaluationHisService.class);
|
||||||
|
|||||||
Reference in New Issue
Block a user