FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
Superman_Main
2021-11-21 20:36:07 +08:00
parent 39bdc00f57 49e823817b
commit 8f9ac551ff
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java
+5 -1
View File
@@ -63,7 +63,11 @@ public class SelectResponsibleUserAfter implements TaskListener {
}else { }else {
delegateTask.getVariable("responUserLists", List.class).addAll(strings); delegateTask.getVariable("responUserLists", List.class).addAll(strings);
} }
delegateTask.setVariable("datas",map); 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
+9 -11
View File
@@ -40,20 +40,18 @@ public class UploadResearchResultAfter implements TaskListener {
JSONObject os=JSONObject.parseObject(String.valueOf(map.get(responUser))); JSONObject os=JSONObject.parseObject(String.valueOf(map.get(responUser)));
for (int i = 0; i < responUserList.size(); i++) { for (int i = 0; i < responUserList.size(); i++) {
JSONObject obj=responUserList.getJSONObject(i); JSONObject obj=responUserList.getJSONObject(i);
if(obj.getString("id").equals(responUser) 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("responUser", obj.getString("id"));
object.put("responUserName",obj.getString("name")); object.put("responUserName", obj.getString("name"));
obj.put("dyhz",object.getString("dyhz")); obj.put("dyhz", object.getString("dyhz"));
obj.put("fileId",object.getString("fileId")); obj.put("fileId", object.getString("fileId"));
obj.put("fileName",object.getString("fileName")); obj.put("fileName", object.getString("fileName"));
responUserList.set(i,obj); responUserList.set(i, obj);
break; }
}
} }
delegateTask.setVariable("dockUsers",os.getString("dockUser")); delegateTask.setVariable("dockUsers",os.getString("dockUser"));
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java
+3 -1
View File
@@ -49,9 +49,11 @@ public class ResolveAfter implements TaskListener{
} }
// 配置多实例 // 配置多实例
delegateTask.setVariable("zrUserList", nextUserList); delegateTask.setVariable("zrUserList", nextUserList);
//拆分标准 解读中情况下 也展示数据
SarFileSplitInfoEO sarFileSplitInfoEO=new SarFileSplitInfoEO(); SarFileSplitInfoEO sarFileSplitInfoEO=new SarFileSplitInfoEO();
sarFileSplitInfoEO.setSplitStatus("3"); sarFileSplitInfoEO.setSplitStatus("3");
sarFileSplitInfoEO.setStandNameSplit(object.getString("itemsName"));
sarFileSplitInfoEO.setStandNumSplit(object.getString("itemsNum"));
sarFileSplitInfoEO.setId(object.getString("statusId")); sarFileSplitInfoEO.setId(object.getString("statusId"));
delegateTask.setVariable("statusId",object.getString("statusId")); delegateTask.setVariable("statusId",object.getString("statusId"));
lawsUserInfoService.updateSarFileSplitInfo(sarFileSplitInfoEO); lawsUserInfoService.updateSarFileSplitInfo(sarFileSplitInfoEO);