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

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

Browse Source 
# Conflicts:
#	src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
This commit is contained in:
cuijiaming
2022-12-29 15:08:10 +08:00
parent 3cf81d3a49 bc117884b5
commit bb39e2c541
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
+13
View File
@@ -1799,6 +1799,7 @@ public class TodoTaskController extends BaseAction {
Map<String,JSONObject> msgData =new HashMap<>(); Map<String,JSONObject> msgData =new HashMap<>();
List<String> idData=new ArrayList<>(); List<String> idData=new ArrayList<>();
List<BusProcessNew> listData = iBusProcessNewService.list(q.eq("P_ID", pId)); List<BusProcessNew> listData = iBusProcessNewService.list(q.eq("P_ID", pId));
//取出此任务中所有审核mesg数据
for (BusProcessNew bpn:listData) { for (BusProcessNew bpn:listData) {
String mesg = bpn.getMesg(); String mesg = bpn.getMesg();
JSONObject object = JSONObject.parseObject(mesg); JSONObject object = JSONObject.parseObject(mesg);
@@ -1809,10 +1810,21 @@ public class TodoTaskController extends BaseAction {
msgData.put(bpn.getTaskId(),object); msgData.put(bpn.getTaskId(),object);
} }
} }
//将所有mesg数据进行整合
JSONArray jsonArray=new JSONArray();
JSONArray jsonArray1=new JSONArray(); JSONArray jsonArray1=new JSONArray();
for (String id:idData) { for (String id:idData) {
jsonArray1.addAll(msgData.get(id).getJSONArray("itemList")); jsonArray1.addAll(msgData.get(id).getJSONArray("itemList"));
} }
//将mesg数据进行去重
// for (int i = 0; i < jsonArray.size()-1; i++) {
// for (int j = i+1; j < jsonArray.size(); j++) {
// if(jsonArray.get(i).equals(jsonArray.get(j))){
// jsonArray.remove(j);
// }
// }
// }
//将mesg数据进行排序
Set set = new HashSet(); Set set = new HashSet();
for(int i = 0 ; i<jsonArray1.size();i++){ for(int i = 0 ; i<jsonArray1.size();i++){
@@ -1834,6 +1846,7 @@ public class TodoTaskController extends BaseAction {
} }
if(!f){break;} if(!f){break;}
} }
//后处理
List<String> taskIdList = new ArrayList<>(Arrays.asList(taskIds.split(","))); List<String> taskIdList = new ArrayList<>(Arrays.asList(taskIds.split(",")));
List<BusProcessNew> list = iBusProcessNewService.findNoExecuteBusProcessNewForEnd(taskIdList); List<BusProcessNew> list = iBusProcessNewService.findNoExecuteBusProcessNewForEnd(taskIdList);
if (list.isEmpty()) { if (list.isEmpty()) {