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; + } }