diff --git a/src/main/java/com/ydw/bat/wkflow/config/ScheduledSarBussionessStandReview.java b/src/main/java/com/ydw/bat/wkflow/config/ScheduledSarBussionessStandReview.java index 4343902e..cd11ffa7 100644 --- a/src/main/java/com/ydw/bat/wkflow/config/ScheduledSarBussionessStandReview.java +++ b/src/main/java/com/ydw/bat/wkflow/config/ScheduledSarBussionessStandReview.java @@ -7,6 +7,7 @@ import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; 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_mq.service.CreateMQService; +import com.ydw.bat.wkflow.business_oa.webService.service.impl.WebServiceOAServiceImpl; import com.ydw.bat.wkflow.util.SpringContextUtil; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.RuntimeService; @@ -52,6 +53,9 @@ public class ScheduledSarBussionessStandReview { @Autowired private RuntimeService runtimeService; + @Autowired + private WebServiceOAServiceImpl webServiceOAService; + @Scheduled(cron = "0 0 2 * * ?") //每天的凌晨2点执行 @@ -102,12 +106,14 @@ public class ScheduledSarBussionessStandReview { String format = dateFormat.format(instanceThree.getTime()); Date ThreeDate = dateFormat.parse(format); if (review.getTime() == parse.getTime()) { + webServiceOAService.deleteOAByPid(data.getPrcId()); logger.info("====================================当天前时间发送开始!!!!========================================="); process(data.getPrcId()); logger.info("复审完成时间发送当天代办消息,主键ID:{},流程名称:{},实例ID:{}",data.getId(),data.getPrcName(),data.getPrcId()); logger.info("====================================当天前时间发送成功!!!!========================================="); } if (ThreeDate.getTime() == parse.getTime()) { + webServiceOAService.deleteOAByPid(data.getPrcId()); logger.info("====================================三天前时间发送开始!!!!========================================="); process(data.getPrcId()); logger.info("复审完成时间提前三天发送代办消息,主键ID:{},流程名称:{},实例ID:{}",data.getId(),data.getPrcName(),data.getPrcId()); @@ -245,11 +251,13 @@ public class ScheduledSarBussionessStandReview { Date ThreeDate = dateFormat.parse(format); if (review.getTime() == parse.getTime()) { + webServiceOAService.deleteOAByPid(data.getPrcId()); logger.info("====================================当天前时间发送开始!!!!========================================="); process(data.getPrcId()); logger.info("====================================当天前时间发送成功!!!!========================================="); } if (ThreeDate.getTime() == parse.getTime()) { + webServiceOAService.deleteOAByPid(data.getPrcId()); logger.info("====================================三天前时间发送开始!!!!========================================="); process(data.getPrcId()); logger.info("====================================三天前时间发送成功!!!!========================================="); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/quizOrAnswer/answerAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/quizOrAnswer/answerAfter.java index 4171e321..f548dd4f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/quizOrAnswer/answerAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/quizOrAnswer/answerAfter.java @@ -52,14 +52,27 @@ public class answerAfter implements TaskListener { List asList = Arrays.asList(split1); String str = ""; String bzstr = ""; - for (int i = 0; i