From 88880a3f96ef80ea22c12c4dd5ef010fb7c4dbff Mon Sep 17 00:00:00 2001 From: wxyclub Date: Thu, 26 Oct 2023 18:06:14 +0800 Subject: [PATCH] =?UTF-8?q?add:=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 | 5 +++-- .../PRGEInspectorApprovalAfter.java | 8 ++++++-- .../PRGEMinisterConfirmAfter.java | 15 +++++++++------ .../PRGEStartAfter.java | 8 +++----- 4 files changed, 21 insertions(+), 15 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 8bb8bf6e..c861baaf 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 @@ -41,7 +41,7 @@ public class PGREPresidentApprovalAfter implements TaskListener { delegateTask.setVariable("objectJson", object); String user = delegateTask.getVariable("applyUserId", String.class); String username = delegateTask.getVariable("applyUserName", String.class); - String topicName = delegateTask.getVariable("topicName", String.class); + String topicName = object.getString("topicName"); String prcName= topicName + "-政策课题入会流程"; List nextUserList = new ArrayList<>(); @@ -101,7 +101,8 @@ public class PGREPresidentApprovalAfter implements TaskListener { busProcessNewNext.setMesg(object.toJSONString()); // busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); +// 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 260f830a..b5164e7e 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 @@ -39,8 +39,9 @@ public class PRGEInspectorApprovalAfter implements TaskListener { String user = delegateTask.getVariable("applyUserId", String.class); String username = delegateTask.getVariable("applyUserName", String.class); - String topicName = delegateTask.getVariable("topicName", String.class); + String topicName = object.getString("topicName"); String prcName= topicName + "-政策课题入会流程"; + String taskInfo = ""; List nextUserList = new ArrayList<>(); if (object.getInteger("approvalOpinion") == 0) { @@ -49,6 +50,7 @@ public class PRGEInspectorApprovalAfter implements TaskListener { if (StringUtils.isNotBlank(object.getString("presidentId"))) { delegateTask.setVariable("presidentId", object.getString("presidentId")); nextUserList.add(object.getString("presidentId")); + taskInfo = "批准"; } else { throw new ActivitiException("1#2公司副总不存在,请配置相关人员"); } @@ -58,6 +60,7 @@ public class PRGEInspectorApprovalAfter implements TaskListener { if (StringUtils.isNotBlank(object.getString("applyUserId"))){ delegateTask.setVariable("applyUserId", object.getString("applyUserId")); nextUserList.add(object.getString("applyUserId")); + taskInfo = "重新起草"; } else { throw new ActivitiException("1#2起草人不存在,请配置相关人员"); } @@ -96,7 +99,8 @@ public class PRGEInspectorApprovalAfter implements TaskListener { busProcessNewNext.setMesg(object.toJSONString()); // busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); +// busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo(taskInfo); busProcessNewNext.setUserId(nextUser); busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); 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 12332a8f..ab6c4e1d 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 @@ -42,8 +42,9 @@ public class PRGEMinisterConfirmAfter implements TaskListener { //截止时间 流程描述 创建人 String user = delegateTask.getVariable("applyUserId",String.class); String username = delegateTask.getVariable("applyUserName",String.class); - String topicName = delegateTask.getVariable("topicName", String.class); + String topicName = object.getString("topicName"); String prcName= topicName + "-政策课题组入会流程"; + String taskInfo = ""; List nextUserList = new ArrayList<>(); @@ -54,6 +55,7 @@ public class PRGEMinisterConfirmAfter implements TaskListener { List inspectorIdList = Arrays.asList(object.getString("inspectorId").split(",")); delegateTask.setVariable("inspectorIdList",inspectorIdList); nextUserList.addAll(inspectorIdList); + taskInfo = "审定"; } else { throw new ActivitiException("1#2法规认证部副总监不存在,请配置相关人员"); } @@ -63,11 +65,11 @@ public class PRGEMinisterConfirmAfter implements TaskListener { if (StringUtils.isNotBlank(object.getString("applyUserId"))){ delegateTask.setVariable("applyUserId", object.getString("applyUserId")); nextUserList.add(object.getString("applyUserId")); + taskInfo = "重新起草"; + } else { + throw new ActivitiException("1#2起草人不存在,请配置相关人员"); } - // 删除其他该节点的代办数据 -// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); -// wrapper.eq(BusProcessNew::getTaskId, delegateTask.getId()); -// busBean.remove(wrapper); + } // 存储当前节点意见 @@ -103,7 +105,8 @@ public class PRGEMinisterConfirmAfter implements TaskListener { busProcessNewNext.setMesg(object.toJSONString()); // busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); +// busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo(taskInfo); busProcessNewNext.setUserId(nextUser); busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); 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 c73ee896..0a13beb4 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 @@ -44,8 +44,6 @@ public class PRGEStartAfter implements TaskListener { List ministerIdList = Arrays.asList(object.getString("ministerId").split(",")); delegateTask.setVariable("ministerIdList",ministerIdList); nextUserList.addAll(ministerIdList); -// delegateTask.setVariable("ministerConfirm", object.getString("ministerId")); -// nextUserList.add(object.getString("ministerId")); } else { throw new ActivitiException("1#2法规认证部部长不存在,请配置相关人员"); } @@ -54,8 +52,7 @@ public class PRGEStartAfter implements TaskListener { String user = object.getString("applyUserId"); String username = object.getString("applyUserName"); String topicName = object.getString("topicName"); - String prcName=""; - prcName = topicName + "-政策课题入会流程"; + String prcName = topicName + "-政策课题入会流程"; QueryWrapper queryWrapper2 = new QueryWrapper<>(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); @@ -92,7 +89,8 @@ public class PRGEStartAfter implements TaskListener { busProcessNewNext.setMesg(object.toJSONString()); // busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); +// busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("审核"); busProcessNewNext.setUserId(nextUser); busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext);