From f44fa70dd07e5ee030f929841e30a7205fb6ca8b Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Wed, 14 Jun 2023 14:18:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?oa=E9=80=9A=E7=9F=A5=E5=89=8D=E6=B8=85?=
 =?UTF-8?q?=E6=A5=9A=E6=97=A7OA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wkflow/config/ScheduledSarBussionessStandReview.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

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 9e6f7e01..cdc5db29 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,11 +106,13 @@ 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("====================================当天前时间发送成功！！！！=========================================");
                                                         }
                                                         if (ThreeDate.getTime() == parse.getTime()) {
+                                                            webServiceOAService.deleteOAByPid(data.getPrcId());
                                                             logger.info("====================================三天前时间发送开始！！！！=========================================");
                                                             process(data.getPrcId());
                                                             logger.info("====================================三天前时间发送成功！！！！=========================================");
@@ -243,11 +249,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("====================================三天前时间发送成功！！！！=========================================");

From de976a98544d98a96ca8e5c5552f5866d9e5daa0 Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Thu, 15 Jun 2023 11:16:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=97=AE=E7=AD=94=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E9=9D=9E=E6=B3=95=E6=95=B0=E6=8D=AE=E8=BF=9B=E8=A1=8C=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../listener/quizOrAnswer/answerAfter.java    | 27 ++++++++++++++-----
 .../listener/quizOrAnswer/quizAfter.java      | 27 ++++++++++++++-----
 2 files changed, 40 insertions(+), 14 deletions(-)

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<String> asList = Arrays.asList(split1);
         String str = "";
         String bzstr = "";
-        for (int i = 0; i <asList.size() ; i++) {
-            if(i==3){
-                String[] split2 = asList.get(i).split(":");
-                str = split2[1].substring(1, split2[1].length() -1);
+        if(asList.size()==8) {
+            for (int i = 0; i < asList.size(); i++) {
+                if (i == 0) {
+                    String[] split2 = asList.get(i).split(":");
+                    str = split2[1].substring(1, split2[1].length() - 1);
+                }
+                if (i == 5) {
+                    String[] split2 = asList.get(i).split(":");
+                    bzstr = split2[1].substring(1, split2[1].length() - 1);
+                }
             }
-            if(i==2){
-                String[] split2 = asList.get(i).split(":");
-                bzstr = split2[1].substring(1, split2[1].length() -1);
+        }else {
+            for (int i = 0; i < asList.size(); i++) {
+                if (i == 1) {
+                    String[] split2 = asList.get(i).split(":");
+                    str = split2[1].substring(1, split2[1].length() - 1);
+                }
+                if (i == 6) {
+                    String[] split2 = asList.get(i).split(":");
+                    bzstr = split2[1].substring(1, split2[1].length() - 1);
+                }
             }
         }
         String prcName = bzstr+"-("+str+")-问答流程";
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/quizOrAnswer/quizAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/quizOrAnswer/quizAfter.java
index 7ee844bc..71c38421 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/quizOrAnswer/quizAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/quizOrAnswer/quizAfter.java
@@ -44,14 +44,27 @@ public class quizAfter  implements TaskListener {
         List<String> asList = Arrays.asList(split1);
         String str = "";
         String bzstr = "";
-        for (int i = 0; i <asList.size() ; i++) {
-            if(i==1){
-                 String[] split2 = asList.get(i).split(":");
-                  str = split2[1].substring(1, split2[1].length() -1);
+        if(asList.size()==8) {
+            for (int i = 0; i < asList.size(); i++) {
+                if (i == 0) {
+                    String[] split2 = asList.get(i).split(":");
+                    str = split2[1].substring(1, split2[1].length() - 1);
+                }
+                if (i == 5) {
+                    String[] split2 = asList.get(i).split(":");
+                    bzstr = split2[1].substring(1, split2[1].length() - 1);
+                }
             }
-            if(i==6){
-                String[] split2 = asList.get(i).split(":");
-                bzstr = split2[1].substring(1, split2[1].length() -1);
+        }else {
+            for (int i = 0; i < asList.size(); i++) {
+                if (i == 1) {
+                    String[] split2 = asList.get(i).split(":");
+                    str = split2[1].substring(1, split2[1].length() - 1);
+                }
+                if (i == 6) {
+                    String[] split2 = asList.get(i).split(":");
+                    bzstr = split2[1].substring(1, split2[1].length() - 1);
+                }
             }
         }
         String prcName = bzstr+"-("+str+")-问答流程";