From 35e95626d5fe6322110f4a89be8c91a77ff87476 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Tue, 18 Jul 2023 09:25:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?add:=E6=B3=A8=E8=A7=A3=E6=8E=89=E5=8E=BB?= =?UTF-8?q?=E9=99=A4`#/`=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WebServiceOAServiceImpl.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 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 cba403da..5586d2bf 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 @@ -247,13 +247,13 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { head.setPASSWORD("TEST_oa201611241710"); head.setSRVLEVEL("1"); List list = new ArrayList<>(); - notifyTodoSendContexts.forEach(each -> { - if (each.getLink()!= null){ - if (each.getLink().contains("#/")){ - each.setLink(each.getLink().replaceAll("#/","")); - } - } - }); +// notifyTodoSendContexts.forEach(each -> { +// if (each.getLink()!= null){ +// if (each.getLink().contains("#/")){ +// each.setLink(each.getLink().replaceAll("#/","")); +// } +// } +// }); list.addAll(notifyTodoSendContexts); jsonSend.setHEAD(head); jsonSend.setLIST(list); @@ -318,11 +318,11 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { @Override @Async public NotifyTodoAppResult setTodoDone(NotifyTodoSendContext notifyTodoSendContext) throws Exception{ - if (notifyTodoSendContext.getLink()!= null){ - if (notifyTodoSendContext.getLink().contains("#/")){ - notifyTodoSendContext.setLink(notifyTodoSendContext.getLink().replaceAll("#/","")); - } - } +// if (notifyTodoSendContext.getLink()!= null){ +// if (notifyTodoSendContext.getLink().contains("#/")){ +// notifyTodoSendContext.setLink(notifyTodoSendContext.getLink().replaceAll("#/","")); +// } +// } NotifyTodoAppResult notifyTodoAppResult = new NotifyTodoAppResult(); String result = ""; SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); @@ -371,11 +371,11 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { @Override @Async public NotifyTodoAppResult sendTodo(BusProcessNew busProcessNew) throws Exception{ - if (busProcessNew.getLink()!= null){ - if (busProcessNew.getLink().contains("#/")){ - busProcessNew.setLink(busProcessNew.getLink().replaceAll("#/","")); - } - } +// if (busProcessNew.getLink()!= null){ +// if (busProcessNew.getLink().contains("#/")){ +// busProcessNew.setLink(busProcessNew.getLink().replaceAll("#/","")); +// } +// } NotifyTodoAppResult notifyTodoAppResult = new NotifyTodoAppResult(); String result = ""; SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); From 7f96ad3d84fdc40883f300467e54de9e2fa8636e Mon Sep 17 00:00:00 2001 From: wxyclub Date: Fri, 21 Jul 2023 17:07:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?add:=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=AE=A1=E6=8E=A7=E4=BC=9A=E7=AD=BE=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessStep1After.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java index bbef0f7c..bf80877a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java @@ -47,7 +47,6 @@ public class ProcessStep1After implements TaskListener { } else { nextUserList.add(delegateTask.getVariable("Step1",String.class)); } - delegateTask.setVariable("deptCenterId", nextUserList); delegateTask.setVariable("deptLeaderFlag",0); }else { nextUserList.add(delegateTask.getVariable("prcCreateUser",String.class)); @@ -55,6 +54,8 @@ public class ProcessStep1After implements TaskListener { delegateTask.setVariable("deptLeaderFlag",1); } + delegateTask.setVariable("deptCenterId", nextUserList); + //截止时间 流程描述 创建人 String user = delegateTask.getVariable("prcCreateUser",String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); From e246384ed3b7eff284c61d65cdc36a48ae63775a Mon Sep 17 00:00:00 2001 From: wxyclub Date: Wed, 26 Jul 2023 10:45:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?add:=E4=BF=AE=E6=94=B9completeTask=E4=B8=AD?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=9A=84t=5Fdata=E8=A1=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=A4=9A=E6=9D=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_wkflow/form/service/FormValsService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_wkflow/form/service/FormValsService.java b/src/main/java/com/ydw/bat/wkflow/business_wkflow/form/service/FormValsService.java index f7c8491d..88f4cbd4 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_wkflow/form/service/FormValsService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_wkflow/form/service/FormValsService.java @@ -233,8 +233,12 @@ public class FormValsService { public Datas getFormValByTaskId(String task_id) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("acti_task_id", task_id); - Datas datas = datasService.getOne(queryWrapper); - return datas; + queryWrapper.orderByDesc("CREATE_TIME"); + List list = datasService.list(queryWrapper); + if (list.isEmpty()){ + return null; + } + return list.get(0); } public String taskSubmit(FormSubmitDto formSubmitDto) {