Merge branch 'fix_foton_20230613' into 'master'
Fix foton 20230613 See merge request laws-foton-slrs/foton-wkflow-rest!63
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
package com.ydw.bat.wkflow.listener.quizOrAnswer;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.alibaba.fastjson.TypeReference;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
@@ -13,10 +15,7 @@ import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.*;
|
||||
|
||||
// 问答中心 问 后
|
||||
public class quizAfter implements TaskListener {
|
||||
@@ -33,42 +32,32 @@ public class quizAfter implements TaskListener {
|
||||
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
||||
delegateTask.setVariable("objectJson",object);
|
||||
|
||||
String[] split = object.getString("questioner").substring(1, object.getString("questioner").length() - 1).split(",");
|
||||
List<String> nextUserList = Arrays.asList(split);
|
||||
|
||||
HashMap<String, Object> map = JSON.parseObject(datas.getFormValsJson(), new TypeReference<HashMap<String, Object>>(){});
|
||||
// String[] split = object.getString("questioner").substring(1, object.getString("questioner").length() - 1).split(",");
|
||||
// List<String> nextUserList = Arrays.asList(split);
|
||||
List nextUserList = (List) map.get("questioner");
|
||||
//截止时间 流程描述 创建人
|
||||
String user = object.getString("prcCreateUser");
|
||||
String username = object.getString("prcCreateUserName");
|
||||
|
||||
String[] split1 = object.getString("askQuestions").substring(1, object.getString("askQuestions").length() - 2).split(",");
|
||||
List<String> asList = Arrays.asList(split1);
|
||||
String str = "";
|
||||
String bzstr = "";
|
||||
if(asList.size()==8) {
|
||||
for (int i = 0; i < asList.size(); i++) {
|
||||
if (i == 0) {
|
||||
String[] split2 = asList.get(i).split(":");
|
||||
str = split2[1].substring(1, split2[1].length() - 1);
|
||||
}
|
||||
if (i == 5) {
|
||||
String[] split2 = asList.get(i).split(":");
|
||||
bzstr = split2[1].substring(1, split2[1].length() - 1);
|
||||
}
|
||||
}
|
||||
}else {
|
||||
for (int i = 0; i < asList.size(); i++) {
|
||||
if (i == 1) {
|
||||
String[] split2 = asList.get(i).split(":");
|
||||
str = split2[1].substring(1, split2[1].length() - 1);
|
||||
}
|
||||
if (i == 6) {
|
||||
String[] split2 = asList.get(i).split(":");
|
||||
bzstr = split2[1].substring(1, split2[1].length() - 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
// String[] split1 = object.getString("askQuestions").substring(1, object.getString("askQuestions").length() - 2).split(",");
|
||||
// List<String> asList = Arrays.asList(split1);
|
||||
Map asMap = (Map) map.get("askQuestions");
|
||||
String bzstr = (String) asMap.get("standardEncdoing");
|
||||
String str = (String) asMap.get("problemDescription");
|
||||
// for (int i = 0; i <asList.size() ; i++) {
|
||||
// if(i==1){
|
||||
// String[] split2 = asList.get(i).split(":");
|
||||
// str = split2[1].substring(1, split2[1].length() -1);
|
||||
// }
|
||||
// if(i==6){
|
||||
// String[] split2 = asList.get(i).split(":");
|
||||
// bzstr = split2[1].substring(1, split2[1].length() -1);
|
||||
// }
|
||||
// }
|
||||
|
||||
String prcName = bzstr+"-("+str+")-问答流程";
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
|
||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||
if(one1!=null){
|
||||
@@ -92,40 +81,20 @@ public class quizAfter implements TaskListener {
|
||||
busBean.save(busProcessNew);
|
||||
List<String> objects = new ArrayList<>();
|
||||
if(nextUserList != null && !nextUserList.isEmpty()){
|
||||
if(nextUserList.size()==1){
|
||||
for (String nextUser : nextUserList) {
|
||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||
busProcessNewNext.setMsgType("clause");
|
||||
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNewNext.setMesg(object.toJSONString());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
//切割引号
|
||||
String questioner = nextUser.substring(1);
|
||||
busProcessNewNext.setUserId(questioner);
|
||||
objects.add(questioner);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
}else {
|
||||
for (String nextUser : nextUserList) {
|
||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||
busProcessNewNext.setMsgType("clause");
|
||||
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNewNext.setMesg(object.toJSONString());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
//切割引号
|
||||
String questioner = nextUser.substring(1, nextUser.length() - 1);
|
||||
busProcessNewNext.setUserId(questioner);
|
||||
objects.add(questioner);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
for (Object nextUser : nextUserList) {
|
||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||
busProcessNewNext.setMsgType("clause");
|
||||
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNewNext.setMesg(object.toJSONString());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
String questioner = String.valueOf(nextUser);
|
||||
busProcessNewNext.setUserId(questioner);
|
||||
objects.add(questioner);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
|
||||
delegateTask.setVariable("questionerList",objects);
|
||||
}
|
||||
|
||||
delegateTask.setVariable("questionerList",objects);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user