feat: 添加流程节点状态,是否已接收
This commit is contained in:
@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.business_activiti.task;
|
|||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
|
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
|
||||||
import com.ydw.bat.wkflow.business_main.datas.entity.*;
|
import com.ydw.bat.wkflow.business_main.datas.entity.*;
|
||||||
@@ -176,6 +177,25 @@ public class TaskController {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
// 将节点完成状态添加到返回的Map集合中
|
||||||
|
for (Map<String, Object> historyTaskMap : list) {
|
||||||
|
String processInstanceId = (String) historyTaskMap.get("processInstanceId");
|
||||||
|
if (StringUtils.isBlank(processInstanceId)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
// 查询节点完成状态
|
||||||
|
LambdaQueryWrapper<BusProcessNew> wrapper = new LambdaQueryWrapper<>();
|
||||||
|
wrapper.eq(BusProcessNew::getPId, processInstanceId);
|
||||||
|
wrapper.isNotNull(BusProcessNew::getTaskId);
|
||||||
|
wrapper.eq(BusProcessNew::getReceiveStatus,"已接收");
|
||||||
|
wrapper.select(BusProcessNew::getTaskId, BusProcessNew::getReceiveStatus);
|
||||||
|
List<BusProcessNew> busProcessNewList = iBusProcessNewService.list(wrapper);
|
||||||
|
for (BusProcessNew busProcessNew : busProcessNewList) {
|
||||||
|
if (busProcessNew.getTaskId().equals(historyTaskMap.get("id"))) {
|
||||||
|
historyTaskMap.put("receiveStatus",busProcessNew.getReceiveStatus());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
@ApiOperation(value = "流程实例汇总列表")
|
@ApiOperation(value = "流程实例汇总列表")
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import java.util.*;
|
|||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
import com.alibaba.fastjson.serializer.SerializerFeature;
|
import com.alibaba.fastjson.serializer.SerializerFeature;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||||
import com.tmsps.fk.common.util.JsonUtil;
|
import com.tmsps.fk.common.util.JsonUtil;
|
||||||
import com.ydw.bat.wkflow.business_activiti.dto.*;
|
import com.ydw.bat.wkflow.business_activiti.dto.*;
|
||||||
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
|
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
|
||||||
@@ -762,6 +763,11 @@ public class TodoTaskController extends BaseAction {
|
|||||||
wrapper.eq("EXEC_STATUS",0);
|
wrapper.eq("EXEC_STATUS",0);
|
||||||
long count = oaTaskExecService.count(wrapper);
|
long count = oaTaskExecService.count(wrapper);
|
||||||
processNew.setCommitStatus(count);
|
processNew.setCommitStatus(count);
|
||||||
|
// 设置processNew表流程状态为已接收
|
||||||
|
LambdaUpdateWrapper<BusProcessNew> updateWrapper = new LambdaUpdateWrapper<>();
|
||||||
|
updateWrapper.in(BusProcessNew::getTaskId,taskIdList);
|
||||||
|
updateWrapper.set(BusProcessNew::getReceiveStatus,"已接收");
|
||||||
|
iBusProcessNewService.update(updateWrapper);
|
||||||
return processNew;
|
return processNew;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -120,4 +120,9 @@ public class BusProcessNew implements Serializable {
|
|||||||
@TableField( exist = false)
|
@TableField( exist = false)
|
||||||
@ApiModelProperty(value = "当前节点信息")
|
@ApiModelProperty(value = "当前节点信息")
|
||||||
private String nowTaskInfo;
|
private String nowTaskInfo;
|
||||||
|
|
||||||
|
@TableField("RECEIVE_STATUS")
|
||||||
|
@ApiModelProperty("接收状态")
|
||||||
|
private String receiveStatus;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user