合并分支 'dev_20230216' 到 'master'

Dev 20230216

查看合并请求 laws-foton-slrs/foton-wkflow-rest!52

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("====================================三天前时间发送成功！！！！=========================================");

src/main/java/com/ydw/bat/wkflow/listener/quizOrAnswer/answerAfter.java

@@ -52,16 +52,29 @@ public class answerAfter  implements TaskListener {
         List<String> asList = Arrays.asList(split1);
         String str = "";
         String bzstr = "";
+        if(asList.size()==8) {
             for (int i = 0; i < asList.size(); i++) {
-            if(i==3){
+                if (i == 0) {
                     String[] split2 = asList.get(i).split(":");
                     str = split2[1].substring(1, split2[1].length() - 1);
                 }
-            if(i==2){
+                if (i == 5) {
                     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+")-问答流程";
         //截止时间 流程描述 创建人
         QueryWrapper queryWrapper2 = new QueryWrapper();

src/main/java/com/ydw/bat/wkflow/listener/quizOrAnswer/quizAfter.java

@@ -44,6 +44,18 @@ public class quizAfter  implements TaskListener {
         List<String> asList = Arrays.asList(split1);
         String str = "";
         String bzstr = "";
+        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);
+                }
+            }
+        }else {
             for (int i = 0; i < asList.size(); i++) {
                 if (i == 1) {
                     String[] split2 = asList.get(i).split(":");
@@ -54,6 +66,7 @@ public class quizAfter  implements TaskListener {
                     bzstr = split2[1].substring(1, split2[1].length() - 1);
                 }
             }
+        }
         String prcName = bzstr+"-("+str+")-问答流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());