From ad7d78141aa7c179ca0a14903ed1fb37620d2a1a Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 26 Aug 2021 11:20:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E7=AC=A6=E5=90=88=E9=A1=B9=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NonConformanceRectification/DockingApprovalAfter.java | 2 -- .../NonConformanceRectification/SelectResponUserAfter.java | 3 ++- .../wkflow/listener/standardLibrary/ManagerApproveAfter.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/DockingApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/DockingApprovalAfter.java index e2133a80..cd4f0d89 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/DockingApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/DockingApprovalAfter.java @@ -87,8 +87,6 @@ public class DockingApprovalAfter implements TaskListener { if(delegateTask.getVariable("actionFlag",Integer.class)==0){ - - if(count>=responUserList.size()){ } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserAfter.java index d01c40c1..384bc3fd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserAfter.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.tmsps.fk.common.util.JsonUtil; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; @@ -155,7 +156,7 @@ public class SelectResponUserAfter implements TaskListener { BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setMesg(JsonUtil.toJson(o)); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveAfter.java index c47e9c66..eeec651c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveAfter.java @@ -73,7 +73,7 @@ public class ManagerApproveAfter implements TaskListener { BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); if (one2 != null) { - one2.setPrcName("入库流程结束"); +// one2.setPrcName("入库流程结束"); one2.setOverTime(OVERTIME); one2.setPrcType("1"); busProcessNameService.saveOrUpdate(one2);