|
|
@ -657,22 +657,24 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
|
|
|
|
taskDispatchDetailDO.setId(null);
|
|
|
|
taskDispatchDetailDO.setId(null);
|
|
|
|
taskDispatchDetailDO.setOwner(new Long(m.trim()));
|
|
|
|
taskDispatchDetailDO.setOwner(new Long(m.trim()));
|
|
|
|
taskDispatchDetailDO.setDetailOwnerId(owner.getId());
|
|
|
|
taskDispatchDetailDO.setDetailOwnerId(owner.getId());
|
|
|
|
insertDetailList.add(taskDispatchDetailDO);
|
|
|
|
taskDispatchDetailMapper.insert(taskDispatchDetailDO);
|
|
|
|
|
|
|
|
// insertDetailList.add(taskDispatchDetailDO);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
TaskDispatchDetailDO taskDispatchDetailDBO =
|
|
|
|
TaskDispatchDetailDO taskDispatchDetailDBO =
|
|
|
|
detailList.stream().filter(n -> n.getDetailOwnerId().equals(owner.getId()) && n.getOwner().equals(new Long(m.trim())) && n.getProcedureId().equals(owner.getProcedureId())).collect(Collectors.toList()).get(0);
|
|
|
|
detailList.stream().filter(n -> n.getDetailOwnerId().equals(owner.getId()) && n.getOwner().equals(new Long(m.trim())) && n.getProcedureId().equals(owner.getProcedureId())).collect(Collectors.toList()).get(0);
|
|
|
|
|
|
|
|
owner.setProcedureStatus(taskDispatchDetailDBO.getProcedureStatus());
|
|
|
|
TaskDispatchDetailDO taskDispatchDetailDO = BeanUtils.toBean(owner, TaskDispatchDetailDO.class);
|
|
|
|
TaskDispatchDetailDO taskDispatchDetailDO = BeanUtils.toBean(owner, TaskDispatchDetailDO.class);
|
|
|
|
TaskDispatchDetailDO taskDispatchDetailDONew = taskDispatchDetailMapper.selectById(taskDispatchDetailDBO.getId());
|
|
|
|
// TaskDispatchDetailDO taskDispatchDetailDONew = taskDispatchDetailMapper.selectById(taskDispatchDetailDBO.getId());
|
|
|
|
taskDispatchDetailDO.setId(taskDispatchDetailDBO.getId());
|
|
|
|
taskDispatchDetailDO.setId(taskDispatchDetailDBO.getId());
|
|
|
|
taskDispatchDetailDO.setProcedureStatus(taskDispatchDetailDONew.getProcedureStatus());
|
|
|
|
taskDispatchDetailMapper.updateById(taskDispatchDetailDO);
|
|
|
|
updateDetailList.add(taskDispatchDetailDO);
|
|
|
|
// updateDetailList.add(taskDispatchDetailDO);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
if(!insertDetailList.isEmpty()) taskDispatchDetailMapper.insertBatch(insertDetailList);
|
|
|
|
// if(!insertDetailList.isEmpty()) taskDispatchDetailMapper.insertBatch(insertDetailList);
|
|
|
|
if(!updateDetailList.isEmpty()) taskDispatchDetailMapper.updateBatch(updateDetailList);
|
|
|
|
// if(!updateDetailList.isEmpty()) taskDispatchDetailMapper.updateBatch(updateDetailList);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void updateTaskDispatchDetailList(Long dispatchId, List<TaskDispatchDetailOwnerDO> list) {
|
|
|
|
private void updateTaskDispatchDetailList(Long dispatchId, List<TaskDispatchDetailOwnerDO> list) {
|
|
|
|