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

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

Browse Source
This commit is contained in:
yuezhihang
2021-07-30 17:50:40 +08:00
parent f004cc5940 f6cd582510
commit 9ff39821ea
9 changed files with 69 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java
+16 -9
View File
@@ -57,6 +57,9 @@ public class SelectResponsibleUserAfter implements TaskListener {
JSONArray userListJson= JSON.parseArray(delegateTask.getVariable("responUserListInfo",String.class)); JSONArray userListJson= JSON.parseArray(delegateTask.getVariable("responUserListInfo",String.class));
if(userListJson==null)userListJson=new JSONArray(); if(userListJson==null)userListJson=new JSONArray();
List<String> strings=new ArrayList<>();
Map<String,JSONObject> map=new HashMap<>();
for (int i = 0; i < responUserList.size()&&i<responUserListName.size(); i++) { for (int i = 0; i < responUserList.size()&&i<responUserListName.size(); i++) {
JSONObject json=new JSONObject(); JSONObject json=new JSONObject();
json.put("id",responUserList.get(i)); json.put("id",responUserList.get(i));
@@ -64,6 +67,8 @@ public class SelectResponsibleUserAfter implements TaskListener {
json.put("dockUser",delegateTask.getAssignee()); json.put("dockUser",delegateTask.getAssignee());
json.put("info",new JSONArray()); json.put("info",new JSONArray());
userListJson.add(json); userListJson.add(json);
strings.add(responUserList.get(i));
map.put(responUserList.get(i),json);
} }
delegateTask.setVariable("responUserListInfo",userListJson.toJSONString()); delegateTask.setVariable("responUserListInfo",userListJson.toJSONString());
@@ -114,26 +119,28 @@ public class SelectResponsibleUserAfter implements TaskListener {
if(selectResponCompletedCount>=dockUserList.size()){ if(selectResponCompletedCount>=dockUserList.size()){
Collection<Object> values = userListJson; // Collection<Object> values = userListJson;
Collection<Map<String,Object>> respon=new ArrayList<>(); // Collection<Map<String,Object>> respon=new ArrayList<>();
for (Object value : values) { // for (Object value : values) {
respon.add(((JSONObject)value).getInnerMap()); // respon.add(((JSONObject)value).getInnerMap());
} // }
delegateTask.setVariable("zqazqazqaUserList",respon); delegateTask.setVariable("zqazqazqaUserList",strings);
delegateTask.setVariable("datas",map);
if(nextUserList != null && !nextUserList.isEmpty()){ if(nextUserList != null && !nextUserList.isEmpty()){
List<BusProcessNew> busProcessNews=new ArrayList<>(); List<BusProcessNew> busProcessNews=new ArrayList<>();
for(Map<String,Object> zqa : respon){ for(String zqa : strings){
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause"); busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
object.put("dockUser",(String)zqa.get("dockUser")); // object.put("dockUser",(String)zqa.get("dockUser"));
object.put("dockUser",map.get(zqa).getString("dockUser"));
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId((String) zqa.get("id")); busProcessNewNext.setUserId(map.get(zqa).getString("id"));
busProcessNews.add(busProcessNewNext); busProcessNews.add(busProcessNewNext);
} }
busBean.saveBatch(busProcessNews); busBean.saveBatch(busProcessNews);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java
+3 -3
View File
@@ -35,7 +35,6 @@ public class UploadResearchResultAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
JSONArray responUserListInfo = JSON.parseArray(delegateTask.getVariable("responUserListInfo", String.class)); JSONArray responUserListInfo = JSON.parseArray(delegateTask.getVariable("responUserListInfo", String.class));
for (int i=0;i<responUserListInfo.size();i++) { for (int i=0;i<responUserListInfo.size();i++) {
JSONObject jsonObject= (JSONObject) responUserListInfo.get(i); JSONObject jsonObject= (JSONObject) responUserListInfo.get(i);
@@ -61,8 +60,9 @@ public class UploadResearchResultAfter implements TaskListener {
delegateTask.setVariable("objectJson",object); delegateTask.setVariable("objectJson",object);
JSONObject jsonObject=JSONObject.parseObject(String.valueOf(delegateTask.getVariable("datas", Map.class).get(delegateTask.getVariable("responUser"))));
delegateTask.setVariable("dockUser",jsonObject.get("dockUser"));
nextUserList.add(String.valueOf(jsonObject.get("dockUser")));
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("startUser"); String user = object.getString("startUser");
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java
+7 -3
View File
@@ -46,10 +46,14 @@ public class ChooseZrAfter implements TaskListener{
String user = object.getString("applyUserId"); String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName"); String username = object.getString("applyUserIdName");
String standName = ""; String standName = "";
if(object.getString("standInData").equals("0")){ if (null == object.getString("standInData")){
standName = "国内"; standName = "未知";
}else { }else {
standName = "国外"; if(object.getString("standInData").equals("INLAND")){
standName = "国内";
}else {
standName = "国外";
}
} }
String prcName = standName+"-标准解读流程"; String prcName = standName+"-标准解读流程";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java
+7 -3
View File
@@ -47,10 +47,14 @@ public class DeptApplayAfter implements TaskListener{
String user = object.getString("applyUserId"); String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName"); String username = object.getString("applyUserIdName");
String standName = ""; 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+"-标准解读流程"; String prcName = standName+"-标准解读流程";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java
+7 -3
View File
@@ -58,10 +58,14 @@ public class DeptZrAfter implements TaskListener{
String user = object.getString("applyUserId"); String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName"); String username = object.getString("applyUserIdName");
String standName = ""; 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+"-标准解读流程"; String prcName = standName+"-标准解读流程";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java
+8 -4
View File
@@ -51,10 +51,14 @@ public class EngineerApplayAfter implements TaskListener{
String user = object.getString("applyUserId"); String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName"); String username = object.getString("applyUserIdName");
String standName = ""; 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 + "-标准解读流程"; String prcName = standName + "-标准解读流程";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java
+7 -3
View File
@@ -42,10 +42,14 @@ public class ExpainAfter implements TaskListener{
String user = object.getString("applyUserId"); String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName"); String username = object.getString("applyUserIdName");
String standName = ""; 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+"-标准解读流程"; String prcName = standName+"-标准解读流程";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java
+7 -3
View File
@@ -52,10 +52,14 @@ public class ResolveAfter implements TaskListener{
String user = object.getString("applyUserId"); String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName"); String username = object.getString("applyUserIdName");
String standName = ""; 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+"-标准解读流程"; String prcName = standName+"-标准解读流程";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java
+7 -3
View File
@@ -50,10 +50,14 @@ public class ZrApplayAfter implements TaskListener{
String user = object.getString("applyUserId"); String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName"); String username = object.getString("applyUserIdName");
String standName = ""; 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+"-标准解读流程"; String prcName = standName+"-标准解读流程";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();