From 261cc9448a096476bd8a71e02ffe708f35ac0c78 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 23 Jun 2021 16:45:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardLibrary/ApplyApplicantAfter.java | 11 +++++++++++ .../standardLibrary/CountersignAfter.java | 18 ++++++++++++++---- .../standardLibrary/SLApplicantAfter.java | 1 + 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java index 82d84bd5..bf8ecc6d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java @@ -72,6 +72,17 @@ public class ApplyApplicantAfter implements TaskListener{ busProcessNameService.saveOrUpdate(one1); } + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID",delegateTask.getId()); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew busProcessNew = list.get(0); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNew); + } + + if(nextUserList != null && !nextUserList.isEmpty()){ for(String nextUser : nextUserList){ BusProcessNew busProcessNew = new BusProcessNew(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java index 229f36a2..a8cd65fd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java @@ -40,11 +40,11 @@ public class CountersignAfter implements TaskListener{ // JSONObject array = object.getJSONObject("hqsqForm"); - if(StringUtils.isNotBlank(object.getString("jlUserId"))){ - delegateTask.setVariable("managerUserId",object.getString("jlUserId")); - nextUserList.add(object.getString("jlUserId")); + if(StringUtils.isNotBlank(object.getString("applyUpdUserId"))){ + delegateTask.setVariable("applyUserId",object.getString("applyUpdUserId")); + nextUserList.add(object.getString("applyUpdUserId")); }else { - throw new ActivitiException("1#2经理人不存在,请配置相关人员"); + throw new ActivitiException("1#2申请人修订用户不存在,请配置相关人员"); } //截止时间 流程描述 创建人 @@ -71,6 +71,16 @@ public class CountersignAfter implements TaskListener{ busProcessNameService.saveOrUpdate(one1); } + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID",delegateTask.getId()); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew busProcessNew = list.get(0); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNew); + } + if(nextUserList != null && !nextUserList.isEmpty()){ for(String nextUser : nextUserList){ BusProcessNew busProcessNew = new BusProcessNew(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java index 988bcbfe..c2987731 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java @@ -55,6 +55,7 @@ public class SLApplicantAfter implements TaskListener{ } // 配置多实例 delegateTask.setVariable("hqUserList",nextUserList); + delegateTask.addCandidateUsers(nextUserList); }else { throw new ActivitiException("1#2会签状态不存在,请配置相关状态"); }