From f64f3d699766111ce268041dfb61badd767b6aaf Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 28 Jul 2021 14:48:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=20?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=90=8D=E7=A7=B0=E5=9B=9E=E6=98=BE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardLibrary/ApplyApplicantAfter.java | 12 ++++++++++-- .../listener/standardLibrary/CountersignAfter.java | 11 ++++++++++- .../listener/standardLibrary/SLApplicantAfter.java | 11 ++++++++++- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java index 1305d5f2..2564723b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java @@ -59,7 +59,13 @@ public class ApplyApplicantAfter implements TaskListener{ }else { standName = "国外"; } - String prcName = "标准名称-"+standName+"标准入库"; + String standAllName = ""; + if(object.getString("standYear") != null && !object.getString("standYear").equals("")){ + standAllName = verifyObj(object.getString("standSortShow")) + " " + verifyObj(object.getString("standNumber")) + "-" + verifyObj(object.getString("standYear")); + }else { + standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber")); + } + String prcName = standAllName+"-"+standName+"标准入库"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -96,6 +102,8 @@ public class ApplyApplicantAfter implements TaskListener{ busBean.save(busProcessNew); } } - + } + private String verifyObj(String str){ + return (str == null || str.equals("")) ? "" : str; } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java index c6c53f26..788f19eb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java @@ -58,7 +58,13 @@ public class CountersignAfter implements TaskListener{ }else { standName = "国外"; } - String prcName = "标准名称-"+standName+"标准入库"; + String standAllName = ""; + if(object.getString("standYear") != null && !object.getString("standYear").equals("")){ + standAllName = verifyObj(object.getString("standSortShow")) + " " + verifyObj(object.getString("standNumber")) + "-" + verifyObj(object.getString("standYear")); + }else { + standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber")); + } + String prcName = standAllName+"-"+standName+"标准入库"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -94,6 +100,9 @@ public class CountersignAfter implements TaskListener{ busBean.save(busProcessNew); } } + } + private String verifyObj(String str){ + return (str == null || str.equals("")) ? "" : str; } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java index 53cd2e98..d5e8ef44 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java @@ -82,7 +82,13 @@ public class SLApplicantAfter implements TaskListener{ }else { standName = "国外"; } - String prcName = "标准名称-"+standName+"标准入库"; + String standAllName = ""; + if(object.getString("standYear") != null && !object.getString("standYear").equals("")){ + standAllName = verifyObj(object.getString("standSortShow")) + " " + verifyObj(object.getString("standNumber")) + "-" + verifyObj(object.getString("standYear")); + }else { + standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber")); + } + String prcName = standAllName+"-"+standName+"标准入库"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -121,4 +127,7 @@ public class SLApplicantAfter implements TaskListener{ } } } + private String verifyObj(String str){ + return (str == null || str.equals("")) ? "" : str; + } } From 23718f148edd733adf8416382528df9916134ecb Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Wed, 28 Jul 2021 18:18:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update:=E4=BF=AE=E5=A4=8D=E4=BF=A9BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/StandardCommentProcess/StartSurveyAfter.java | 5 ++--- .../bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java index 4ed6bed6..f4b8c77a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java @@ -60,9 +60,8 @@ public class StartSurveyAfter implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); -// object.getString("standName") - String standName = ""; - String prcName = standName+"标准征求意见流程"; + String standName = object.getString("cid"); + String prcName = 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/StandardSurvey/StartSurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java index cf7a81f1..18eb1c05 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java @@ -66,9 +66,8 @@ public class StartSurveyAfter implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); -// object.getString("standName") - String standName = ""; - String prcName = standName+"标准调研流程"; + String standName = object.getString("title"); + String prcName = standName+"-标准调研流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);