Merge branch 'develop' into FOTON

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java

@@ -63,7 +63,11 @@ public class SelectResponsibleUserAfter implements TaskListener {
         }else {
             delegateTask.getVariable("responUserLists", List.class).addAll(strings);
         }
+        if (null == delegateTask.getVariable("datas")) {
             delegateTask.setVariable("datas", map);
+        }else {
+            delegateTask.getVariable("datas", Map.class).putAll(map);
+        }
 
 
         //截止时间 流程描述 创建人

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java

@@ -41,8 +41,7 @@ public class UploadResearchResultAfter  implements TaskListener {
         for (int i = 0; i < responUserList.size(); i++) {
             JSONObject obj=responUserList.getJSONObject(i);
                 if (obj.getString("id").equals(responUser)
-                    &&obj.getString("dockUser").equals(os.getString("dockUser"))
+                        && obj.getString("dockUser").equals(os.getString("dockUser"))) {
-            ){
 
                     object.put("responUser", obj.getString("id"));
                     object.put("responUserName", obj.getString("name"));
@@ -52,7 +51,6 @@ public class UploadResearchResultAfter  implements TaskListener {
 
                     responUserList.set(i, obj);
 
-                break;
                 }
         }
 

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

@@ -49,9 +49,11 @@ public class ResolveAfter implements TaskListener{
         }
         // 配置多实例
         delegateTask.setVariable("zrUserList", nextUserList);
-
+        //拆分标准 解读中情况下 也展示数据
         SarFileSplitInfoEO sarFileSplitInfoEO=new SarFileSplitInfoEO();
         sarFileSplitInfoEO.setSplitStatus("3");
+        sarFileSplitInfoEO.setStandNameSplit(object.getString("itemsName"));
+        sarFileSplitInfoEO.setStandNumSplit(object.getString("itemsNum"));
         sarFileSplitInfoEO.setId(object.getString("statusId"));
         delegateTask.setVariable("statusId",object.getString("statusId"));
         lawsUserInfoService.updateSarFileSplitInfo(sarFileSplitInfoEO);