From c164653767492575fed424c975356f76f47037db Mon Sep 17 00:00:00 2001 From: wxyclub Date: Sun, 4 Feb 2024 17:26:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=BF=E7=AD=96=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E7=9A=84=E4=BF=AE=E6=94=B9=20=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E5=90=8E=E7=9A=84=E8=8A=82=E7=82=B9=E9=A9=B3?= =?UTF-8?q?=E5=9B=9E=E5=90=8E=E5=88=B0=E7=AE=A1=E7=90=86=E5=91=98=E8=8A=82?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PolicySolicitOpinionProcess11After.java | 7 +++++++ .../PolicySolicitOpinionProcess12After.java | 6 +++--- .../PolicySolicitOpinionProcess13After.java | 6 +++--- .../PolicySolicitOpinionProcess14After.java | 9 ++++++--- .../PolicySolicitOpinionProcess15After.java | 9 ++++++--- 5 files changed, 25 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess11After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess11After.java index 4f8e9749..44f7fa15 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess11After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess11After.java @@ -7,6 +7,7 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.business_main.datas.service.IPolicySolicitOpinionEOService; import com.ydw.bat.wkflow.util.SpringContextUtil; import com.ydw.bat.wkflow.util.enums.ApprovalFlagEnum; import org.activiti.engine.delegate.DelegateTask; @@ -23,6 +24,7 @@ public class PolicySolicitOpinionProcess11After implements TaskListener { public void notify(DelegateTask delegateTask) { IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IPolicySolicitOpinionEOService policySolicitOpinionEOService = SpringContextUtil.getBean(IPolicySolicitOpinionEOService.class); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -49,6 +51,11 @@ public class PolicySolicitOpinionProcess11After implements TaskListener { } busBean.saveBatch(addBusProcessNewList); + // 保存管理员填写的征求意见信息 + object.put("currentUserId",delegateTask.getAssignee()); + object.put("prcId",delegateTask.getProcessInstanceId()); + policySolicitOpinionEOService.batchInsert(object); + // 配置多实例 delegateTask.setVariable("shr2UserIdList", nextUserList); delegateTask.setVariable("shr2UserCount", nextUserList.size()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess12After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess12After.java index 9faa0407..84b47983 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess12After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess12After.java @@ -81,7 +81,7 @@ public class PolicySolicitOpinionProcess12After implements TaskListener { } } } else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) { - String pzr1UserId = jsonForm.getString("pzr1UserId"); + String glyUserId = jsonForm.getString("glyUserId"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -89,10 +89,10 @@ public class PolicySolicitOpinionProcess12After implements TaskListener { busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(pzr1UserId); + busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); - delegateTask.setVariable("pzr1UserId", pzr1UserId); + delegateTask.setVariable("djrUserId", glyUserId); delegateTask.setVariable("hqrUserIdList", new ArrayList()); delegateTask.setVariable("shr2UserOverruleCount", 1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess13After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess13After.java index ae6be652..ac33a438 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess13After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess13After.java @@ -67,7 +67,7 @@ public class PolicySolicitOpinionProcess13After implements TaskListener { } } } else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) { - String pzr1UserId = jsonForm.getString("pzr1UserId"); + String glyUserId = jsonForm.getString("glyUserId"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -75,10 +75,10 @@ public class PolicySolicitOpinionProcess13After implements TaskListener { busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(pzr1UserId); + busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); - delegateTask.setVariable("pzr1UserId", pzr1UserId); + delegateTask.setVariable("glyUserId", glyUserId); delegateTask.setVariable("hqrUserOverruleCount", 1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess14After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess14After.java index 789af733..954137d4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess14After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess14After.java @@ -14,6 +14,9 @@ import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; +/** + * 审定后 + */ public class PolicySolicitOpinionProcess14After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -51,7 +54,7 @@ public class PolicySolicitOpinionProcess14After implements TaskListener { delegateTask.setVariable("pzr2UserId", pzr2UserId); } } else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) { - String pzr1UserId = jsonForm.getString("pzr1UserId"); + String glyUserId = jsonForm.getString("glyUserId"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -59,10 +62,10 @@ public class PolicySolicitOpinionProcess14After implements TaskListener { busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(pzr1UserId); + busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); - delegateTask.setVariable("pzr1UserId", pzr1UserId); + delegateTask.setVariable("glyUserId", glyUserId); delegateTask.setVariable("sdr2UserOverruleCount", 1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess15After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess15After.java index 2494f284..1da9b690 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess15After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess15After.java @@ -18,6 +18,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +/** + * 批准后 + */ public class PolicySolicitOpinionProcess15After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -53,7 +56,7 @@ public class PolicySolicitOpinionProcess15After implements TaskListener { delegateTask.setVariable("csrUserIdList", nextUserList); } } else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) { - String pzr1UserId = jsonForm.getString("pzr1UserId"); + String glyUserId = jsonForm.getString("glyUserId"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -61,10 +64,10 @@ public class PolicySolicitOpinionProcess15After implements TaskListener { busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(pzr1UserId); + busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); - delegateTask.setVariable("pzr1UserId", pzr1UserId); + delegateTask.setVariable("glyUserId", glyUserId); } // 存储当前节点意见