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 
Develop

See merge request foton-wkflow-group/foton-wkflow-rest!70
This commit is contained in:
王夏晖
2021-12-17 13:58:27 +08:00
parent 4bac6b0da6 002c8bb88f
commit f98fd2eb6b
1 changed files with 7 additions and 7 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
+7 -7
View File
@@ -100,7 +100,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
List<NotifyTodoSendContext> notifyTodoSendContexts = new ArrayList<>(); List<NotifyTodoSendContext> notifyTodoSendContexts = new ArrayList<>();
NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext(); NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext();
notifyTodoSendContext.setAppName("FOTON"); notifyTodoSendContext.setAppName("SRMS");
notifyTodoSendContext.setModelId(busProcessNew.getId()); notifyTodoSendContext.setModelId(busProcessNew.getId());
notifyTodoSendContext.setModelName(object.getTaskInfo()); notifyTodoSendContext.setModelName(object.getTaskInfo());
notifyTodoSendContext.setType("1"); notifyTodoSendContext.setType("1");
@@ -142,7 +142,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
List<NotifyTodoSendContext> notifyTodoSendContexts = new ArrayList<>(); List<NotifyTodoSendContext> notifyTodoSendContexts = new ArrayList<>();
list.forEach(busProcessNew -> { list.forEach(busProcessNew -> {
NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext(); NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext();
notifyTodoSendContext.setAppName("FOTON"); notifyTodoSendContext.setAppName("SRMS");
notifyTodoSendContext.setModelId(busProcessNew.getId()); notifyTodoSendContext.setModelId(busProcessNew.getId());
notifyTodoSendContext.setModelName(busProcessNew.getTaskInfo()); notifyTodoSendContext.setModelName(busProcessNew.getTaskInfo());
notifyTodoSendContext.setType("1"); notifyTodoSendContext.setType("1");
@@ -176,7 +176,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
HEAD head = new HEAD(); HEAD head = new HEAD();
head.setACCOUNT("OA"); head.setACCOUNT("OA");
head.setBIZTRANSACTIONID("SYC_161320210206133219"); head.setBIZTRANSACTIONID("SYC_161320210206133219");
head.setCONSUMER("FOTON"); head.setCONSUMER("SRMS");
head.setCOUNT("1"); head.setCOUNT("1");
head.setPASSWORD("TEST_oa201611241710"); head.setPASSWORD("TEST_oa201611241710");
head.setSRVLEVEL("1"); head.setSRVLEVEL("1");
@@ -217,7 +217,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
log.info("--------------------------ESP 发送已办任务----------------------------"); log.info("--------------------------ESP 发送已办任务----------------------------");
SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext(); NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext();
notifyTodoSendContext.setAppName("FOTON"); notifyTodoSendContext.setAppName("SRMS");
notifyTodoSendContext.setCreateTime(sdf.format(new Date())); notifyTodoSendContext.setCreateTime(sdf.format(new Date()));
QueryWrapper queryWrapper1 = new QueryWrapper(); QueryWrapper queryWrapper1 = new QueryWrapper();
@@ -249,7 +249,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
HEAD head = new HEAD(); HEAD head = new HEAD();
head.setACCOUNT("OA"); head.setACCOUNT("OA");
head.setBIZTRANSACTIONID("SYC_161320210206133219"); head.setBIZTRANSACTIONID("SYC_161320210206133219");
head.setCONSUMER("FOTON"); head.setCONSUMER("SRMS");
head.setCOUNT("1"); head.setCOUNT("1");
head.setPASSWORD("oa201611241710"); head.setPASSWORD("oa201611241710");
head.setSRVLEVEL("1"); head.setSRVLEVEL("1");
@@ -292,14 +292,14 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
HEAD head = new HEAD(); HEAD head = new HEAD();
head.setACCOUNT("OA"); head.setACCOUNT("OA");
head.setBIZTRANSACTIONID("SYC_161320210206133219"); head.setBIZTRANSACTIONID("SYC_161320210206133219");
head.setCONSUMER("FOTON"); head.setCONSUMER("SRMS");
head.setCOUNT("1"); head.setCOUNT("1");
head.setPASSWORD("oa201611241710"); head.setPASSWORD("oa201611241710");
head.setSRVLEVEL("1"); head.setSRVLEVEL("1");
List<Object> list = new ArrayList<>(); List<Object> list = new ArrayList<>();
NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext(); NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext();
// 待办来源的系统 // 待办来源的系统
notifyTodoSendContext.setAppName("FOTON"); notifyTodoSendContext.setAppName("SRMS");
//创建时间 //创建时间
notifyTodoSendContext.setCreateTime(sdf.format(new Date())); notifyTodoSendContext.setCreateTime(sdf.format(new Date()));
// 待办在原系统唯一标识 // 待办在原系统唯一标识