From 8ed8c15496122d1cbf607d20231365af1c194bd6 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 14 Feb 2022 15:09:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84=E8=AF=84?= =?UTF-8?q?=E4=BC=B0bug=E4=BF=AE=E5=A4=8D=20=E6=B8=85=E5=8D=95=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E6=B5=81=E7=A8=8B=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectEvaluationNewProcess/PEPstartAfter.java | 2 +- .../listener/projectEvaluationNewProcess/Step6After.java | 8 ++++++-- .../listener/standardRegulatoryProcess/SRPstartAfter.java | 7 +------ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/PEPstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/PEPstartAfter.java index 4e6ef412..49994ac2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/PEPstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/PEPstartAfter.java @@ -80,7 +80,7 @@ public class PEPstartAfter implements TaskListener { delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); delegateTask.setVariable("stands",object.getString("standNumber")); - String prcName = String.valueOf(object.getString("standNumber"))+"-标准项目合规评估流程-审核(标准法规业务经理)"; + String prcName = String.valueOf(object.getString("standNumber"))+"-"+object.getString("standName")+"-合规评估"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6After.java index 79f6f6c4..2a968b40 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6After.java @@ -40,7 +40,7 @@ public class Step6After implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList=new ArrayList<>(); - if (null!=delegateTask.getVariable("SDIdList")){ + if (null!=delegateTask.getVariable("SDIdList") && "0".equals(object.getString("passFlag"))){ nextUserList=delegateTask.getVariable("SDIdList",List.class); } Map map=new HashMap<>(); @@ -77,12 +77,16 @@ public class Step6After implements TaskListener { delegateTask.setVariable("passFlag","0"); delegateTask.setVariable("res6",map); }else { + if (null == delegateTask.getVariable("count6")) { + delegateTask.setVariable("count6", 0); + } + nextUserList.add(s[1]); delegateTask.setVariable("passFlag","1"); } //截止时间 流程描述 创建人 - 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 prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-审定（项目群负责人）"; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPstartAfter.java index 000a532b..0725d19c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPstartAfter.java @@ -91,12 +91,7 @@ public class SRPstartAfter implements TaskListener { delegateTask.setVariable("createUserName",username); String standName = object.getString("listName"); delegateTask.setVariable("listName",standName); - String prcName=""; - if(object.getString("signFlag").equals("1")) { - prcName = standName + "-标准法规清单申请-会签"; - }else { - prcName = standName + "-标准法规清单申请-经理审批"; - } + String prcName=object.getString("listName")+"-清单确认"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);