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

合并分支 'fix_foton_20230613' 到 'master'

Browse Source 
Fix foton 20230613

查看合并请求 laws-foton-slrs/foton-wkflow-rest!57
This commit is contained in:
高嵩
2023-07-06 15:57:06 +08:00
parent cbb3c22bd5 838a35ede4
commit b40e646a95
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/config/ScheduledJob.java
+3 -1
View File
@@ -74,17 +74,19 @@ public class ScheduledJob {
// 业务系统流程节点已完成 则不再发送 OA 待办
// 任务状态置为已完成
updateTask(execService, sdf, taskExec);
log.info("修改任务状态为已完成，任务ID：{},代办ID：{}，代办用户ID：{}",taskExec.getId(),taskExec.getTodoId(),taskExec.getUserId());
}else {
// 业务系统流程节点未完成 再发送 OA 待办
// 任务状态置为已完成 业务流程 干活流程节点 均显示 提交
updateTask(execService, sdf, taskExec);
log.info("修改任务状态，任务ID：{},代办ID：{}，代办用户ID：{}",taskExec.getId(),taskExec.getTodoId(),taskExec.getUserId());
Task task = taskService.createTaskQuery().taskId(object.getTaskId()).singleResult();
webServiceOAService.completeOA(task);
// 直接发送OA待办 重置任务状态 0
object.setTaskStatus(0);
oaService.sendTodoMq(object);
log.info("发送OA代办，BusProcessNew对象ID：{}，任务ID：{}，用户ID：{}",object.getId(),object.getTaskId(),object.getUserId());
}
});
src/main/java/com/ydw/bat/wkflow/config/ScheduledSarBussionessStandReview.java
+2
View File
@@ -109,12 +109,14 @@ public class ScheduledSarBussionessStandReview {
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());
logger.info("====================================三天前时间发送成功！！！！=========================================");
}
} catch (ParseException e) {