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

Merge branch 'master' into 'fix_foton_20230613'

Browse Source 
# Conflicts:
#   src/main/java/com/ydw/bat/wkflow/listener/quizOrAnswer/quizAfter.java
This commit is contained in:
王晓勇
2023-08-22 06:35:53 +00:00
parent 6247c7b1e3 ef7a55ae78
commit 9978902345
2 changed files with 28 additions and 7 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.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("====================================三天前时间发送成功！！！！=========================================");
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);
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+")-问答流程";