From 3608c1e5e2353c1eb66b3142e2895a4628ac59c8 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Sun, 28 Apr 2024 11:26:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=96=E9=83=A8=E7=BD=B2=E5=90=8D?= =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RecommendedApproval/RAAuditAfter.java | 5 ++-- .../RAModifyInformationAfter.java | 24 +++++++++++++------ .../RecommendedApproval/RASignAfter.java | 7 +++--- .../RAValidationAfter.java | 9 +++---- 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java index d8e2812a..ce1b9604 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java @@ -31,6 +31,7 @@ public class RAAuditAfter implements TaskListener { Datas datas = datasService.getOne(queryWrapper); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + JSONObject roleForm = object.getJSONObject("roleForm"); delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); @@ -46,8 +47,8 @@ public class RAAuditAfter implements TaskListener { } //截止时间 流程描述 创建人 - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); + String user = roleForm.getString("prcCreateUser"); + String username = roleForm.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); String prcName=""; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java index 11ff39b7..eaad9faf 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java @@ -12,6 +12,7 @@ import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public class RAModifyInformationAfter implements TaskListener { @@ -31,19 +32,27 @@ public class RAModifyInformationAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - List nextUserList = new ArrayList(); - - nextUserList.addAll(delegateTask.getVariable("leadershiplist",List.class)); - + List nextUserList = new ArrayList<>(); //截止时间 流程描述 创建人 - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); + JSONObject roleForm = object.getJSONObject("roleForm"); + String user = roleForm.getString("prcCreateUser"); + String username = roleForm.getString("prcCreateUserName"); + String dockUser = roleForm.getString("dockUser"); + List dockUserList = Arrays.asList(dockUser.split(",")); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); + // 赋值 + delegateTask.setVariable("leadershiplist", dockUserList); + delegateTask.setVariable("statuteminister1", roleForm.getString("ministerUser")); + delegateTask.setVariable("director1", roleForm.getString("directorUser")); + delegateTask.setVariable("dean1", roleForm.getString("president")); + delegateTask.setVariable("statuteengineer3", roleForm.getString("passUser")); + nextUserList.addAll(dockUserList); + String prcName = "外部署名推荐批准-署名领导会签"; - QueryWrapper queryWrapper2 = new QueryWrapper(); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -52,6 +61,7 @@ public class RAModifyInformationAfter implements TaskListener { // one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); + one1.setMes(datas.getFormValsJson()); busProcessNameService.saveOrUpdate(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java index f4b1179e..55b08960 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java @@ -31,6 +31,7 @@ public class RASignAfter implements TaskListener { Datas datas = datasService.getOne(queryWrapper); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + JSONObject roleForm = object.getJSONObject("roleForm"); delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); @@ -46,8 +47,8 @@ public class RASignAfter implements TaskListener { } //截止时间 流程描述 创建人 - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); + String user = roleForm.getString("prcCreateUser"); + String username = roleForm.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); String prcName=""; @@ -58,7 +59,7 @@ public class RASignAfter implements TaskListener { } - QueryWrapper queryWrapper2 = new QueryWrapper(); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java index 15647d60..ffced68a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java @@ -32,9 +32,10 @@ public class RAValidationAfter implements TaskListener { Datas datas = datasService.getOne(queryWrapper); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + JSONObject roleForm = object.getJSONObject("roleForm"); delegateTask.setVariable("objectJson", object); - List nextUserList = new ArrayList(); + List nextUserList = new ArrayList<>(); if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("zrFlag", 1); @@ -47,8 +48,8 @@ public class RAValidationAfter implements TaskListener { } //截止时间 流程描述 创建人 - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); + String user = roleForm.getString("prcCreateUser"); + String username = roleForm.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); @@ -59,7 +60,7 @@ public class RAValidationAfter implements TaskListener { prcName = "外部署名推荐批准-修改信息"; } - QueryWrapper queryWrapper2 = new QueryWrapper(); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);