From 9c80f7463090f2e0a555eee447ca89135549c59a Mon Sep 17 00:00:00 2001 From: wxyclub Date: Fri, 13 Oct 2023 09:53:55 +0800 Subject: [PATCH] =?UTF-8?q?add:=20=E6=94=BF=E7=AD=96=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=9A=84=E9=A9=B3=E5=9B=9E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lawsLibrary/LCLApplicantAfter.java | 26 +++--- .../lawsLibrary/LCLApplicantBefore.java | 2 +- .../lawsLibrary/LawsManagerApproveAfter.java | 83 ++++++++++--------- 3 files changed, 56 insertions(+), 55 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LCLApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LCLApplicantAfter.java index d45eda47..0a9abec4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LCLApplicantAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LCLApplicantAfter.java @@ -52,7 +52,7 @@ public class LCLApplicantAfter implements TaskListener{ } - QueryWrapper queryWrapper1 = new QueryWrapper(); + QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); queryWrapper1.eq("TASK_ID",delegateTask.getId()); @@ -60,7 +60,7 @@ public class LCLApplicantAfter implements TaskListener{ if(!list.isEmpty()){ BusProcessNew one = list.get(0); JSONObject object = JSONObject.parseObject(one.getMesg()); - List nextUserList = new ArrayList(); + List nextUserList = new ArrayList<>(); if(StringUtils.isNotBlank(objectNew.getString("jlUserId"))){ delegateTask.setVariable("managerUserId",objectNew.getString("jlUserId")); @@ -78,17 +78,17 @@ public class LCLApplicantAfter implements TaskListener{ // object.getString("standName") String standName = ""; Object lawsName = object.get("lawsName"); - Object lawsNumber = object.get("lawsNumber"); - String lawsInfoName = ""; - if(lawsName != null && lawsNumber != null){ - String name = lawsName.toString()+"-"; - String number = lawsNumber.toString()+"-"; - if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){ - lawsInfoName = number+name; - } - } - String prcName = lawsInfoName+"政策入库流程"; - QueryWrapper queryWrapper2 = new QueryWrapper(); +// Object lawsNumber = object.get("lawsNumber"); +// String lawsInfoName = ""; +// if(lawsName != null && lawsNumber != null){ +// String name = lawsName.toString()+"-"; +// String number = lawsNumber.toString()+"-"; +// if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){ +// lawsInfoName = number+name; +// } +// } + String prcName = lawsName+"-政策入库流程"; + QueryWrapper queryWrapper2 = new QueryWrapper<>(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ diff --git a/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LCLApplicantBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LCLApplicantBefore.java index 7623f36e..f553014d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LCLApplicantBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LCLApplicantBefore.java @@ -20,7 +20,7 @@ public class LCLApplicantBefore implements TaskListener{ IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); - QueryWrapper queryWrapper1 = new QueryWrapper(); + QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); queryWrapper1.isNull("TASK_ID"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveAfter.java index b4cbd75b..79d2c66c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveAfter.java @@ -36,34 +36,34 @@ public class LawsManagerApproveAfter implements TaskListener { String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString(); Object lawsName = object.get("lawsName"); - Object lawsNumber = object.get("lawsNumber"); - String lawsInfoName = ""; - if(lawsName != null && lawsNumber != null){ - String name = lawsName.toString()+"-"; - String number = lawsNumber.toString()+"-"; - if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){ - lawsInfoName = number+name; - } - } - String prcName = lawsInfoName+"政策入库流程"; +// Object lawsNumber = object.get("lawsNumber"); +// String lawsInfoName = ""; +// if(lawsName != null && lawsNumber != null){ +// String name = lawsName.toString()+"-"; +// String number = lawsNumber.toString()+"-"; +// if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){ +// lawsInfoName = number+name; +// } +// } + String prcName = lawsName+"-政策入库流程"; //截止时间 流程描述 创建人 - String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = delegateTask.getVariable("prcCreateUser", String.class); - String username = delegateTask.getVariable("prcCreateUserName", String.class); +// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); +// String user = delegateTask.getVariable("prcCreateUser", String.class); +// String username = delegateTask.getVariable("prcCreateUserName", String.class); + // 驳回 if ("1".equalsIgnoreCase(approvalOpinion)) { - //截止时间 流程描述 创建人 - QueryWrapper queryWrapper2 = new QueryWrapper(); - queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); - BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); - if (one1 != null) { - one1.setOverTime(OVERTIME); - one1.setPrcType("laws1"); - one1.setPrcName(prcName); - one1.setCreatUser(user); - one1.setCreatUserName(username); - busProcessNameService.saveOrUpdate(one1); - } + // 流程描述 创建人 +// QueryWrapper queryWrapper2 = new QueryWrapper<>(); +// queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); +// BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); +// if (one1 != null) { +// one1.setPrcType("laws1"); +// one1.setPrcName(prcName); +// one1.setCreatUser(user); +// one1.setCreatUserName(username); +// busProcessNameService.saveOrUpdate(one1); +// } BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setMsgType("clause"); @@ -72,26 +72,27 @@ public class LawsManagerApproveAfter implements TaskListener { busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); - busProcessNew.setUserId(object.getString("applyUpdUserId")); + busProcessNew.setUserId(object.getString("jlUserId")); busProcessNew.setPrcName(prcName); busBean.save(busProcessNew); - BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1"); - delegateTask.setVariable("applyUserId", object.getString("applyUpdUserId")); + func1(delegateTask, busBean, object, "1"); + delegateTask.setVariable("applyUserId", object.getString("prcCreateUser")); delegateTask.setVariable("jlFlag", 1); } else { + // 通过 //截止时间 流程描述 创建人 - QueryWrapper queryWrapper2 = new QueryWrapper(); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); - if (one1 != null) { - one1.setOverTime(OVERTIME); - one1.setPrcType("laws1"); - one1.setPrcName(prcName); - one1.setCreatUser(user); - one1.setCreatUserName(username); - busProcessNameService.saveOrUpdate(one1); - } +// if (one1 != null) { +// one1.setOverTime(OVERTIME); +// one1.setPrcType("laws1"); +// one1.setPrcName(prcName); +// one1.setCreatUser(user); +// one1.setCreatUserName(username); +// busProcessNameService.saveOrUpdate(one1); +// } BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setMsgType("clause"); @@ -100,7 +101,7 @@ public class LawsManagerApproveAfter implements TaskListener { busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); - busProcessNew.setUserId(object.getString("applyUpdUserId")); + busProcessNew.setUserId(object.getString("jlUserId")); busProcessNew.setPrcName(prcName); busBean.save(busProcessNew); delegateTask.setVariable("jlFlag", 0); @@ -109,7 +110,7 @@ public class LawsManagerApproveAfter implements TaskListener { } private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { - QueryWrapper queryWrapper1 = new QueryWrapper(); + QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.eq("TASK_ID", delegateTask.getId()); BusProcessNew one1 = busBean.getOne(queryWrapper1); if (one1 != null) { @@ -120,7 +121,7 @@ public class LawsManagerApproveAfter implements TaskListener { } private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { - QueryWrapper queryWrapper2 = new QueryWrapper(); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); @@ -131,7 +132,7 @@ public class LawsManagerApproveAfter implements TaskListener { busProcessNameService.saveOrUpdate(one2); } - QueryWrapper queryWrapper1 = new QueryWrapper(); + QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.eq("TASK_ID", delegateTask.getId()); BusProcessNew one1 = busBean.getOne(queryWrapper1); if (one1 != null) {