Merge branch 'develop' into FOTON

src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java

@@ -2119,18 +2119,18 @@ public class TodoTaskController extends BaseAction {
                                     }
                                 }
                             }
-                            //获取新的流程名称·
+//                            //获取新的流程名称·
-                            QueryWrapper<BusProcessNew> queryWrapper1=new QueryWrapper<>();
+//                            QueryWrapper<BusProcessNew> queryWrapper1=new QueryWrapper<>();
-                            queryWrapper1.eq("P_ID",busProcessName.getPrcId());
+//                            queryWrapper1.eq("P_ID",busProcessName.getPrcId());
-                            queryWrapper1.eq("TASK_ID",task.getId());
+//                            queryWrapper1.eq("TASK_ID",task.getId());
-                            BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1);
+//                            BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1);
-                            if (null!=busProcessNew) {
+//                            if (null!=busProcessNew) {
-                                if (null != busProcessNew.getPrcName()) {
+//                                if (null != busProcessNew.getPrcName()) {
-                                    busProcessName.setPrcName(busProcessNew.getPrcName());
+//                                    busProcessName.setPrcName(busProcessNew.getPrcName());
-                                } else {
+//                                } else {
-                                    busProcessNew.setPrcName("");
+//                                    busProcessNew.setPrcName("");
-                                }
+//                                }
-                            }
+//                            }
                         }
                     }
                     if (assignee != null && !assignee.equals("")) {

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 = "";
-        String prcName = standName+"-企标复审流程";
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标复审";
+        }else {
+            prcName = "企标复审";
+        }
 
         List<String> nextUserList = new ArrayStack<>();
         if(StringUtils.isNotBlank(object.getString("bussFsSubUser1"))){

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 = "";
-        String prcName = standName+"-企标复审流程";
+        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);

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 = "";
-        String prcName = standName+"-企标复审流程";
+        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);

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 = "";
-        String prcName = standName+"-企标复审流程";
+        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);

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 = "";
-        String prcName = standName+"-企标复审流程";
+        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);

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 = "";
-        String prcName = standName+"-企标复审流程";
+        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;

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-                prcName = object.getString("standName") + "-企标制修订-技术标准";
+                prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-                prcName = "企标制修订-技术标准";
+                prcName = "企标制修订";
         }
 
         List<String> nextUserList = new ArrayStack<>();

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-                prcName = object.getString("standName") + "-企标制修订-技术标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-                prcName = "企标制修订-技术标准";
+            prcName = "企标制修订";
         }
 
         List<String> nextUserList = new ArrayStack<>();

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-技术标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-技术标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-技术标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-技术标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-技术标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-技术标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-技术标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-技术标准";
+            prcName = "企标制修订";
         }
         BussUtils.endFunc(delegateTask, prcName,busBean, object, "0", busProcessNameService);
     }

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-技术标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-技术标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-技术标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-技术标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-技术标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-技术标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-技术标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-技术标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-技术标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-技术标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-技术标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-技术标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-技术标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-技术标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-技术标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-技术标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+            if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-                prcName = object.getString("standName") + "-企标制修订-技术标准";
+                prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
             }else {
-                prcName = "企标制修订-技术标准";
+                prcName = "企标制修订";
             }
             QueryWrapper queryWrapper2 = new QueryWrapper();
             queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+            if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-                prcName = object.getString("standName") + "-企标制修订-技术标准";
+                prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
             }else {
-                prcName = "企标制修订-技术标准";
+                prcName = "企标制修订";
             }
             QueryWrapper queryWrapper2 = new QueryWrapper();
             queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-产品标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-产品标准";
+            prcName = "企标制修订";
         }
 
         List<String> nextUserList = new ArrayStack<>();

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-产品标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-产品标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-产品标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-产品标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-产品标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-产品标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-产品标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-产品标准";
+            prcName = "企标制修订";
         }
         BussUtils.endFunc2(delegateTask, prcName,busBean, object, "0", busProcessNameService);
     }

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-产品标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-产品标准";
+            prcName = "企标制修订";
         }
         BussUtils.endFunc2(delegateTask, prcName,busBean, object, "0", busProcessNameService);
     }

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-产品标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-产品标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-产品标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-产品标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-产品标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-产品标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-产品标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-产品标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-产品标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-产品标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-产品标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-产品标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-产品标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-产品标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-产品标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-产品标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-产品标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-产品标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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"))){
+        if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
-            prcName = object.getString("standName") + "-企标制修订-产品标准";
+            prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
         }else {
-            prcName = "企标制修订-产品标准";
+            prcName = "企标制修订";
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java

@@ -77,12 +77,12 @@ public class SLApplicantAfter implements TaskListener{
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
-        String standName = object.getString("standName");
+        String standName = "";
-//        if(object.getString("standInData").equals("0")){
+        if (null!=object.getString("standName") && !"".equals(object.getString("standName"))){
-//            standName = "国内";
+            standName=object.getString("standName");
-//        }else {
+        }else {
-//            standName = "海外";
+            standName=object.getString("standEnName");
-//        }
+        }
         String standAllName = "";
         if(object.getString("standYear") != null && !object.getString("standYear").equals("")){
             standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber")) + "-" + verifyObj(object.getString("standYear"));