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"); 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) { 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);