diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantC1Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantC1Before.java index 3f953d76..4e5370db 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantC1Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantC1Before.java @@ -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_mq.service.CreateMQService; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ProcessEngine; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.activiti.engine.history.HistoricProcessInstance; import java.util.List; @@ -31,8 +33,17 @@ public class BLApplicantC1Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class); + HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据（历史表）相关的Service + .createHistoricProcessInstanceQuery()//创建历史流程实例查询 + .processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询 + .singleResult(); // 发送 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()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10Before.java index 8cd0172b..903114fd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10Before.java @@ -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_mq.service.CreateMQService; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ProcessEngine; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.activiti.engine.history.HistoricProcessInstance; import java.util.List; @@ -31,8 +33,17 @@ public class BussLibrary10Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class); + HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据（历史表）相关的Service + .createHistoricProcessInstanceQuery()//创建历史流程实例查询 + .processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询 + .singleResult(); // 发送 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()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11Before.java index 78932f6e..5544b22f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11Before.java @@ -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_mq.service.CreateMQService; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ProcessEngine; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.activiti.engine.history.HistoricProcessInstance; import java.util.List; @@ -31,8 +33,17 @@ public class BussLibrary11Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class); + HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据（历史表）相关的Service + .createHistoricProcessInstanceQuery()//创建历史流程实例查询 + .processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询 + .singleResult(); // 发送 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()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary12Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary12Before.java index bc69b208..7ade3a6b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary12Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary12Before.java @@ -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_mq.service.CreateMQService; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ProcessEngine; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.activiti.engine.history.HistoricProcessInstance; import java.util.List; @@ -34,8 +36,17 @@ public class BussLibrary12Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class); + HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据（历史表）相关的Service + .createHistoricProcessInstanceQuery()//创建历史流程实例查询 + .processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询 + .singleResult(); // 发送 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()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary13Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary13Before.java index fdfdc50a..54cc05e5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary13Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary13Before.java @@ -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_mq.service.CreateMQService; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ProcessEngine; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.activiti.engine.history.HistoricProcessInstance; import java.util.List; @@ -31,8 +33,17 @@ public class BussLibrary13Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class); + HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据（历史表）相关的Service + .createHistoricProcessInstanceQuery()//创建历史流程实例查询 + .processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询 + .singleResult(); // 发送 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()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2Before.java index 046e1562..9848f17a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2Before.java @@ -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_mq.service.CreateMQService; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ProcessEngine; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.activiti.engine.history.HistoricProcessInstance; +import java.util.Date; import java.util.List; /** @@ -39,8 +42,17 @@ public class BussLibrary2Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class); + HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据（历史表）相关的Service + .createHistoricProcessInstanceQuery()//创建历史流程实例查询 + .processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询 + .singleResult(); // 发送 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()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary3Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary3Before.java index 11bcc7d5..265160f5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary3Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary3Before.java @@ -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_mq.service.CreateMQService; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ProcessEngine; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.activiti.engine.history.HistoricProcessInstance; import java.util.List; @@ -43,8 +45,17 @@ public class BussLibrary3Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class); + HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据（历史表）相关的Service + .createHistoricProcessInstanceQuery()//创建历史流程实例查询 + .processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询 + .singleResult(); // 发送 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()); oaService.sendTodoMq(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4Before.java index 02db721c..5a09a286 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4Before.java @@ -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_mq.service.CreateMQService; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ProcessEngine; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.activiti.engine.history.HistoricProcessInstance; import java.util.List; @@ -31,8 +33,17 @@ public class BussLibrary4Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class); + HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据（历史表）相关的Service + .createHistoricProcessInstanceQuery()//创建历史流程实例查询 + .processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询 + .singleResult(); // 发送 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()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5Before.java index 7c741e56..c6c45666 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5Before.java @@ -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_mq.service.CreateMQService; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ProcessEngine; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.activiti.engine.history.HistoricProcessInstance; import java.util.List; @@ -38,8 +40,17 @@ public class BussLibrary5Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class); + HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据（历史表）相关的Service + .createHistoricProcessInstanceQuery()//创建历史流程实例查询 + .processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询 + .singleResult(); // 发送 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()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary6Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary6Before.java index 9bb9505b..914450d7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary6Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary6Before.java @@ -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_mq.service.CreateMQService; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ProcessEngine; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.activiti.engine.history.HistoricProcessInstance; import java.util.List; @@ -44,8 +46,17 @@ public class BussLibrary6Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class); + HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据（历史表）相关的Service + .createHistoricProcessInstanceQuery()//创建历史流程实例查询 + .processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询 + .singleResult(); // 发送 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()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7Before.java index c4416a49..087492aa 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7Before.java @@ -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_mq.service.CreateMQService; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ProcessEngine; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.activiti.engine.history.HistoricProcessInstance; import java.util.List; @@ -32,7 +34,19 @@ public class BussLibrary7Before implements TaskListener{ busBean.saveOrUpdate(one1); // 发送 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()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8Before.java index e9178248..01141078 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8Before.java @@ -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_mq.service.CreateMQService; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ProcessEngine; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.activiti.engine.history.HistoricProcessInstance; import java.util.List; @@ -31,8 +33,17 @@ public class BussLibrary8Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class); + HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据（历史表）相关的Service + .createHistoricProcessInstanceQuery()//创建历史流程实例查询 + .processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询 + .singleResult(); // 发送 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()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9Before.java index 74338436..fa6754be 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9Before.java @@ -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_mq.service.CreateMQService; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ProcessEngine; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.activiti.engine.history.HistoricProcessInstance; import java.util.List; @@ -31,8 +33,17 @@ public class BussLibrary9Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class); + HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据（历史表）相关的Service + .createHistoricProcessInstanceQuery()//创建历史流程实例查询 + .processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询 + .singleResult(); // 发送 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()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3Before.java index f6f758d6..383c45b9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3Before.java @@ -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.util.SpringContextUtil; import com.ydw.bat.wkflow.util.enums.BussLibraryNodeKeyEnum; +import org.activiti.engine.ProcessEngine; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.activiti.engine.history.HistoricProcessInstance; import java.util.ArrayList; import java.util.List; @@ -33,8 +35,17 @@ public class BussLibraryC3Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class); + HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据（历史表）相关的Service + .createHistoricProcessInstanceQuery()//创建历史流程实例查询 + .processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询 + .singleResult(); // 发送 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()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC6Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC6Before.java index 4bd87926..154d2501 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC6Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC6Before.java @@ -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.util.SpringContextUtil; import com.ydw.bat.wkflow.util.enums.BussLibraryNodeKeyEnum; +import org.activiti.engine.ProcessEngine; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.activiti.engine.history.HistoricProcessInstance; import java.util.ArrayList; import java.util.List; @@ -33,8 +35,17 @@ public class BussLibraryC6Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + ProcessEngine processEngine = SpringContextUtil.getBean(ProcessEngine.class); + HistoricProcessInstance pi = processEngine.getHistoryService()//与历史数据（历史表）相关的Service + .createHistoricProcessInstanceQuery()//创建历史流程实例查询 + .processInstanceId(delegateTask.getProcessInstanceId())//使用流程实例ID查询 + .singleResult(); // 发送 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()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java index aec9bcad..7b268c6c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java @@ -24,6 +24,9 @@ import java.util.List; */ 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) { SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); IBusProcessEvaluationHisService evaluationHisService = SpringContextUtil.getBean(IBusProcessEvaluationHisService.class);