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-04-18 20:39:41 +08:00
parent 1c8f9a07ce 0ddfa984d4
commit 7ceee34883
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java
+4 -2
View File
@@ -118,6 +118,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
objectMap.put("todoId",todoId);
objectMap.put("list",notifyTodoSendContexts);
net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(objectMap);
log.info("=================发送单个删除OA待办："+jsonObject.toString());
oaService.setTodoDeleteMq(jsonObject.toString());
}
}
@@ -166,8 +167,9 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
objectMap.put("list",notifyTodoSendContexts);
net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(objectMap);
oaService.setTodoDeleteMq(jsonObject.toString());
log.info("=================ESP 发送删除待办任务 及 再次发送待办："+jsonObject.toString());
// 重新发送OA待办
// 重新发送OA待办
object.setUserId(assignee);
oaService.sendTodoMq(object);
}
@@ -237,7 +239,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
Map<String,String> mapCtr = new TreeMap<>();
mapCtr.put("Authorization",credentials);
log.info("处理完文件数据，开始请求发送删除接口数据：【"+sdf.format(new Date())+"】");
result = okHttpUtil.postForJson("http://172.24.12.64:85/WP_FOTON_FSOA/APP_DOC_SERVICES/Proxy_Services/TA_OA/DOC_SYC_1020_SendRemoveTodo_PS",json.toString(),mapCtr);
result = okHttpUtil.postForJson("https://fesbnew.foton.com.cn/WP_FOTON_FSOA/APP_DOC_SERVICES/Proxy_Services/TA_OA/DOC_SYC_1020_SendRemoveTodo_PS",json.toString(),mapCtr);
log.info("请求发送删除接口完毕，返回响应状态：【"+sdf.format(new Date())+"】");
// JSONObject jsonObject = JSONObject.parseObject(result);
if(!result.contains("操作成功")){