Commit d7e2e3a8 authored by suhuiguang's avatar suhuiguang

1.修改工作台分布式环境下错乱问题

parent f5152639
...@@ -1487,8 +1487,8 @@ public class CommonServiceImpl implements ICommonService { ...@@ -1487,8 +1487,8 @@ public class CommonServiceImpl implements ICommonService {
**/ **/
public TaskV2Model updateTaskModel(Map<String, Object> params) { public TaskV2Model updateTaskModel(Map<String, Object> params) {
String exeUserId = RequestContext.getExeUserId(); String exeUserId = RequestContext.getExeUserId();
List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(params.get("relationId").toString()).getResult(); // 平台接口已调整 按照创建时间倒叙排列
List<TaskV2Model> collect = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList()); List<TaskV2Model> collect = taskV2FeignService.selectListByRelationId(params.get("relationId").toString()).getResult();
if (collect.isEmpty()) { if (collect.isEmpty()) {
return null; return null;
...@@ -1554,13 +1554,9 @@ public class CommonServiceImpl implements ICommonService { ...@@ -1554,13 +1554,9 @@ public class CommonServiceImpl implements ICommonService {
**/ **/
public TaskV2Model updateTaskModelNew(Map<String, Object> params) { public TaskV2Model updateTaskModelNew(Map<String, Object> params) {
String exeUserId = RequestContext.getExeUserId(); String exeUserId = RequestContext.getExeUserId();
List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(params.get("relationId").toString()).getResult(); // 平台接口已调整 按照创建时间倒叙排列
List<TaskV2Model> collect = taskV2FeignService.selectListByRelationId(params.get("relationId").toString()).getResult();
// TaskV2Model model = result.stream().filter(e->e.getFlowCode().equals(params.get("flowCode").toString())).sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r2.getSequenceNbr())) // 按时间降序排序 if (null == collect || collect.isEmpty()) {
// .findFirst()
// .orElse(null);
List<TaskV2Model> collect = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
if (null == collect || collect.size() == 0) {
TaskV2Model model = new TaskV2Model(); TaskV2Model model = new TaskV2Model();
model.setFlowStatus(Integer.valueOf(params.get("flowStatus").toString())); model.setFlowStatus(Integer.valueOf(params.get("flowStatus").toString()));
model.setFlowStatusLabel(params.get("flowStatusLabel").toString()); model.setFlowStatusLabel(params.get("flowStatusLabel").toString());
......
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