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!60
This commit is contained in:
高嵩
2023-07-28 09:11:11 +00:00
parent 4215ceed6e 2bb2e31db1
commit 5c1aa21967
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5After.java
+6 -3
View File
@@ -34,9 +34,12 @@ public class BussLibrary5After implements TaskListener{
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>(); QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper); queryWrapper.orderByDesc("CREATE_TIME");
List<Datas> datasList = datasService.list(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); if (datasList == null || datasList.isEmpty()) {
throw new ActivitiException("t_datas表中ACTI_TASK_ID为"+delegateTask.getId()+"的数据不存在");
}
JSONObject object = JSONObject.parseObject(datasList.get(0).getFormValsJson());
delegateTask.setVariable("objectJson",object); delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList();
src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2Before.java
+2 -1
View File
@@ -31,7 +31,8 @@ public class Step2Before implements TaskListener {
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("xmpgStep2?prcType=6"); // one1.setLink("xmpgStep2?prcType=6");
one1.setLink("qbzxdlxStep2?proType=26");
one1.setTaskInfo(delegateTask.getName()); one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1); oaService.sendTodoMq(one1);
} }