From 8a8f550b3b47d2ab74c57fcc1caa54fce078ec55 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 2 Mar 2022 11:05:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=B9=E6=B5=81=E7=A8=8B=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ydw/bat/wkflow/listener/bussFs/BLApplicantAfter.java | 8 ++++++-- .../com/ydw/bat/wkflow/listener/bussFs/BussFs2After.java | 9 ++++++--- .../com/ydw/bat/wkflow/listener/bussFs/BussFs3After.java | 9 ++++++--- .../ydw/bat/wkflow/listener/bussFs/BussFsC2After.java | 9 ++++++--- .../ydw/bat/wkflow/listener/bussFs/BussFsSub1After.java | 9 ++++++--- .../ydw/bat/wkflow/listener/bussFs/BussFsSub2After.java | 9 ++++++--- .../wkflow/listener/bussLibrary/BLApplicantAfter.java | 6 +++--- .../wkflow/listener/bussLibrary/BLApplicantC1After.java | 6 +++--- .../wkflow/listener/bussLibrary/BussLibrary10After.java | 6 +++--- .../wkflow/listener/bussLibrary/BussLibrary11After.java | 6 +++--- .../wkflow/listener/bussLibrary/BussLibrary12After.java | 6 +++--- .../wkflow/listener/bussLibrary/BussLibrary13After.java | 6 +++--- .../wkflow/listener/bussLibrary/BussLibrary2After.java | 6 +++--- .../wkflow/listener/bussLibrary/BussLibrary3After.java | 6 +++--- .../wkflow/listener/bussLibrary/BussLibrary4After.java | 6 +++--- .../wkflow/listener/bussLibrary/BussLibrary5After.java | 6 +++--- .../wkflow/listener/bussLibrary/BussLibrary6After.java | 6 +++--- .../wkflow/listener/bussLibrary/BussLibrary7After.java | 6 +++--- .../wkflow/listener/bussLibrary/BussLibrary8After.java | 6 +++--- .../wkflow/listener/bussLibrary/BussLibrary9After.java | 6 +++--- .../wkflow/listener/bussLibrary/BussLibraryC3After.java | 6 +++--- .../wkflow/listener/bussLibrary/BussLibraryC6After.java | 6 +++--- .../listener/bussLibraryProduct/BLApplicantAfter.java | 6 +++--- .../bussLibraryProduct/BussLibraryProduct10After.java | 6 +++--- .../bussLibraryProduct/BussLibraryProduct11After.java | 6 +++--- .../bussLibraryProduct/BussLibraryProduct12After.java | 6 +++--- .../bussLibraryProduct/BussLibraryProduct13After.java | 6 +++--- .../bussLibraryProduct/BussLibraryProduct14After.java | 6 +++--- .../bussLibraryProduct/BussLibraryProduct2After.java | 6 +++--- .../bussLibraryProduct/BussLibraryProduct3After.java | 6 +++--- .../bussLibraryProduct/BussLibraryProduct4After.java | 6 +++--- .../bussLibraryProduct/BussLibraryProduct5After.java | 6 +++--- .../bussLibraryProduct/BussLibraryProduct6After.java | 6 +++--- .../bussLibraryProduct/BussLibraryProduct7After.java | 6 +++--- .../bussLibraryProduct/BussLibraryProduct8After.java | 6 +++--- .../bussLibraryProduct/BussLibraryProduct9After.java | 6 +++--- .../bussLibraryProduct/BussLibraryProductC3After.java | 6 +++--- .../bussLibraryProduct/BussLibraryProductC6After.java | 6 +++--- 38 files changed, 132 insertions(+), 113 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BLApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BLApplicantAfter.java index 172b726d..0e013b9f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BLApplicantAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BLApplicantAfter.java @@ -45,8 +45,12 @@ public class BLApplicantAfter implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); - String standName = object.getString("standName"); - String prcName = standName+"-企标复审流程"; + String prcName = ""; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标复审"; + }else { + prcName = "企标复审"; + } List nextUserList = new ArrayStack<>(); if(StringUtils.isNotBlank(object.getString("bussFsSubUser1"))){ diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2After.java index 9d6d41dd..63ce53b7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2After.java @@ -53,9 +53,12 @@ public class BussFs2After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); // object.getString("standName") - String standName = object.getString("standName"); - String prcName = standName+"-企标复审流程"; - + String prcName = ""; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标复审"; + }else { + prcName = "企标复审"; + } 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/bussFs/BussFs3After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3After.java index f6b83d25..83e89904 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3After.java @@ -58,9 +58,12 @@ public class BussFs3After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); // object.getString("standName") - String standName = object.getString("standName"); - String prcName = standName+"-企标复审流程"; - + String prcName = ""; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标复审"; + }else { + prcName = "企标复审"; + } 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/bussFs/BussFsC2After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2After.java index acfaddfc..78f97a4f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2After.java @@ -51,9 +51,12 @@ public class BussFsC2After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); // object.getString("standName") - String standName = object.getString("standName"); - String prcName = standName+"-企标复审流程"; - + String prcName = ""; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标复审"; + }else { + prcName = "企标复审"; + } 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/bussFs/BussFsSub1After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub1After.java index e70d17ff..b6c0e0b0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub1After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub1After.java @@ -52,9 +52,12 @@ public class BussFsSub1After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); // object.getString("standName") - String standName = object.getString("standName"); - String prcName = standName+"-企标复审流程"; - + String prcName = ""; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标复审"; + }else { + prcName = "企标复审"; + } 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/bussFs/BussFsSub2After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2After.java index 966106d5..21089731 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2After.java @@ -54,9 +54,12 @@ public class BussFsSub2After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); // object.getString("standName") - String standName = object.getString("standName"); - String prcName = standName+"-企标复审流程"; - + String prcName = ""; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标复审"; + }else { + prcName = "企标复审"; + } Integer commentCount=delegateTask.getVariable("count",Integer.class); if(commentCount==null)commentCount=0; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java index 04e52262..ce22ea50 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java @@ -45,10 +45,10 @@ public class BLApplicantAfter implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-技术标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-技术标准"; + prcName = "企标制修订"; } List nextUserList = new ArrayStack<>(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantC1After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantC1After.java index 7739a569..3237a1b4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantC1After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantC1After.java @@ -45,10 +45,10 @@ public class BLApplicantC1After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-技术标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-技术标准"; + prcName = "企标制修订"; } List nextUserList = new ArrayStack<>(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10After.java index 09d8ab52..654c3622 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10After.java @@ -40,10 +40,10 @@ public class BussLibrary10After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-技术标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-技术标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11After.java index 7fb3c6ad..93e3e013 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11After.java @@ -40,10 +40,10 @@ public class BussLibrary11After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-技术标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-技术标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary12After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary12After.java index cf102915..64ed4af6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary12After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary12After.java @@ -47,10 +47,10 @@ public class BussLibrary12After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-技术标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-技术标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary13After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary13After.java index c2a94bbe..6a3a4e0e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary13After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary13After.java @@ -37,10 +37,10 @@ public class BussLibrary13After implements TaskListener{ delegateTask.setVariable("objectJson",object); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-技术标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-技术标准"; + prcName = "企标制修订"; } BussUtils.endFunc(delegateTask, prcName,busBean, object, "0", busProcessNameService); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2After.java index 390b186e..60f88829 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2After.java @@ -64,10 +64,10 @@ public class BussLibrary2After implements TaskListener{ // object.getString("standName") String standName = ""; String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-技术标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-技术标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary3After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary3After.java index e478d782..6438cca1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary3After.java @@ -54,10 +54,10 @@ public class BussLibrary3After implements TaskListener{ // object.getString("standName") String standName = ""; String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-技术标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-技术标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java index 59819b69..fcbf541f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java @@ -41,10 +41,10 @@ public class BussLibrary4After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-技术标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-技术标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5After.java index 585a4937..24a90995 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5After.java @@ -60,10 +60,10 @@ public class BussLibrary5After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-技术标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-技术标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary6After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary6After.java index 353051df..3e41695f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary6After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary6After.java @@ -47,10 +47,10 @@ public class BussLibrary6After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-技术标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-技术标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7After.java index 0abcd2ad..aa9f47ec 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7After.java @@ -49,10 +49,10 @@ public class BussLibrary7After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-技术标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-技术标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8After.java index be813200..12035d31 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8After.java @@ -40,10 +40,10 @@ public class BussLibrary8After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-技术标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-技术标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9After.java index 8fee50ae..8735fe15 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9After.java @@ -40,10 +40,10 @@ public class BussLibrary9After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-技术标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-技术标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3After.java index bf8337ab..ceda5ba2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3After.java @@ -62,10 +62,10 @@ public class BussLibraryC3After implements TaskListener{ // object.getString("standName") String standName = ""; String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-技术标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-技术标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC6After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC6After.java index 672d62cf..57b743fc 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC6After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC6After.java @@ -62,10 +62,10 @@ public class BussLibraryC6After implements TaskListener{ // object.getString("standName") String standName = ""; String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-技术标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-技术标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BLApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BLApplicantAfter.java index 0c673bd9..d45e0730 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BLApplicantAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BLApplicantAfter.java @@ -47,10 +47,10 @@ public class BLApplicantAfter implements TaskListener{ // object.getString("standName") String standName = ""; String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-产品标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-产品标准"; + prcName = "企标制修订"; } List nextUserList = new ArrayStack<>(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct10After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct10After.java index e9ade23e..d31b35b8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct10After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct10After.java @@ -42,10 +42,10 @@ public class BussLibraryProduct10After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-产品标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-产品标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct11After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct11After.java index bf291460..e8830b69 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct11After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct11After.java @@ -42,10 +42,10 @@ public class BussLibraryProduct11After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-产品标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-产品标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct12After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct12After.java index d3503759..23ae4d79 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct12After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct12After.java @@ -42,10 +42,10 @@ public class BussLibraryProduct12After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-产品标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-产品标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java index 9f884abb..62b7b932 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java @@ -36,10 +36,10 @@ public class BussLibraryProduct13After implements TaskListener{ delegateTask.setVariable("objectJson",object); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-产品标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-产品标准"; + prcName = "企标制修订"; } BussUtils.endFunc2(delegateTask, prcName,busBean, object, "0", busProcessNameService); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct14After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct14After.java index a50e4df6..e92e105c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct14After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct14After.java @@ -34,10 +34,10 @@ public class BussLibraryProduct14After implements TaskListener{ delegateTask.setVariable("objectJson",object); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-产品标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-产品标准"; + prcName = "企标制修订"; } BussUtils.endFunc2(delegateTask, prcName,busBean, object, "0", busProcessNameService); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct2After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct2After.java index 68cc188c..87c2dba2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct2After.java @@ -63,10 +63,10 @@ public class BussLibraryProduct2After implements TaskListener{ // object.getString("standName") String standName = ""; String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-产品标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-产品标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct3After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct3After.java index 1dd28f72..50216b77 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct3After.java @@ -54,10 +54,10 @@ public class BussLibraryProduct3After implements TaskListener{ // object.getString("standName") String standName = ""; String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-产品标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-产品标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct4After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct4After.java index 0cb918fd..5ac123bb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct4After.java @@ -42,10 +42,10 @@ public class BussLibraryProduct4After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-产品标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-产品标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java index 1f8ed83d..30d0b155 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java @@ -57,10 +57,10 @@ public class BussLibraryProduct5After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-产品标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-产品标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct6After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct6After.java index 827d2a35..cbe134af 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct6After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct6After.java @@ -47,10 +47,10 @@ public class BussLibraryProduct6After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-产品标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-产品标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct7After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct7After.java index 2b40337a..3e51a31a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct7After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct7After.java @@ -41,10 +41,10 @@ public class BussLibraryProduct7After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-产品标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-产品标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct8After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct8After.java index 00140b0d..b9fcbe52 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct8After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct8After.java @@ -42,10 +42,10 @@ public class BussLibraryProduct8After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-产品标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-产品标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct9After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct9After.java index f5e63a0a..2998e85b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct9After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct9After.java @@ -42,10 +42,10 @@ public class BussLibraryProduct9After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-产品标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-产品标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC3After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC3After.java index e9e0ead2..65fdccbf 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC3After.java @@ -54,10 +54,10 @@ public class BussLibraryProductC3After implements TaskListener{ // object.getString("standName") String standName = ""; String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-产品标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-产品标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC6After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC6After.java index 5d3763d7..ddaea379 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC6After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC6After.java @@ -47,10 +47,10 @@ public class BussLibraryProductC6After implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName"))){ - prcName = object.getString("standName") + "-企标制修订-产品标准"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ + prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; }else { - prcName = "企标制修订-产品标准"; + prcName = "企标制修订"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());