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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
super_liu
2022-01-06 20:26:41 +08:00
parent 203e45e3b4 b4667922fc
commit 6990726953
6 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDeleteMQService.java
+2 -2
View File
@@ -83,7 +83,7 @@ public class SendDeleteMQService {
SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
if(todoAppResult.getSign().equals("0") || todoAppResult.getMassage().equals("操作成功")){
logger.info("--------------------------成功发送 ESP 已办任务----------------------------");
logger.info("--------------------------成功删除 ESP 已办任务----------------------------");
QueryWrapper wrapper = new QueryWrapper();
wrapper.eq("TODO_ID",todoId);
wrapper.eq("MSG_TYPE","3");
@@ -99,7 +99,7 @@ public class SendDeleteMQService {
sendTodoSave(object,todoId, sdf, "2",todoAppResult.getMassage());
}
}else {
logger.error("ESP 发送待办任务异常 :" + "SIGN: "+todoAppResult.getSign()+",MASSAGE: "+todoAppResult.getMassage());
logger.error("ESP 发送删除任务异常 :" + "SIGN: "+todoAppResult.getSign()+",MASSAGE: "+todoAppResult.getMassage());
// 重试发送待办
logger.info("重试发送待办");
this.restartSendMq(object,todoId,todoAppResult.getMassage());
src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java
+1 -1
View File
@@ -83,7 +83,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
@Async
public void deleteOAByMandatory(String todoId,String assignee){
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
log.info("--------------------------ESP 发送删除待办任务 及 再次发送待办----------------------------");
log.info("--------------------------ESP 发送单个删除OA待办----------------------------");
if(StringUtils.isNotBlank(todoId) && StringUtils.isNotBlank(assignee)){
src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java
+3
View File
@@ -123,6 +123,9 @@ public class DeptApplayAfter implements TaskListener{
} else {
delegateTask.setVariable("bzFlag", 2);
prcName=prcName+"-填写解读分析";
JSONObject object1=object.getJSONObject("RollBack");
nextUserList.add(String.valueOf(object1.getString("id")));
delegateTask.setVariable("zxUserId",object.getJSONObject("RollBack"));
}
src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java
+3 -2
View File
@@ -51,8 +51,9 @@ public class EngineerApplayAfter implements TaskListener{
} else {
prcName=prcName+"-填写解读分析";
delegateTask.setVariable("gcFlag", 2);
JSONObject object1=delegateTask.getVariable("zxUserId",JSONObject.class);
nextUserList.add(object1.getString("id"));
JSONObject object1=object.getJSONObject("RollBack");
nextUserList.add(String.valueOf(object1.getString("id")));
delegateTask.setVariable("zxUserId",object.getJSONObject("RollBack"));
}
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java
+1
View File
@@ -73,6 +73,7 @@ public class ExpainAfter implements TaskListener{
for (Object obj:responUserList) {
JSONObject object1 = (JSONObject)obj;
if (object.getString("AOLIGEI").equals(object1.getString("KEYS"))) {
object.put("RollBack",object1);
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java
+3 -2
View File
@@ -51,9 +51,10 @@ public class ZrApplayAfter implements TaskListener{
}else {
prcName=prcName+"-填写解读分析";
delegateTask.setVariable("zrFlag",2);
log.error("戒毒流程当前工作节点驳回人为："+String.valueOf(delegateTask.getVariable("zxUserId")));
JSONObject object1=JSONObject.parseObject(String.valueOf(delegateTask.getVariable("zxUserId")));
log.error("解读流程当前工作节点驳回人为："+String.valueOf(delegateTask.getVariable("zxUserId")));
JSONObject object1=object.getJSONObject("RollBack");
nextUserList.add(String.valueOf(object1.getString("id")));
delegateTask.setVariable("zxUserId",object.getJSONObject("RollBack"));
}
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());