Commit 5406cbfa authored by chenzhao's avatar chenzhao

修改待办驳回逻辑

parent 96c16166
...@@ -615,6 +615,7 @@ public class CommonServiceImpl implements ICommonService { ...@@ -615,6 +615,7 @@ public class CommonServiceImpl implements ICommonService {
public void buildTaskModel(List<TaskModelDto> list) { public void buildTaskModel(List<TaskModelDto> list) {
list.forEach(obj -> { list.forEach(obj -> {
TaskV2Model model = new TaskV2Model(); TaskV2Model model = new TaskV2Model();
BeanUtil.copyProperties(obj, model);
String urlParams = ""; String urlParams = "";
try { try {
urlParams = "&" + toQueryParams(obj.getModel()); urlParams = "&" + toQueryParams(obj.getModel());
...@@ -627,14 +628,14 @@ public class CommonServiceImpl implements ICommonService { ...@@ -627,14 +628,14 @@ public class CommonServiceImpl implements ICommonService {
model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getNextExecuteUser()).replace("{userId}", RequestContext.getExeUserId()) + urlParams); model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getNextExecuteUser()).replace("{userId}", RequestContext.getExeUserId()) + urlParams);
} }
} }
model.setFlowStatus(obj.getTaskStatus());
model.setFlowCode(obj.getTaskStatusLabel());
model.setRoutePath(obj.getRoutePath() + urlParams); model.setRoutePath(obj.getRoutePath() + urlParams);
BeanUtil.copyProperties(obj, model); model.setTaskType("0");
model.setFlowStatus(0);
model.setFlowInstanceId(model.getRelationId()); model.setFlowInstanceId(model.getRelationId());
model.setTaskTitle(obj.getStartUser() + "发起了" + obj.getTaskName()); model.setTaskTitle(obj.getStartUser() + "发起了" + obj.getTaskName());
model.setTaskSource("workFlow"); model.setTaskSource("workFlow");
model.setExtras(JSON.toJSONString(obj.getModel())); model.setExtras(JSON.toJSONString(obj.getModel()));
// model.setTerminal(params.getOrDefault("terminal","WEB").toString());
model.setCreateDate(new Date()); model.setCreateDate(new Date());
model.setRecUserId(RequestContext.getExeUserId()); model.setRecUserId(RequestContext.getExeUserId());
model.setAgencyCode(RequestContext.getAgencyCode()); model.setAgencyCode(RequestContext.getAgencyCode());
...@@ -686,12 +687,14 @@ public class CommonServiceImpl implements ICommonService { ...@@ -686,12 +687,14 @@ public class CommonServiceImpl implements ICommonService {
List<TaskV2Model> list = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList()); List<TaskV2Model> list = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
TaskV2Model model = list.get(0); TaskV2Model model = list.get(0);
Systemctl.taskV2Client.delete(String.valueOf(model.getSequenceNbr())); Systemctl.taskV2Client.delete(String.valueOf(model.getSequenceNbr()));
TaskV2Model lastTaskModel = list.get(1); if (list.size()>1){
lastTaskModel.setEndUserId(null); TaskV2Model lastTaskModel = list.get(1);
lastTaskModel.setEndDate(null); lastTaskModel.setEndUserId(null);
lastTaskModel.setFlowStatus(0); lastTaskModel.setEndDate(null);
lastTaskModel.setRoutePath(model.getRoutePath().replace("role", "roleIds").replace("look", "edit")); lastTaskModel.setFlowStatus(0);
Systemctl.taskV2Client.update(lastTaskModel, lastTaskModel.getSequenceNbr()); lastTaskModel.setRoutePath(model.getRoutePath().replace("role", "roleIds").replace("look", "edit"));
Systemctl.taskV2Client.update(lastTaskModel, lastTaskModel.getSequenceNbr());
}
} }
public <T> String toQueryParams(T obj) throws UnsupportedEncodingException { public <T> String toQueryParams(T obj) throws UnsupportedEncodingException {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment