From d28a95e26fd2ea07ad660f21e7e50eccf826e424 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Wed, 15 Nov 2023 10:37:39 +0800 Subject: [PATCH] =?UTF-8?q?bug:=20=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?= =?UTF-8?q?=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PGREPresidentApprovalAfter.java | 11 +++-------- .../PRGEInspectorApprovalAfter.java | 11 +++-------- .../PRGEMinisterConfirmAfter.java | 10 ++++------ .../policyResearchGroupEnrollment/PRGEStartAfter.java | 1 - .../RevisionInformationAfter.java | 4 ++-- 5 files changed, 12 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java index a40e4e29..e52507fb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java @@ -46,10 +46,9 @@ public class PGREPresidentApprovalAfter implements TaskListener { List nextUserList = new ArrayList<>(); - if (delegateTask.getVariable("approvalStatus",Boolean.class)) { + if (object.getInteger("approvalOpinion") == 0) { // 批准通过 -// delegateTask.setVariable("approvalOpinion", 0); - delegateTask.setVariable("approvalStatus", true); + delegateTask.setVariable("approvalOpinion", 0); LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); queryWrapper2.eq(BusProcessName::getPrcId, delegateTask.getProcessInstanceId()); BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); @@ -60,8 +59,7 @@ public class PGREPresidentApprovalAfter implements TaskListener { } } else { // 批准驳回 -// delegateTask.setVariable("approvalOpinion", 1); - delegateTask.setVariable("approvalStatus", false); + delegateTask.setVariable("approvalOpinion", 1); if (StringUtils.isNotBlank(object.getString("applyUserId"))) { delegateTask.setVariable("applyUserId", object.getString("applyUserId")); nextUserList.add(object.getString("applyUserId")); @@ -101,10 +99,7 @@ public class PGREPresidentApprovalAfter implements TaskListener { busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); -// busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); -// busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setTaskInfo("重新起草"); busProcessNewNext.setUserId(nextUser); busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java index d9444468..f4e9b943 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java @@ -41,28 +41,23 @@ public class PRGEInspectorApprovalAfter implements TaskListener { String username = delegateTask.getVariable("applyUserName", String.class); String topicName = object.getString("topicName"); String prcName= topicName + "-政策课题入会流程"; - String taskInfo = ""; List nextUserList = new ArrayList<>(); - if (delegateTask.getVariable("approvalStatus",Boolean.class)) { + if (object.getInteger("approvalOpinion") == 0) { // 审定通过 -// delegateTask.setVariable("approvalOpinion", 0); - delegateTask.setVariable("approvalStatus", true); + delegateTask.setVariable("approvalOpinion", 0); if (StringUtils.isNotBlank(object.getString("presidentId"))) { delegateTask.setVariable("presidentId", object.getString("presidentId")); nextUserList.add(object.getString("presidentId")); - taskInfo = "批准"; } else { throw new ActivitiException("1#2公司副总不存在,请配置相关人员"); } } else { // 审定驳回 delegateTask.setVariable("approvalOpinion", 1); -// delegateTask.setVariable("approvalStatus", false); if (StringUtils.isNotBlank(object.getString("applyUserId"))){ delegateTask.setVariable("applyUserId", object.getString("applyUserId")); nextUserList.add(object.getString("applyUserId")); - taskInfo = "重新起草"; } else { throw new ActivitiException("1#2起草人不存在,请配置相关人员"); } @@ -93,7 +88,7 @@ public class PRGEInspectorApprovalAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } - if (!nextUserList.isEmpty() && delegateTask.getVariable("nrOfCompletedInstances", Integer.class) <= 1) { + if (!nextUserList.isEmpty() && delegateTask.getVariable("nrOfCompletedInstances", Integer.class) == 0) { for (String nextUser : nextUserList) { BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java index 1952a1f5..bde9dd59 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java @@ -48,10 +48,9 @@ public class PRGEMinisterConfirmAfter implements TaskListener { List nextUserList = new ArrayList<>(); - if(delegateTask.getVariable("approvalStatus",Boolean.class)){ + if(object.getInteger("approvalOpinion") == 0){ // 审核通过 -// delegateTask.setVariable("approvalOpinion", 0); - delegateTask.setVariable("approvalStatus",true); + delegateTask.setVariable("approvalOpinion", 0); if (StringUtils.isNotBlank(object.getString("inspectorId"))){ List inspectorIdList = Arrays.asList(object.getString("inspectorId").split(",")); delegateTask.setVariable("inspectorIdList",inspectorIdList); @@ -62,8 +61,7 @@ public class PRGEMinisterConfirmAfter implements TaskListener { } }else{ // 审核驳回 -// delegateTask.setVariable("approvalOpinion",1); - delegateTask.setVariable("approvalOpinion",false); + delegateTask.setVariable("approvalOpinion",1); if (StringUtils.isNotBlank(object.getString("applyUserId"))){ delegateTask.setVariable("applyUserId", object.getString("applyUserId")); nextUserList.add(object.getString("applyUserId")); @@ -99,7 +97,7 @@ public class PRGEMinisterConfirmAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } - if (!nextUserList.isEmpty() && delegateTask.getVariable("nrOfCompletedInstances", Integer.class) <= 1) { + if (!nextUserList.isEmpty() && delegateTask.getVariable("nrOfCompletedInstances", Integer.class) ==0) { for (String nextUser : nextUserList) { BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java index c1411a64..522f1676 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java @@ -45,7 +45,6 @@ public class PRGEStartAfter implements TaskListener { List ministerIdList = Arrays.asList(object.getString("ministerId").split(",")); delegateTask.setVariable("ministerIdList",ministerIdList); nextUserList.addAll(ministerIdList); - delegateTask.setVariable("approvalStatus",true); } else { throw new ActivitiException("1#2法规认证部部长不存在,请配置相关人员"); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisionInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisionInformationAfter.java index ac8da726..41502ab7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisionInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisionInformationAfter.java @@ -41,7 +41,7 @@ public class RevisionInformationAfter implements TaskListener { List nextUserList = new ArrayList<>(); if (StringUtils.isNotBlank(object.getString("ministerId"))) { - delegateTask.setVariable("approvalStatus", true); + delegateTask.setVariable("approvalOpinion", 0); List ministerIdList = Arrays.asList(object.getString("ministerId").split(",")); delegateTask.setVariable("ministerIdList",ministerIdList); nextUserList.addAll(ministerIdList); @@ -52,7 +52,7 @@ public class RevisionInformationAfter implements TaskListener { String user = delegateTask.getVariable("applyUserId", String.class); String username = delegateTask.getVariable("applyUserName", String.class); String topicName = object.getString("topicName"); - String prcName= topicName + "-政策课题组入会流程"; + String prcName= topicName + "-政策课题入会流程"; QueryWrapper queryWrapper2 = new QueryWrapper<>(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());