|
|
|
@ -496,7 +496,8 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
|
|
|
|
|
}*/
|
|
|
|
|
break;
|
|
|
|
|
case FINISH:
|
|
|
|
|
List<TaskDispatchDetailDO> taskDispatchDetailDOS = taskDispatchDetailMapper.selectList(TaskDispatchDetailDO::getDetailOwnerId,taskDispatchDetailDO.getDetailOwnerId());
|
|
|
|
|
List<TaskDispatchDetailDO> taskDispatchDetailDOS =
|
|
|
|
|
taskDispatchDetailMapper.selectList(TaskDispatchDetailDO::getDetailOwnerId,taskDispatchDetailDO.getDetailOwnerId());
|
|
|
|
|
taskDispatchDetailDOS.forEach(uo->{
|
|
|
|
|
uo.setProcedureStatus(TaskDispatchProcedureStatusEnum.COMPLETED.getCode());
|
|
|
|
|
taskDispatchDetailMapper.updateById(uo);
|
|
|
|
@ -657,9 +658,9 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
|
|
|
|
|
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);
|
|
|
|
|
TaskDispatchDetailDO taskDispatchDetailDO = BeanUtils.toBean(owner, TaskDispatchDetailDO.class);
|
|
|
|
|
|
|
|
|
|
TaskDispatchDetailDO taskDispatchDetailDONew = taskDispatchDetailMapper.selectById(taskDispatchDetailDBO.getId());
|
|
|
|
|
taskDispatchDetailDO.setId(taskDispatchDetailDBO.getId());
|
|
|
|
|
// taskDispatchDetailDO.setProcedureStatus(taskDispatchDetailDBO.getProcedureStatus());
|
|
|
|
|
taskDispatchDetailDO.setProcedureStatus(taskDispatchDetailDONew.getProcedureStatus());
|
|
|
|
|
updateDetailList.add(taskDispatchDetailDO);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|