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

Merge branch 'fix_foton_20230613' into 'master'

Browse Source 
Fix foton 20230613

See merge request laws-foton-slrs/foton-wkflow-rest!63
This commit is contained in:
王晓勇
2023-08-22 06:39:20 +00:00
parent ef7a55ae78 9978902345
commit 400bc91310
1 changed files with 37 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/quizOrAnswer/quizAfter.java
+37 -68
View File
@@ -1,6 +1,8 @@
package com.ydw.bat.wkflow.listener.quizOrAnswer; package com.ydw.bat.wkflow.listener.quizOrAnswer;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.BusProcessName;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; 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.DelegateTask;
import org.activiti.engine.delegate.TaskListener; import org.activiti.engine.delegate.TaskListener;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
// 问答中心 问 后 // 问答中心 问 后
public class quizAfter implements TaskListener { public class quizAfter implements TaskListener {
@@ -33,42 +32,32 @@ public class quizAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object); delegateTask.setVariable("objectJson",object);
String[] split = object.getString("questioner").substring(1, object.getString("questioner").length() - 1).split(","); HashMap<String, Object> map = JSON.parseObject(datas.getFormValsJson(), new TypeReference<HashMap<String, Object>>(){});
List<String> nextUserList = Arrays.asList(split); // 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 user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName"); String username = object.getString("prcCreateUserName");
String[] split1 = object.getString("askQuestions").substring(1, object.getString("askQuestions").length() - 2).split(","); // String[] split1 = object.getString("askQuestions").substring(1, object.getString("askQuestions").length() - 2).split(",");
List<String> asList = Arrays.asList(split1); // List<String> asList = Arrays.asList(split1);
String str = ""; Map asMap = (Map) map.get("askQuestions");
String bzstr = ""; String bzstr = (String) asMap.get("standardEncdoing");
if(asList.size()==8) { String str = (String) asMap.get("problemDescription");
for (int i = 0; i < asList.size(); i++) { // for (int i = 0; i <asList.size() ; i++) {
if (i == 0) { // if(i==1){
String[] split2 = asList.get(i).split(":"); // String[] split2 = asList.get(i).split(":");
str = split2[1].substring(1, split2[1].length() - 1); // str = split2[1].substring(1, split2[1].length() -1);
} // }
if (i == 5) { // if(i==6){
String[] split2 = asList.get(i).split(":"); // String[] split2 = asList.get(i).split(":");
bzstr = split2[1].substring(1, split2[1].length() - 1); // 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 prcName = bzstr+"-("+str+")-问答流程"; String prcName = bzstr+"-("+str+")-问答流程";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){ if(one1!=null){
@@ -92,40 +81,20 @@ public class quizAfter implements TaskListener {
busBean.save(busProcessNew); busBean.save(busProcessNew);
List<String> objects = new ArrayList<>(); List<String> objects = new ArrayList<>();
if(nextUserList != null && !nextUserList.isEmpty()){ if(nextUserList != null && !nextUserList.isEmpty()){
if(nextUserList.size()==1){ for (Object nextUser : nextUserList) {
for (String nextUser : nextUserList) { BusProcessNew busProcessNewNext = new BusProcessNew();
BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause");
busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setTaskInfo(delegateTask.getName()); String questioner = String.valueOf(nextUser);
//切割引号 busProcessNewNext.setUserId(questioner);
String questioner = nextUser.substring(1); objects.add(questioner);
busProcessNewNext.setUserId(questioner); busProcessNewNext.setPrcName(prcName);
objects.add(questioner); busBean.save(busProcessNewNext);
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);
}
} }
delegateTask.setVariable("questionerList",objects);
} }
delegateTask.setVariable("questionerList",objects);
} }
} }