From 2ce1459f61c8aa08ab3b18a66b28b447a5127d7f Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 7 Apr 2023 17:17:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=20=E9=80=9A=E7=9F=A5=20SPRS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WebServiceOAServiceImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java index 77763ec9..638bde34 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java @@ -106,7 +106,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { List notifyTodoSendContexts = new ArrayList<>(); NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext(); - notifyTodoSendContext.setAppName("SRMS"); + notifyTodoSendContext.setAppName("SPRS"); notifyTodoSendContext.setModelId(todoId); notifyTodoSendContext.setModelName(object.getTaskInfo()); notifyTodoSendContext.setType("1"); @@ -154,7 +154,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { List notifyTodoSendContexts = new ArrayList<>(); NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext(); - notifyTodoSendContext.setAppName("SRMS"); + notifyTodoSendContext.setAppName("SPRS"); notifyTodoSendContext.setModelId(busProcessNew.getId()); notifyTodoSendContext.setModelName(object.getTaskInfo()); notifyTodoSendContext.setType("1"); @@ -197,7 +197,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { List notifyTodoSendContexts = new ArrayList<>(); list.forEach(busProcessNew -> { NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext(); - notifyTodoSendContext.setAppName("SRMS"); + notifyTodoSendContext.setAppName("SPRS"); notifyTodoSendContext.setModelId(busProcessNew.getId()); notifyTodoSendContext.setModelName(busProcessNew.getTaskInfo()); notifyTodoSendContext.setType("1"); @@ -242,7 +242,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { HEAD head = new HEAD(); head.setACCOUNT("OA"); head.setBIZTRANSACTIONID("SYC_161320210206133219"); - head.setCONSUMER("SRMS"); + head.setCONSUMER("SPRS"); head.setCOUNT("1"); head.setPASSWORD("TEST_oa201611241710"); head.setSRVLEVEL("1"); @@ -287,7 +287,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { log.info("--------------------------ESP 发送已办任务----------------------------"); SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext(); - notifyTodoSendContext.setAppName("SRMS"); + notifyTodoSendContext.setAppName("SPRS"); notifyTodoSendContext.setCreateTime(sdf.format(new Date())); QueryWrapper queryWrapper1 = new QueryWrapper(); @@ -319,7 +319,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { HEAD head = new HEAD(); head.setACCOUNT("OA"); head.setBIZTRANSACTIONID("SYC_161320210206133219"); - head.setCONSUMER("SRMS"); + head.setCONSUMER("SPRS"); head.setCOUNT("1"); head.setPASSWORD("oa201611241710"); head.setSRVLEVEL("1"); @@ -366,14 +366,14 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { HEAD head = new HEAD(); head.setACCOUNT("OA"); head.setBIZTRANSACTIONID("SYC_161320210206133219"); - head.setCONSUMER("SRMS"); + head.setCONSUMER("SPRS"); head.setCOUNT("1"); head.setPASSWORD("oa201611241710"); head.setSRVLEVEL("1"); List list = new ArrayList<>(); NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext(); // 待办来源的系统 - notifyTodoSendContext.setAppName("SRMS"); + notifyTodoSendContext.setAppName("SPRS"); //创建时间 notifyTodoSendContext.setCreateTime(sdf.format(new Date())); // 待办在原系统唯一标识 From 99c3dacb045b00db478edfccdeae13362a4419b9 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 7 Apr 2023 23:53:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessStep4After.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java index c24550a8..f328ab61 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java @@ -251,9 +251,22 @@ public class ProcessStep4After implements TaskListener { QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + + QueryWrapper queryWrapperInfo = new QueryWrapper(); + queryWrapperInfo.eq("TASK_ID", delegateTask.getId()); + BusProcessNew oneInfo = busBean.getOne(queryWrapperInfo); + String mesg = oneInfo.getMesg(); + //{"examineName":"张兰英(zhanglanying)","wgLeader":"zhanglanying,","releaseTime":"2023-04-07","LXDName":"11-立项单","examine":"zhanglanying","planStatus":"计划已确认","esName":"11","type":"5","commentText":"","dockUserName":"张兰英(zhanglanying)","engineerName":"","approverName":"张兰英(zhanglanying)","wgLeaderName":"张兰英","resPerson":"zhanglanying","bussSort":"FT","isRelate":"否","taskBreak":[],"tsJsonName":"技术基础","draftTime":"2023-04-07","bzfgbzFlag":"0","nowEsId":"866w8vtamwairixa80vi2r18rp8f8h0l","dockUser":"zhanglanying","area":["EKEV"],"approver":"zhanglanying","unitName":"福田汽车集团","prcCreateUser":"zhanglanying","prcCreateUserName":"张兰英","tsJson":"cc9e2a93a1ce4344ca8e7f875a28080e","engineer":"","addFlag":"0","passFlag":"0","technologic":"1","resPersonName":"张兰英(zhanglanying)","drafter":"zhanglanying","unit":"30000000","bzFlag":"0","countersignerName":"张兰英(zhanglanying)","reviseStatus":"制定","countersigner":"zhanglanying","deptCenterFlag":"0","drafterName":"张兰英(zhanglanying)"} + JSONObject jsonObject = JSONObject.parseObject(mesg); + String prcNameInfo = ""; + if(jsonObject!=null) { + Object esName = jsonObject.get("esName"); + Object bussSortInfo = jsonObject.get("bussSort"); + prcNameInfo = bussSortInfo + "-" + esName + "-企标制修订"; + } if (one1 != null) { one1.setPrcType("25"); -// one1.setPrcName(prcName); + one1.setPrcName(prcNameInfo); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1);