FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-wkflow-rest!52
This commit is contained in:
高嵩
2023-06-15 11:37:55 +08:00
parent e708e6338d de976a9854
commit 8c25e724e6
3 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/config/ScheduledSarBussionessStandReview.java
+8
View File
@@ -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.IBusProcessNameService;
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.business_oa.webService.service.impl.WebServiceOAServiceImpl;
import com.ydw.bat.wkflow.util.SpringContextUtil; import com.ydw.bat.wkflow.util.SpringContextUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.activiti.engine.RuntimeService; import org.activiti.engine.RuntimeService;
@@ -52,6 +53,9 @@ public class ScheduledSarBussionessStandReview {
@Autowired @Autowired
private RuntimeService runtimeService; private RuntimeService runtimeService;
@Autowired
private WebServiceOAServiceImpl webServiceOAService;
@Scheduled(cron = "0 0 2 * * ?") //每天的凌晨2点执行 @Scheduled(cron = "0 0 2 * * ?") //每天的凌晨2点执行
@@ -102,11 +106,13 @@ public class ScheduledSarBussionessStandReview {
String format = dateFormat.format(instanceThree.getTime()); String format = dateFormat.format(instanceThree.getTime());
Date ThreeDate = dateFormat.parse(format); Date ThreeDate = dateFormat.parse(format);
if (review.getTime() == parse.getTime()) { if (review.getTime() == parse.getTime()) {
webServiceOAService.deleteOAByPid(data.getPrcId());
logger.info("====================================当天前时间发送开始！！！！========================================="); logger.info("====================================当天前时间发送开始！！！！=========================================");
process(data.getPrcId()); process(data.getPrcId());
logger.info("====================================当天前时间发送成功！！！！========================================="); logger.info("====================================当天前时间发送成功！！！！=========================================");
} }
if (ThreeDate.getTime() == parse.getTime()) { if (ThreeDate.getTime() == parse.getTime()) {
webServiceOAService.deleteOAByPid(data.getPrcId());
logger.info("====================================三天前时间发送开始！！！！========================================="); logger.info("====================================三天前时间发送开始！！！！=========================================");
process(data.getPrcId()); process(data.getPrcId());
logger.info("====================================三天前时间发送成功！！！！========================================="); logger.info("====================================三天前时间发送成功！！！！=========================================");
@@ -243,11 +249,13 @@ public class ScheduledSarBussionessStandReview {
Date ThreeDate = dateFormat.parse(format); Date ThreeDate = dateFormat.parse(format);
if (review.getTime() == parse.getTime()) { if (review.getTime() == parse.getTime()) {
webServiceOAService.deleteOAByPid(data.getPrcId());
logger.info("====================================当天前时间发送开始！！！！========================================="); logger.info("====================================当天前时间发送开始！！！！=========================================");
process(data.getPrcId()); process(data.getPrcId());
logger.info("====================================当天前时间发送成功！！！！========================================="); logger.info("====================================当天前时间发送成功！！！！=========================================");
} }
if (ThreeDate.getTime() == parse.getTime()) { if (ThreeDate.getTime() == parse.getTime()) {
webServiceOAService.deleteOAByPid(data.getPrcId());
logger.info("====================================三天前时间发送开始！！！！========================================="); logger.info("====================================三天前时间发送开始！！！！=========================================");
process(data.getPrcId()); process(data.getPrcId());
logger.info("====================================三天前时间发送成功！！！！========================================="); logger.info("====================================三天前时间发送成功！！！！=========================================");
src/main/java/com/ydw/bat/wkflow/listener/quizOrAnswer/answerAfter.java
+20 -7
View File
@@ -52,14 +52,27 @@ public class answerAfter implements TaskListener {
List<String> asList = Arrays.asList(split1); List<String> asList = Arrays.asList(split1);
String str = ""; String str = "";
String bzstr = ""; String bzstr = "";
for (int i = 0; i <asList.size() ; i++) { if(asList.size()==8) {
if(i==3){ for (int i = 0; i < asList.size(); i++) {
String[] split2 = asList.get(i).split(":"); if (i == 0) {
str = split2[1].substring(1, split2[1].length() -1); 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){ }else {
String[] split2 = asList.get(i).split(":"); for (int i = 0; i < asList.size(); i++) {
bzstr = split2[1].substring(1, split2[1].length() -1); 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+")-问答流程"; String prcName = bzstr+"-("+str+")-问答流程";
src/main/java/com/ydw/bat/wkflow/listener/quizOrAnswer/quizAfter.java
+20 -7
View File
@@ -44,14 +44,27 @@ public class quizAfter implements TaskListener {
List<String> asList = Arrays.asList(split1); List<String> asList = Arrays.asList(split1);
String str = ""; String str = "";
String bzstr = ""; String bzstr = "";
for (int i = 0; i <asList.size() ; i++) { if(asList.size()==8) {
if(i==1){ for (int i = 0; i < asList.size(); i++) {
String[] split2 = asList.get(i).split(":"); if (i == 0) {
str = split2[1].substring(1, split2[1].length() -1); 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){ }else {
String[] split2 = asList.get(i).split(":"); for (int i = 0; i < asList.size(); i++) {
bzstr = split2[1].substring(1, split2[1].length() -1); 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+")-问答流程"; String prcName = bzstr+"-("+str+")-问答流程";