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-10-13 21:12:24 +08:00
parent fa7e3353de 75f0a6156e
commit f33b4f8f20
11 changed files with 105 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IOaTaskExecService.java
+1
View File
@@ -17,4 +17,5 @@ public interface IOaTaskExecService extends IService<OaTaskExec> {
Map<String,Object> execTask(String todoId);
String endTime(String pId);
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/OaTaskExecServiceImpl.java
+29
View File
@@ -1,7 +1,11 @@
package com.ydw.bat.wkflow.business_main.datas.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import org.activiti.engine.HistoryService;
import org.activiti.engine.TaskService;
import org.activiti.engine.history.HistoricTaskInstance;
import org.activiti.engine.history.HistoricTaskInstanceQuery;
import org.activiti.engine.impl.persistence.entity.TaskEntity;
import org.activiti.engine.task.Task;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -43,6 +47,31 @@ public class OaTaskExecServiceImpl extends ServiceImpl<OaTaskExecMapper, OaTaskE
@Autowired
private TaskService taskService;
@Autowired
private HistoryService historyService;
@Autowired
private IBusProcessNewService iBusProcessNewService;
@Override
public String endTime(String pId){
String endTime = "";
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
.processInstanceId(pId).orderByTaskCreateTime().asc();
List<HistoricTaskInstance> list = historicTaskInstanceQuery.list();
if(!list.isEmpty()){
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("TASK_ID",list.get(0).getId());
queryWrapper1.eq("P_ID",pId);
List<BusProcessNew> processNews = iBusProcessNewService.list(queryWrapper1);
if(!processNews.isEmpty()){
JSONObject object = JSONObject.parseObject(processNews.get(0).getMesg());
endTime = object.getString("endTime");
}
}
return endTime;
}
@Override
public Map<String,Object> execTask(String todoId){
Map<String,Object> map = new TreeMap<>();