Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java

@@ -46,10 +46,14 @@ public class ChooseZrAfter implements TaskListener{
         String user = object.getString("applyUserId");
         String username = object.getString("applyUserIdName");
         String standName = "";
-        if(object.getString("standInData").equals("0")){
+        if (null == object.getString("standInData")){
-            standName = "国内";
+            standName = "未知";
         }else {
-            standName = "国外";
+            if(object.getString("standInData").equals("INLAND")){
+                standName = "国内";
+            }else {
+                standName = "国外";
+            }
         }
         String prcName = standName+"-标准解读流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();

src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java

@@ -47,10 +47,14 @@ public class DeptApplayAfter implements TaskListener{
         String user = object.getString("applyUserId");
         String username = object.getString("applyUserIdName");
         String standName = "";
-        if(object.getString("standInData").equals("INLAND")){
+        if (null == object.getString("standInData")){
-            standName = "国内";
+            standName = "未知";
         }else {
-            standName = "国外";
+            if(object.getString("standInData").equals("INLAND")){
+                standName = "国内";
+            }else {
+                standName = "国外";
+            }
         }
         String prcName = standName+"-标准解读流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();

src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java

@@ -58,10 +58,14 @@ public class DeptZrAfter implements TaskListener{
         String user = object.getString("applyUserId");
         String username = object.getString("applyUserIdName");
         String standName = "";
-        if(object.getString("standInData").equals("INLAND")){
+        if (null == object.getString("standInData")){
-            standName = "国内";
+            standName = "未知";
         }else {
-            standName = "国外";
+            if(object.getString("standInData").equals("INLAND")){
+                standName = "国内";
+            }else {
+                standName = "国外";
+            }
         }
         String prcName = standName+"-标准解读流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();

src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java

@@ -51,10 +51,14 @@ public class EngineerApplayAfter implements TaskListener{
         String user = object.getString("applyUserId");
         String username = object.getString("applyUserIdName");
         String standName = "";
-        if (object.getString("standInData").equals("INLAND")) {
+        if (null == object.getString("standInData")){
-            standName = "国内";
+            standName = "未知";
-        } else {
+        }else {
-            standName = "国外";
+            if(object.getString("standInData").equals("INLAND")){
+                standName = "国内";
+            }else {
+                standName = "国外";
+            }
         }
         String prcName = standName + "-标准解读流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();

src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java

@@ -42,10 +42,14 @@ public class ExpainAfter implements TaskListener{
         String user = object.getString("applyUserId");
         String username = object.getString("applyUserIdName");
         String standName = "";
-        if(object.getString("standInData").equals("INLAND")){
+        if (null == object.getString("standInData")){
-            standName = "国内";
+            standName = "未知";
         }else {
-            standName = "国外";
+            if(object.getString("standInData").equals("INLAND")){
+                standName = "国内";
+            }else {
+                standName = "国外";
+            }
         }
         String prcName = standName+"-标准解读流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();

src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java

@@ -52,10 +52,14 @@ public class ResolveAfter implements TaskListener{
         String user = object.getString("applyUserId");
         String username = object.getString("applyUserIdName");
         String standName = "";
-        if(object.getString("standInData").equals("INLAND")){
+        if (null == object.getString("standInData")){
-            standName = "国内";
+            standName = "未知";
         }else {
-            standName = "国外";
+            if(object.getString("standInData").equals("INLAND")){
+                standName = "国内";
+            }else {
+                standName = "国外";
+            }
         }
         String prcName = standName+"-标准解读流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();

src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java

@@ -50,10 +50,14 @@ public class ZrApplayAfter implements TaskListener{
         String user = object.getString("applyUserId");
         String username = object.getString("applyUserIdName");
         String standName = "";
-        if(object.getString("standInData").equals("INLAND")){
+        if (null == object.getString("standInData")){
-            standName = "国内";
+            standName = "未知";
         }else {
-            standName = "国外";
+            if(object.getString("standInData").equals("INLAND")){
+                standName = "国内";
+            }else {
+                standName = "国外";
+            }
         }
         String prcName = standName+"-标准解读流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();

src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/CountersignSRPAfter.java

@@ -40,9 +40,9 @@ public class CountersignSRPAfter implements TaskListener{
 
 //        JSONObject array = object.getJSONObject("hqsqForm");
 
-        if(StringUtils.isNotBlank(object.getString("applyUpdUserId"))){
+        if(StringUtils.isNotBlank(delegateTask.getVariable("createUser",String.class))){
-            delegateTask.setVariable("applyUserId",object.getString("applyUpdUserId"));
+            delegateTask.setVariable("applyUserId",delegateTask.getVariable("createUser",String.class));
-            nextUserList.add(object.getString("applyUpdUserId"));
+            nextUserList.add(delegateTask.getVariable("createUser",String.class));
         }else {
             throw new ActivitiException("1#2申请人修订用户不存在,请配置相关人员");
         }

src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPstartAfter.java

@@ -85,7 +85,9 @@ public class SRPstartAfter implements TaskListener {
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("prcCreateUser");
+        delegateTask.setVariable("createUser",user);
         String username = object.getString("prcCreateUserName");
+        delegateTask.setVariable("createUserName",username);
         String standName = object.getString("standName");
         String prcName="";
         if(object.getString("signFlag").equals("1")) {