From 7e6ff8c0856f73f28b2fed255e3638dad20bedf3 Mon Sep 17 00:00:00 2001
From: skumardfe <Santhosh.KUMAR@education.gov.uk>
Date: Wed, 24 Jun 2026 16:33:44 +0100
Subject: [PATCH 1/7] implment oltd for withdrwan apprenticeship

---
 .../OuterApi/OuterApiServiceTest.cs           | 23 +++++
 ...rainingDateRequestControllerTestFixture.cs | 51 +++++++---
 ...enIGetDraftApprenticeshipOverlapOptions.cs | 16 ++++
 ...WhenIGetOverlapOptionsForChangeEmployer.cs | 11 ++-
 ...orChangeEmployerViewModelValidatorTests.cs | 17 ++--
 ...verlappingTrainingDateRequestController.cs | 96 ++++++++++++-------
 ...aftApprenticeshipOverlapOptionViewModel.cs |  9 +-
 ...ticeshipOverlapOptionViewModelValidator.cs |  4 +-
 ...ionsForChangeEmployerViewModelValidator.cs |  8 +-
 .../DraftApprenticeshipOverlapOptions.cshtml  | 68 ++-----------
 .../OverlapOptionsForChangeEmployer.cshtml    | 68 ++-----------
 ...eEmployerOverlapIlrWithdrawnPartial.cshtml | 51 ++++++++++
 ...ApprenticeshipOverlapOptionsPartial.cshtml | 63 ++++++++++++
 .../Shared/_OverlapIlrWithdrawnPartial.cshtml | 57 +++++++++++
 ...rlapOptionsForChangeEmployerPartial.cshtml | 71 ++++++++++++++
 .../OuterApi/IOuterApiService.cs              | 39 +++++++-
 .../OuterApi/OuterApiService.cs               | 12 ++-
 .../Apprentices/GetApprenticeshipRequest.cs   | 15 +++
 .../Responses/GetApprenticeshipResponse.cs    | 68 +++++++++++++
 ...lappingApprenticeshipDetailsQueryResult.cs |  3 +-
 20 files changed, 559 insertions(+), 191 deletions(-)
 create mode 100644 src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_ChangeEmployerOverlapIlrWithdrawnPartial.cshtml
 create mode 100644 src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_DraftApprenticeshipOverlapOptionsPartial.cshtml
 create mode 100644 src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_OverlapIlrWithdrawnPartial.cshtml
 create mode 100644 src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_OverlapOptionsForChangeEmployerPartial.cshtml
 create mode 100644 src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Requests/Apprentices/GetApprenticeshipRequest.cs
 create mode 100644 src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Responses/GetApprenticeshipResponse.cs

diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.UnitTests/Infrastructure/OuterApi/OuterApiServiceTest.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.UnitTests/Infrastructure/OuterApi/OuterApiServiceTest.cs
index 73c702ce3..eff2da471 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.UnitTests/Infrastructure/OuterApi/OuterApiServiceTest.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.UnitTests/Infrastructure/OuterApi/OuterApiServiceTest.cs
@@ -4,6 +4,7 @@
 using Moq;
 using NUnit.Framework;
 using SFA.DAS.ProviderCommitments.Infrastructure.OuterApi;
+using SFA.DAS.ProviderCommitments.Infrastructure.OuterApi.Requests.Apprentices;
 using SFA.DAS.ProviderCommitments.Infrastructure.OuterApi.Requests.Authorization;
 using SFA.DAS.ProviderCommitments.Infrastructure.OuterApi.Requests.DraftApprenticeships;
 using SFA.DAS.ProviderCommitments.Infrastructure.OuterApi.Requests.Provider;
@@ -123,4 +124,26 @@ public async Task Then_SyncLearnerData_Request_Is_Made_And_Response_Returned(
         actual.Success.Should().Be(apiResponse.Success);
         actual.Message.Should().Be(apiResponse.Message);
     }
+
+    [Test, MoqAutoData]
+    public async Task Then_The_Request_Is_Made_And_GetApprenticeshipResponse_Returned(
+       long apprenticeshipId,
+       long provideId,
+       GetApprenticeshipResponse apiResponse,
+       [Frozen] Mock<IOuterApiClient> apiClient,
+       OuterApiService service)
+    {
+        //Arrange
+        var request = new GetApprenticeshipRequest(apprenticeshipId,provideId);
+        apiClient.Setup(x =>
+                x.Get<GetApprenticeshipResponse>(
+                    It.Is<GetApprenticeshipRequest>(c => c.GetUrl.Equals(request.GetUrl))))
+            .ReturnsAsync(apiResponse);
+
+        //Act
+        var actual = await service.GetApprenticeship(apprenticeshipId,provideId);
+
+        //Assert
+        actual.Should().Be(apiResponse);
+    }
 }
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/OverlappingTrainingDateRequestControllerTestFixture.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/OverlappingTrainingDateRequestControllerTestFixture.cs
index 14c4ae89a..11d032085 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/OverlappingTrainingDateRequestControllerTestFixture.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/OverlappingTrainingDateRequestControllerTestFixture.cs
@@ -34,7 +34,7 @@ public class OverlappingTrainingDateRequestControllerTestFixture
         private readonly DraftApprenticeshipOverlapOptionRequest _draftApprenticeshipOverlapOptionRequest;
         private readonly OverlapOptionsForChangeEmployerRequest _overlapOptionsForChangeEmployerRequest;
         private GetApprenticeshipResponse _apprenticeshipDetails;
-        
+
         private readonly DraftApprenticeshipOverlapOptionWithPendingRequest _overlapRequest;
         private readonly DraftApprenticeshipOverlapOptionWithPendingRequestViewModel _overlapViewModel;
 
@@ -47,26 +47,32 @@ public class OverlappingTrainingDateRequestControllerTestFixture
         private readonly DraftApprenticeshipOverlapAlertRequest _draftApprenticeshipOverlapAlertRequest;
         private readonly UpdateDraftApprenticeshipApimRequest _updateDraftApprenticeshipRequest;
 
+        private readonly Infrastructure.OuterApi.Responses.GetApprenticeshipResponse _getApprenticeshipResponse;
+
         public OverlappingTrainingDateRequestControllerTestFixture()
         {
             _autoFixture = new Fixture();
             _mockModelMapper = new Mock<IModelMapper>();
-            
+
             var linkGenerator = new Mock<ILinkGenerator>();
 
+            var providerId = _autoFixture.Create<long>();
+            var apprenticeShipId = _autoFixture.Create<long>();
+
             _draftApprenticeshipOverlapAlertRequest = _autoFixture.Create<DraftApprenticeshipOverlapAlertRequest>();
             _updateDraftApprenticeshipRequest = _autoFixture.Create<UpdateDraftApprenticeshipApimRequest>();
+            _getApprenticeshipResponse = _autoFixture.Create<Infrastructure.OuterApi.Responses.GetApprenticeshipResponse>();
 
             _model = new DraftApprenticeshipViewModel
             {
-                ProviderId = _autoFixture.Create<int>(),
+                ProviderId = providerId,
                 EmployerAccountLegalEntityPublicHashedId = _autoFixture.Create<string>(),
                 AccountLegalEntityId = _autoFixture.Create<long>(),
                 ReservationId = _autoFixture.Create<Guid>()
             };
 
-            _draftApprenticeshipOverlapOptionRequest = new DraftApprenticeshipOverlapOptionRequest() { DraftApprenticeshipHashedId = "XXXXX", ApprenticeshipId = 1 };
-            _overlapOptionsForChangeEmployerRequest = new OverlapOptionsForChangeEmployerRequest { ProviderId = 2, ApprenticeshipId = 1, CacheKey = Guid.NewGuid() };
+            _draftApprenticeshipOverlapOptionRequest = new DraftApprenticeshipOverlapOptionRequest() { DraftApprenticeshipHashedId = "XXXXX", ApprenticeshipId = apprenticeShipId, ProviderId = providerId };
+            _overlapOptionsForChangeEmployerRequest = new OverlapOptionsForChangeEmployerRequest { ProviderId = providerId, ApprenticeshipId = apprenticeShipId, CacheKey = Guid.NewGuid() };
 
             _tempData = new Mock<ITempDataDictionary>();
 
@@ -104,7 +110,6 @@ public OverlappingTrainingDateRequestControllerTestFixture()
                 .Returns(_linkGeneratorRedirectUrl)
                 .Callback((string value) => _ = value);
 
-
             _outerApiService = new Mock<IOuterApiService>();
             var commitmentsApiClient = new Mock<ICommitmentsApiClient>();
             var validateUlnOverlapResult = new ValidateUlnOverlapResult();
@@ -119,7 +124,10 @@ public OverlappingTrainingDateRequestControllerTestFixture()
                 Id = 1,
                 Status = ApprenticeshipStatus.Live
             };
-            commitmentsApiClient.Setup(x => x.GetApprenticeship(It.IsAny<long>(), It.IsAny<CancellationToken>())).ReturnsAsync(() => _apprenticeshipDetails);
+            // commitmentsApiClient.Setup(x => x.GetApprenticeship(It.IsAny<long>(), It.IsAny<CancellationToken>())).ReturnsAsync(() => _apprenticeshipDetails);
+
+            _outerApiService.Setup(x => x.GetApprenticeship(It.Is<long>(t => t == _draftApprenticeshipOverlapOptionRequest.ApprenticeshipId.Value),
+                It.Is<long>(t => t == _draftApprenticeshipOverlapOptionRequest.ProviderId))).ReturnsAsync(_getApprenticeshipResponse);
 
             _overlapRequest = _autoFixture.Create<DraftApprenticeshipOverlapOptionWithPendingRequest>();
             _overlapViewModel = _autoFixture.Create<DraftApprenticeshipOverlapOptionWithPendingRequestViewModel>();
@@ -143,7 +151,7 @@ public OverlappingTrainingDateRequestControllerTestFixture()
 
         public OverlappingTrainingDateRequestControllerTestFixture SetApprenticeshipStatus(ApprenticeshipStatus status)
         {
-            _apprenticeshipDetails.Status = status;
+            _getApprenticeshipResponse.Status = (short)status;
             return this;
         }
 
@@ -186,6 +194,15 @@ public OverlappingTrainingDateRequestControllerTestFixture VerifyOverlapOptionsF
             return this;
         }
 
+        public OverlappingTrainingDateRequestControllerTestFixture VerifyOverlapOptionsForChangeEmployerViewModelViewReturnedWithNoWithdrawnReasonCode()
+        {
+            var viewResult = _actionResult as ViewResult;
+            viewResult.Should().NotBeNull();
+            var model = viewResult.Model as OverlapOptionsForChangeEmployerViewModel;
+            model.HasWithdrawnStatusCode.Should().BeFalse();
+            return this;
+        }
+
         public async Task<OverlappingTrainingDateRequestControllerTestFixture> DraftApprenticeshipOverlapOptions()
         {
             _actionResult = await _controller.DraftApprenticeshipOverlapOptions(_draftApprenticeshipOverlapOptionViewModel);
@@ -228,7 +245,7 @@ public OverlappingTrainingDateRequestControllerTestFixture SetupUpdateDraftAppre
         {
             _mockModelMapper.Setup(m => m.Map<UpdateDraftApprenticeshipApimRequest>(It.Is<EditDraftApprenticeshipViewModel>(x => x.Uln == _model.Uln))).ReturnsAsync(_updateDraftApprenticeshipRequest);
             return this;
-        }       
+        }
 
         public OverlappingTrainingDateRequestControllerTestFixture GetChangeOfEmployerNotified()
         {
@@ -289,8 +306,8 @@ public OverlappingTrainingDateRequestControllerTestFixture VerifyEmployerNotifie
             using (new AssertionScope())
             {
                 model.Should().NotBeNull();
-               _employerNotifiedRequest.CohortReference.Should().Be(model.CohortReference);
-               _employerNotifiedRequest.ProviderId.Should().Be(model.ProviderId);
+                _employerNotifiedRequest.CohortReference.Should().Be(model.CohortReference);
+                _employerNotifiedRequest.ProviderId.Should().Be(model.ProviderId);
             }
             return this;
         }
@@ -314,9 +331,9 @@ public OverlappingTrainingDateRequestControllerTestFixture GetDraftApprenticeshi
             return this;
         }
 
-        public OverlappingTrainingDateRequestControllerTestFixture GetOverlapOptionsForChangeEmployer()
+        public async Task<OverlappingTrainingDateRequestControllerTestFixture> GetOverlapOptionsForChangeEmployer()
         {
-            _actionResult = _controller.OverlapOptionsForChangeEmployer(_overlapOptionsForChangeEmployerRequest);
+            _actionResult = await _controller.OverlapOptionsForChangeEmployer(_overlapOptionsForChangeEmployerRequest);
             return this;
         }
 
@@ -339,7 +356,7 @@ public OverlappingTrainingDateRequestControllerTestFixture VerifyOverlapRequests
             }
             return this;
         }
-        
+
         public OverlappingTrainingDateRequestControllerTestFixture GetDraftApprenticeshipOverlapAlert()
         {
             _actionResult = _controller.DraftApprenticeshipOverlapAlert(_draftApprenticeshipOverlapAlertRequest);
@@ -394,5 +411,11 @@ public OverlappingTrainingDateRequestControllerTestFixture VerifyExistingDraftAp
 
             return this;
         }
+
+        public OverlappingTrainingDateRequestControllerTestFixture SetupWithdrawnStatusCode(int? statusCode)
+        {
+            _getApprenticeshipResponse.WithdrawnReasonCode = statusCode;
+            return this;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/WhenIGetDraftApprenticeshipOverlapOptions.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/WhenIGetDraftApprenticeshipOverlapOptions.cs
index 239f832d9..19307fa2d 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/WhenIGetDraftApprenticeshipOverlapOptions.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/WhenIGetDraftApprenticeshipOverlapOptions.cs
@@ -21,6 +21,13 @@ public async Task AndWhenIGetDraftApprenticeshipOverlapOptions_CorrectViewModelI
             _fixture.VerifyDraftApprenticeshipOverlapOptionsViewReturned();
         }
 
+        [Test]
+        public async Task AndWhenIGetDraftApprenticeshipOverlapOptions_NotWithdrawnFromIlrPreviousApprenticeship_CorrectViewModelIsReturned()
+        {
+            await _fixture.SetupWithdrawnStatusCode(null).GetDraftApprenticeshipOverlapOptions();
+            _fixture.VerifyDraftApprenticeshipOverlapOptionsViewReturned();
+        }
+
         [Test]
         public async Task AndWhenIGetDraftApprenticeshipOverlapOptions_ModelIsMapped()
         {
@@ -30,6 +37,14 @@ await _fixture
             _fixture.VerifyWhenGettingOverlappingTrainingDate_ModelIsMapped();
         }
 
+        [Test]
+        public async Task AndWhenIGetDraftApprenticeshipOverlapOptions_NotWithdrawnFromIlrPreviousApprenticeship_ModelIsMapped()
+        {
+            await _fixture.SetupWithdrawnStatusCode(null)
+                .GetDraftApprenticeshipOverlapOptions();
+            _fixture.VerifyWhenGettingOverlappingTrainingDate_ModelIsMapped();
+        }
+
         [Test]
         public async Task AndWhenWhenUserSelectsToSendOverlapEmailToEmployer()
         {
@@ -63,6 +78,7 @@ public async Task ThenEnableStopRequestEmailIsMappedCorrectly(CommitmentsV2.Type
         {
             await _fixture
            .SetApprenticeshipStatus(apprenticeshipStatus)
+           .SetupWithdrawnStatusCode(null)
            .GetDraftApprenticeshipOverlapOptions();
 
             _fixture.VerifyEnableEmployerRequestEmail(sendEmail);
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/WhenIGetOverlapOptionsForChangeEmployer.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/WhenIGetOverlapOptionsForChangeEmployer.cs
index a9823a775..19595b863 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/WhenIGetOverlapOptionsForChangeEmployer.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/WhenIGetOverlapOptionsForChangeEmployer.cs
@@ -12,10 +12,17 @@ public void Arrange()
         }
 
         [Test]
-        public void AndWhenGetDraftApprenticeshipOverlapOptionsChangeEmployerEndpointIsCalled_CorrectViewModelIsReturned()
+        public async Task AndWhenGetDraftApprenticeshipOverlapOptionsChangeEmployerEndpointIsCalled_CorrectViewModelIsReturned()
         {
-            _fixture.GetOverlapOptionsForChangeEmployer();
+            await _fixture.GetOverlapOptionsForChangeEmployer();
             _fixture.VerifyOverlapOptionsForChangeEmployerViewModelViewReturned();
         }
+
+        [Test]
+        public async Task AndWhenGetDraftApprenticeshipOverlapOptionsChangeEmployerEndpointIsCalled_NotWithdrawnFromIlrPreviousApprenticeship_CorrectViewModelIsReturned()
+        {
+            await _fixture.SetupWithdrawnStatusCode(null).GetOverlapOptionsForChangeEmployer();
+            _fixture.VerifyOverlapOptionsForChangeEmployerViewModelViewReturnedWithNoWithdrawnReasonCode();
+        }
     }
 }
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Validators/OverlappingTrainingDates/OverlapOptionsForChangeEmployerViewModelValidatorTests.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Validators/OverlappingTrainingDates/OverlapOptionsForChangeEmployerViewModelValidatorTests.cs
index fbd208c2c..8777bb154 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Validators/OverlappingTrainingDates/OverlapOptionsForChangeEmployerViewModelValidatorTests.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Validators/OverlappingTrainingDates/OverlapOptionsForChangeEmployerViewModelValidatorTests.cs
@@ -12,30 +12,35 @@ public class OverlapOptionsForChangeEmployerViewModelValidatorTests
         [TestCase(1, true)]
         public void Validate_ProviderId_ShouldBeValidated(int providerId, bool expectedValid)
         {
-            var model = new OverlapOptionsForChangeEmployerViewModel { ProviderId = providerId };
+            var model = new OverlapOptionsForChangeEmployerViewModel { ProviderId = providerId, HasWithdrawnStatusCode = false };
             AssertValidationResult(request => request.ProviderId, model, expectedValid);
         }
 
-
         [TestCase(0, false)]
         [TestCase(1, true)]
         public void Validate_ApprenticeshipId_ShouldBeValidated(int apprenticeshipId, bool expectedValid)
         {
-            var model = new OverlapOptionsForChangeEmployerViewModel { ApprenticeshipId = apprenticeshipId };
+            var model = new OverlapOptionsForChangeEmployerViewModel { ApprenticeshipId = apprenticeshipId, HasWithdrawnStatusCode = false };
             AssertValidationResult(request => request.ApprenticeshipId, model, expectedValid);
         }
 
-
         [TestCase(null, false)]
         [TestCase(OverlapOptions.CompleteActionLater, true)]
         [TestCase(OverlapOptions.ContactTheEmployer, true)]
         [TestCase(OverlapOptions.SendStopRequest, true)]
         public void Validate_Selection_ShouldBeValidated(OverlapOptions? selection, bool expectedValid)
         {
-            var model = new OverlapOptionsForChangeEmployerViewModel { OverlapOptions = selection };
+            var model = new OverlapOptionsForChangeEmployerViewModel { OverlapOptions = selection, HasWithdrawnStatusCode = false };
             AssertValidationResult(request => request.OverlapOptions, model, expectedValid);
         }
 
+        [TestCase(0, true)]
+        public void Validate_ProviderId_ShouldBeValidated_HasWithdrawnStatusCode(int providerId, bool expectedValid)
+        {
+            var model = new OverlapOptionsForChangeEmployerViewModel { ProviderId = providerId, HasWithdrawnStatusCode = true };
+            AssertValidationResult(request => request.ProviderId, model, expectedValid);
+        }
+
         private static void AssertValidationResult<T>(Expression<Func<OverlapOptionsForChangeEmployerViewModel, T>> property, OverlapOptionsForChangeEmployerViewModel instance, bool expectedValid)
         {
             var validator = new OverlapOptionsForChangeEmployerViewModelValidator();
@@ -51,4 +56,4 @@ private static void AssertValidationResult<T>(Expression<Func<OverlapOptionsForC
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Controllers/OverlappingTrainingDateRequestController.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Controllers/OverlappingTrainingDateRequestController.cs
index cd75856d1..5a9f22512 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Controllers/OverlappingTrainingDateRequestController.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Controllers/OverlappingTrainingDateRequestController.cs
@@ -42,8 +42,13 @@ IOuterApiService outerApiService
 
         [HttpGet]
         [Route("overlap-options-change-employer")]
-        public IActionResult OverlapOptionsForChangeEmployer(OverlapOptionsForChangeEmployerRequest request)
+        public async Task<IActionResult> OverlapOptionsForChangeEmployer(OverlapOptionsForChangeEmployerRequest request)
         {
+            var apprenticeshipDetails = await _outerApiService.GetApprenticeship(request.ApprenticeshipId.Value, request.ProviderId);
+            DraftApprenticeshipViewModel model = request.ApprenticeshipHashedId == null
+               ? PeekStoredAddDraftApprenticeshipState()
+               : PeekStoredEditDraftApprenticeshipState();
+
             var viewModel = new OverlapOptionsForChangeEmployerViewModel
             {
                 DraftApprenticeshipHashedId = request.ApprenticeshipHashedId,
@@ -51,7 +56,10 @@ public IActionResult OverlapOptionsForChangeEmployer(OverlapOptionsForChangeEmpl
                 ApprenticeshipHashedId = request.ApprenticeshipHashedId,
                 ProviderId = request.ProviderId,
                 CacheKey = request.CacheKey,
-                Status = request.Status
+                Status = request.Status,
+                HasWithdrawnStatusCode = apprenticeshipDetails.WithdrawnReasonCode.HasValue,
+                IsSameProvider = apprenticeshipDetails.ProviderId == request.ProviderId,
+                ProviderName = apprenticeshipDetails.ProviderName
             };
 
             return View(viewModel);
@@ -61,14 +69,19 @@ public IActionResult OverlapOptionsForChangeEmployer(OverlapOptionsForChangeEmpl
         [Route("overlap-options-change-employer")]
         public async Task<IActionResult> OverlapOptionsForChangeEmployer(OverlapOptionsForChangeEmployerViewModel viewModel)
         {
-            if (viewModel.OverlapOptions != OverlapOptions.SendStopRequest)
+            if (!viewModel.HasWithdrawnStatusCode)
             {
-                return RedirectToAction(ControllerConstants.ApprenticeController.Actions.Index, ControllerConstants.ApprenticeController.Name, new { viewModel.ProviderId });
-            }
+                if (viewModel.OverlapOptions != OverlapOptions.SendStopRequest)
+                {
+                    return RedirectToAction(ControllerConstants.ApprenticeController.Actions.Index, ControllerConstants.ApprenticeController.Name, new { viewModel.ProviderId });
+                }
 
-            var request = await _modelMapper.Map<ChangeOfEmployerNotifiedRequest>(viewModel);
+                var request = await _modelMapper.Map<ChangeOfEmployerNotifiedRequest>(viewModel);
 
-            return RedirectToAction(nameof(ChangeOfEmployerNotified), request);
+                return RedirectToAction(nameof(ChangeOfEmployerNotified), request);
+            }
+
+            return RedirectToAction(ControllerConstants.ApprenticeController.Actions.Index, ControllerConstants.ApprenticeController.Name, new { viewModel.ProviderId });
         }
 
         [HttpGet]
@@ -100,36 +113,53 @@ public async Task<IActionResult> DraftApprenticeshipOverlapOptionsWithPendingReq
         [Route("overlap-options")]
         public async Task<IActionResult> DraftApprenticeshipOverlapOptions(DraftApprenticeshipOverlapOptionRequest request)
         {
-            var apprenticeshipDetails = await _commitmentsApiClient.GetApprenticeship(request.ApprenticeshipId.Value);
-
-            var enableStopRequestEmail = apprenticeshipDetails.Status == ApprenticeshipStatus.Live
-                                        || apprenticeshipDetails.Status == ApprenticeshipStatus.WaitingToStart
-                                        || apprenticeshipDetails.Status == ApprenticeshipStatus.Paused
-                                        || apprenticeshipDetails.Status == ApprenticeshipStatus.Completed
-                                        || apprenticeshipDetails.Status == ApprenticeshipStatus.Stopped;
-            if (request.DraftApprenticeshipId.HasValue)
+            var apprenticeshipDetails = await _outerApiService.GetApprenticeship(request.ApprenticeshipId.Value, request.ProviderId);
+            DraftApprenticeshipOverlapOptionViewModel vm;
+
+            if (apprenticeshipDetails.WithdrawnReasonCode.HasValue)
+            {
+                vm = new DraftApprenticeshipOverlapOptionViewModel
+                {
+                    DraftApprenticeshipHashedId = request.DraftApprenticeshipHashedId,
+                    Status = (ApprenticeshipStatus)apprenticeshipDetails.Status,
+                    EnableStopRequestEmail = false,
+                    HasWithdrawnStatusCode = true,
+                    IsSameProvider = apprenticeshipDetails.ProviderId == request.ProviderId,
+                    ProviderName = apprenticeshipDetails.ProviderName
+                };
+            }
+            else
             {
-                var pendingOverlapRequests = await _outerApiService.GetOverlapRequest(request.DraftApprenticeshipId.Value);
-                if (pendingOverlapRequests.DraftApprenticeshipId.HasValue)
+                var enableStopRequestEmail = apprenticeshipDetails.Status == (short)ApprenticeshipStatus.Live
+                                            || apprenticeshipDetails.Status == (short)ApprenticeshipStatus.WaitingToStart
+                                            || apprenticeshipDetails.Status == (short)ApprenticeshipStatus.Paused
+                                            || apprenticeshipDetails.Status == (short)ApprenticeshipStatus.Completed
+                                            || apprenticeshipDetails.Status == (short)ApprenticeshipStatus.Stopped;
+
+                if (request.DraftApprenticeshipId.HasValue)
                 {
-                    return RedirectToAction(nameof(DraftApprenticeshipOverlapOptionsWithPendingRequest), new
+                    var pendingOverlapRequests = await _outerApiService.GetOverlapRequest(request.DraftApprenticeshipId.Value);
+                    if (pendingOverlapRequests.DraftApprenticeshipId.HasValue)
                     {
-                        ProviderId = apprenticeshipDetails.ProviderId,
-                        CohortReference = request.CohortReference,
-                        DraftApprenticeshipHashedId = request.DraftApprenticeshipHashedId,
-                        CreatedOn = pendingOverlapRequests.CreatedOn,
-                        Status = apprenticeshipDetails.Status,
-                        EnableStopRequestEmail = enableStopRequestEmail
-                    });
+                        return RedirectToAction(nameof(DraftApprenticeshipOverlapOptionsWithPendingRequest), new
+                        {
+                            ProviderId = apprenticeshipDetails.ProviderId,
+                            CohortReference = request.CohortReference,
+                            DraftApprenticeshipHashedId = request.DraftApprenticeshipHashedId,
+                            CreatedOn = pendingOverlapRequests.CreatedOn,
+                            Status = apprenticeshipDetails.Status,
+                            EnableStopRequestEmail = enableStopRequestEmail
+                        });
+                    }
                 }
-            }
 
-            var vm = new DraftApprenticeshipOverlapOptionViewModel
-            {
-                DraftApprenticeshipHashedId = request.DraftApprenticeshipHashedId,
-                Status = apprenticeshipDetails.Status,
-                EnableStopRequestEmail = enableStopRequestEmail
-            };
+                vm = new DraftApprenticeshipOverlapOptionViewModel
+                {
+                    DraftApprenticeshipHashedId = request.DraftApprenticeshipHashedId,
+                    Status = (ApprenticeshipStatus)apprenticeshipDetails.Status,
+                    EnableStopRequestEmail = enableStopRequestEmail
+                };
+            }
 
             return View(vm);
         }
@@ -181,7 +211,7 @@ public IActionResult ChangeOfEmployerNotified(ChangeOfEmployerNotifiedRequest re
         {
             var vm = new ChangeOfEmployerNotifiedViewModel { ProviderId = request.ProviderId };
             return View(vm);
-        }       
+        }
 
         [HttpGet]
         [Route("{cohortReference}/employer-notified")]
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Models/OveralppingTrainingDate/DraftApprenticeshipOverlapOptionViewModel.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Models/OveralppingTrainingDate/DraftApprenticeshipOverlapOptionViewModel.cs
index 21ab245cd..52e81a7e7 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Models/OveralppingTrainingDate/DraftApprenticeshipOverlapOptionViewModel.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Models/OveralppingTrainingDate/DraftApprenticeshipOverlapOptionViewModel.cs
@@ -1,5 +1,5 @@
-using SFA.DAS.ProviderCommitments.Web.ModelBinding;
-using SFA.DAS.CommitmentsV2.Types;
+using SFA.DAS.CommitmentsV2.Types;
+using SFA.DAS.ProviderCommitments.Web.ModelBinding;
 
 namespace SFA.DAS.ProviderCommitments.Web.Models.OveralppingTrainingDate
 {
@@ -12,6 +12,9 @@ public class DraftApprenticeshipOverlapOptionViewModel : IAuthorizationContextMo
         public long? DraftApprenticeshipId { get; set; }
         public ApprenticeshipStatus Status { get; set; }
         public bool EnableStopRequestEmail { get; set; }
+        public bool HasWithdrawnStatusCode { get; set; }
+        public bool IsSameProvider { get; set; }
+        public string ProviderName { get; set; }
     }
 
     public enum OverlapOptions
@@ -20,4 +23,4 @@ public enum OverlapOptions
         ContactTheEmployer,
         CompleteActionLater
     }
-}
+}
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Validators/OverlappingTrainingDate/DraftApprenticeshipOverlapOptionViewModelValidator.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Validators/OverlappingTrainingDate/DraftApprenticeshipOverlapOptionViewModelValidator.cs
index 06260e9fe..03820154d 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Validators/OverlappingTrainingDate/DraftApprenticeshipOverlapOptionViewModelValidator.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Validators/OverlappingTrainingDate/DraftApprenticeshipOverlapOptionViewModelValidator.cs
@@ -8,7 +8,7 @@ public class DraftApprenticeshipOverlapOptionViewModelValidator : AbstractValida
         public DraftApprenticeshipOverlapOptionViewModelValidator()
         {
             RuleFor(x => x.ProviderId).GreaterThan(0);
-            RuleFor(x => x.OverlapOptions).NotNull().WithMessage("You need to select what you would like to do");
+            RuleFor(x => x.OverlapOptions).NotNull().Unless(x => x.HasWithdrawnStatusCode).WithMessage("You need to select what you would like to do");
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Validators/OverlappingTrainingDate/OverlapOptionsForChangeEmployerViewModelValidator.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Validators/OverlappingTrainingDate/OverlapOptionsForChangeEmployerViewModelValidator.cs
index ecb4204e2..d712faddd 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Validators/OverlappingTrainingDate/OverlapOptionsForChangeEmployerViewModelValidator.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Validators/OverlappingTrainingDate/OverlapOptionsForChangeEmployerViewModelValidator.cs
@@ -7,10 +7,10 @@ public class OverlapOptionsForChangeEmployerViewModelValidator : AbstractValidat
     {
         public OverlapOptionsForChangeEmployerViewModelValidator()
         {
-            RuleFor(x => x.ProviderId).GreaterThan(0);
-            RuleFor(x => x.CacheKey).NotNull();
-            RuleFor(x => x.ApprenticeshipId).GreaterThan(0);
-            RuleFor(x => x.OverlapOptions).NotNull().WithMessage("You need to select what you would like to do");
+            RuleFor(x => x.ProviderId).GreaterThan(0).Unless(x => x.HasWithdrawnStatusCode);
+            RuleFor(x => x.CacheKey).NotNull().Unless(x => x.HasWithdrawnStatusCode);
+            RuleFor(x => x.ApprenticeshipId).GreaterThan(0).Unless(x => x.HasWithdrawnStatusCode);
+            RuleFor(x => x.OverlapOptions).NotNull().Unless(x => x.HasWithdrawnStatusCode).WithMessage("You need to select what you would like to do");
         }
     }
 }
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/OverlappingTrainingDateRequest/DraftApprenticeshipOverlapOptions.cshtml b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/OverlappingTrainingDateRequest/DraftApprenticeshipOverlapOptions.cshtml
index d2782d20a..02c914d3b 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/OverlappingTrainingDateRequest/DraftApprenticeshipOverlapOptions.cshtml
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/OverlappingTrainingDateRequest/DraftApprenticeshipOverlapOptions.cshtml
@@ -1,63 +1,11 @@
-@using SFA.DAS.CommitmentsV2.Shared.Extensions
-@using SFA.DAS.ProviderCommitments.Web.Models.OveralppingTrainingDate
+@using SFA.DAS.ProviderCommitments.Web.Models.OveralppingTrainingDate
 @model DraftApprenticeshipOverlapOptionViewModel
 
-@{
-    ViewData["Title"] = "Planned start date overlaps with existing training";
-    ViewBag.GaData.Vpv = "/unapproved/add/apprenticeship/overlap-options";
-}
-
-<div class="govuk-grid-row">
-  <div class="govuk-grid-column-two-thirds">
-    <partial name="_ValidationSummary" />
-    <h1 class="govuk-heading-xl">Planned start date overlaps with existing training</h1>
-    <p>The dates may be overlapping because:</p>
-    <ul class="govuk-list govuk-list--bullet">
-        <li>the previous employer has not added or updated the stop date</li>
-        <li>the previous employer has entered an incorrect stop date</li>
-    </ul>
-
-    <form method="post">
-        <div class="govuk-form-group @Html.AddClassIfPropertyInError(x => x.OverlapOptions, "govuk-form-group--error")">
-          <fieldset class="govuk-fieldset">
-              <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
-                        <h3 class="govuk-fieldset__heading">Do you want to send a stop date request?</h3>
-              </legend>
-              <input type="hidden" asp-for="DraftApprenticeshipHashedId" value="@Model.DraftApprenticeshipHashedId" />
-              @Html.ValidationMessageFor(m => m.OverlapOptions, null, new { @class = "govuk-error-message", id = "error-message-" + Html.IdFor(m => m.OverlapOptions) })
-              <div class="govuk-radios" data-module="radios">
-                @if (Model.EnableStopRequestEmail)
-                {
-                <div class="govuk-radios__item">
-                    <input class="govuk-radios__input" id="overlap-option-1" name="OverlapOptions" type="radio" value="@OverlapOptions.SendStopRequest" aria-describedby="hint-previous-employer">
-                    <label class="govuk-label govuk-radios__label" for="overlap-option-1">
-                                    Yes, send a stop date request to the previous employer
-                    </label>
-                    <div id="hint-previous-employer" class="govuk-hint govuk-radios__hint">
-                                    A draft apprenticeship record will be saved and the employer will have 2 weeks to action the changes
-                    </div>
-                </div>
-                }
-                <div class="govuk-radios__item">
-                    <input class="govuk-radios__input" id="overlap-option-2" name="OverlapOptions" type="radio" value="@OverlapOptions.ContactTheEmployer" aria-describedby="hint-saved-cohort">
-                    <label class="govuk-label govuk-radios__label" for="overlap-option-2">
-                                No, I’ll change the employer later
-                    </label>
-                    <div id="hint-saved-cohort" class="govuk-hint govuk-radios__hint">
-                                The details entered for this apprentice will not be saved. Go back to view apprentice details
-                    </div>
-                </div>                
-              </div>
-          </fieldset>
-        </div>
-        <button class="govuk-button" data-module="govuk-button">
-          Submit
-        </button>
-    </form>
-  </div>
-</div> 
-     
-@section breadcrumb
-    {
-    <div class="das-js-back-link"></div>
+@if (Model.HasWithdrawnStatusCode)
+{
+    <partial name="_OverlapIlrWithdrawnPartial" />
 }
+else
+{
+    <partial name="_DraftApprenticeshipOverlapOptionsPartial" />
+}
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/OverlappingTrainingDateRequest/OverlapOptionsForChangeEmployer.cshtml b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/OverlappingTrainingDateRequest/OverlapOptionsForChangeEmployer.cshtml
index 05848e84d..870de30f2 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/OverlappingTrainingDateRequest/OverlapOptionsForChangeEmployer.cshtml
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/OverlappingTrainingDateRequest/OverlapOptionsForChangeEmployer.cshtml
@@ -3,67 +3,11 @@
 @using SFA.DAS.CommitmentsV2.Types;
 @model OverlapOptionsForChangeEmployerViewModel
 
-@{
-    ViewBag.Title = "Planned start date overlaps with existing training";
-    ViewBag.GaData.Vpv = "/unapproved/add/apprenticeship/overlap-options-change-employer";
-
-    var radioHeading = Model.Status == ApprenticeshipStatus.Stopped ? "Do you want to update a stop date?" : "Do you want to send a stop date request?";
+@if (Model.HasWithdrawnStatusCode)
+{   
+    <partial name="_ChangeEmployerOverlapIlrWithdrawnPartial" model="Model" />
 }
-
-<div class="govuk-grid-row">
-    <div class="govuk-grid-column-two-thirds">
-        <partial name="_ValidationSummary"/>
-        <h1 class="govuk-heading-l">@ViewBag.Title</h1>
-        <p>The dates may be overlapping because:</p>
-        <ul class="govuk-list govuk-list--bullet">
-            <li>the previous employer has not added or updated the stop date</li>
-            <li>the previous employer has entered an incorrect stop date</li>
-        </ul>
-              
-        <form method="post">
-            <input type="hidden" asp-for="DraftApprenticeshipHashedId" value="@Model.DraftApprenticeshipHashedId"/>
-            <input type="hidden" asp-for="ApprenticeshipId" value="@Model.ApprenticeshipId" />
-            <input type="hidden" asp-for="ApprenticeshipHashedId" value="@Model.ApprenticeshipHashedId" />
-            <input type="hidden" asp-for="ProviderId" value="@Model.ProviderId" />
-            <input type="hidden" asp-for="CacheKey" value="@Model.CacheKey" />
-            
-            <div class="govuk-form-group @Html.AddClassIfPropertyInError(x => x.OverlapOptions, "govuk-form-group--error")">
-                <fieldset class="govuk-fieldset">
-                    <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
-                        <h3 class="govuk-fieldset__heading">@radioHeading</h3>
-                    </legend>
-                    
-                    @Html.ValidationMessageFor(m => m.OverlapOptions, null, new { @class = "govuk-error-message", id = "error-message-" + Html.IdFor(m => m.OverlapOptions) })
-                    <div class="govuk-radios" data-module="radios">
-                        <div class="govuk-radios__item">
-                            <input class="govuk-radios__input" id="overlap-option-1" name="OverlapOptions" type="radio" value="@OverlapOptions.SendStopRequest" aria-describedby="hint-previous-employer">
-                            <label class="govuk-label govuk-radios__label" for="overlap-option-1">
-                                Yes, send a stop date request to the previous employer
-                            </label>
-                            <div id="hint-previous-employer" class="govuk-hint govuk-radios__hint">
-                                A draft learner record will be saved and the employer will have 2 weeks to action the changes
-                            </div>
-                        </div>
-                        <div class="govuk-radios__item">
-                            <input class="govuk-radios__input" id="overlap-option-2" name="OverlapOptions" type="radio" value="@OverlapOptions.ContactTheEmployer" aria-describedby="hint-saved-cohort">
-                            <label class="govuk-label govuk-radios__label" for="overlap-option-2">
-                                No, I’ll change the employer later
-                            </label>
-                            <div id="hint-saved-cohort" class="govuk-hint govuk-radios__hint">
-                                The details entered for this learner will not be saved. Go back to view learner details.
-                            </div>
-                        </div>                       
-                    </div>
-                </fieldset>
-            </div>
-            <button class="govuk-button" data-module="govuk-button">
-                Submit
-            </button>
-        </form>
-    </div>
-</div>
-
-@section breadcrumb
+else
 {
-    <div class="das-js-back-link"></div>
-}
\ No newline at end of file
+    <partial name="_OverlapOptionsForChangeEmployerPartial" />
+}   
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_ChangeEmployerOverlapIlrWithdrawnPartial.cshtml b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_ChangeEmployerOverlapIlrWithdrawnPartial.cshtml
new file mode 100644
index 000000000..254ddf6be
--- /dev/null
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_ChangeEmployerOverlapIlrWithdrawnPartial.cshtml
@@ -0,0 +1,51 @@
+@using SFA.DAS.CommitmentsV2.Shared.Extensions
+@using SFA.DAS.ProviderCommitments.Web.Models.OveralppingTrainingDate
+@using SFA.DAS.ProviderCommitments.Web.RouteValues
+@model OverlapOptionsForChangeEmployerViewModel
+
+@{
+    ViewBag.Title = "Planned start date overlaps with existing training";
+    ViewBag.GaData.Vpv = "/unapproved/add/apprenticeship/overlap-options-change-employer";
+}
+
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+        <h1 class="govuk-heading-l">@ViewBag.Title</h1>
+
+        <p>The learner's unique learner number (ULN) is already linked to a previous learner record which has been withdrawn through the ILR.</p>
+        
+        <p>You cannot send a stop date request for this record because the stop date on the previous record has come from the ILR.</p>
+            
+        <h2 class="govuk-heading-m">What you can do next</h2>
+
+        <div id="todonextContent">
+            @if (Model.IsSameProvider)
+            {
+                <div>
+                    <p class="govuk-body">As your organisation @Model.ProviderName is the training provider for the previous ILR record you can:</p>
+
+                    <ol class="govuk-list govuk-list--number">
+                        <li>Submit an updated ILR record through Submit Learner Data with the correct training and stop dates for this learner.</li>
+                        <li>After 15 minutes return to the Apprenticeship Service to add the learner again or change the planned training dates.</li>
+                    </ol>
+                </div>
+            }
+            else
+            {
+                <div>
+                    <p> Change the training dates for the learner so there is no longer an overlap</p>
+
+                    <p>If this not possible, contact the support team on <b>0800 150 600</b>. Telephone lines are open <b>8am to 8pm, Monday to Friday.</b> </p>
+                </div>
+            }
+        </div>
+
+        <a id="link" class="govuk-link" href="@Url.RouteUrl(@RouteNames.ApprenticesIndex, new { Model.ProviderId })">Go back to Manage your learners</a>
+           
+    </div>
+</div>
+
+@section breadcrumb
+{
+    <div class="das-js-back-link"></div>
+}
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_DraftApprenticeshipOverlapOptionsPartial.cshtml b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_DraftApprenticeshipOverlapOptionsPartial.cshtml
new file mode 100644
index 000000000..b39a1e03e
--- /dev/null
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_DraftApprenticeshipOverlapOptionsPartial.cshtml
@@ -0,0 +1,63 @@
+@using SFA.DAS.CommitmentsV2.Shared.Extensions
+@using SFA.DAS.ProviderCommitments.Web.Models.OveralppingTrainingDate
+@model DraftApprenticeshipOverlapOptionViewModel
+
+@{
+    ViewData["Title"] = "Planned start date overlaps with existing training";
+    ViewBag.GaData.Vpv = "/unapproved/add/apprenticeship/overlap-options";
+}
+
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+        <partial name="_ValidationSummary" />
+        <h1 class="govuk-heading-xl">Planned start date overlaps with existing training</h1>
+        <p>The dates may be overlapping because:</p>
+        <ul class="govuk-list govuk-list--bullet">
+            <li>the previous employer has not added or updated the stop date</li>
+            <li>the previous employer has entered an incorrect stop date</li>
+        </ul>
+
+        <form method="post">
+            <div class="govuk-form-group @Html.AddClassIfPropertyInError(x => x.OverlapOptions, "govuk-form-group--error")">
+                <fieldset class="govuk-fieldset">
+                    <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
+                        <h3 class="govuk-fieldset__heading">Do you want to send a stop date request?</h3>
+                    </legend>
+                    <input type="hidden" asp-for="DraftApprenticeshipHashedId" value="@Model.DraftApprenticeshipHashedId" />
+                    @Html.ValidationMessageFor(m => m.OverlapOptions, null, new { @class = "govuk-error-message", id = "error-message-" + Html.IdFor(m => m.OverlapOptions) })
+                    <div class="govuk-radios" data-module="radios">
+                        @if (Model.EnableStopRequestEmail)
+                        {
+                            <div class="govuk-radios__item">
+                                <input class="govuk-radios__input" id="overlap-option-1" name="OverlapOptions" type="radio" value="@OverlapOptions.SendStopRequest" aria-describedby="hint-previous-employer">
+                                <label class="govuk-label govuk-radios__label" for="overlap-option-1">
+                                    Yes, send a stop date request to the previous employer
+                                </label>
+                                <div id="hint-previous-employer" class="govuk-hint govuk-radios__hint">
+                                    A draft apprenticeship record will be saved and the employer will have 2 weeks to action the changes
+                                </div>
+                            </div>
+                        }
+                        <div class="govuk-radios__item">
+                            <input class="govuk-radios__input" id="overlap-option-2" name="OverlapOptions" type="radio" value="@OverlapOptions.ContactTheEmployer" aria-describedby="hint-saved-cohort">
+                            <label class="govuk-label govuk-radios__label" for="overlap-option-2">
+                                No, I’ll change the employer later
+                            </label>
+                            <div id="hint-saved-cohort" class="govuk-hint govuk-radios__hint">
+                                The details entered for this apprentice will not be saved. Go back to view apprentice details
+                            </div>
+                        </div>
+                    </div>
+                </fieldset>
+            </div>
+            <button class="govuk-button" data-module="govuk-button">
+                Submit
+            </button>
+        </form>
+    </div>
+</div>
+     
+@section breadcrumb
+{
+    <div class="das-js-back-link"></div>
+}
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_OverlapIlrWithdrawnPartial.cshtml b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_OverlapIlrWithdrawnPartial.cshtml
new file mode 100644
index 000000000..6d152754c
--- /dev/null
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_OverlapIlrWithdrawnPartial.cshtml
@@ -0,0 +1,57 @@
+@using SFA.DAS.CommitmentsV2.Shared.Extensions
+@using SFA.DAS.ProviderCommitments.Web.Models.OveralppingTrainingDate
+@using SFA.DAS.ProviderCommitments.Web.RouteValues
+@model DraftApprenticeshipOverlapOptionViewModel
+
+@{
+    ViewBag.Title = "Planned start date overlaps with existing training";
+    ViewBag.GaData.Vpv = "/unapproved/add/apprenticeship/overlap-options-change-employer";
+}
+
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+        <h1 class="govuk-heading-l">@ViewBag.Title</h1>
+
+        <form method="post">
+
+            <p>The learner's unique learner number (ULN) is already linked to a previous learner record which has been withdrawn through the ILR.</p>
+        
+            <p>You cannot send a stop date request for this record because the stop date on the previous record has come from the ILR.</p>
+            
+            <h2 class="govuk-heading-m">What you can do next</h2>
+
+            <div id="todonextContent">
+                @if (Model.IsSameProvider)
+                {
+                    <div>
+                        <p class="govuk-body">As your organisation @Model.ProviderName is the training provider for the previous ILR record you can:</p>
+
+                        <ol class="govuk-list govuk-list--number">
+                            <li>Submit an updated ILR record through Submit Learner Data with the correct training and stop dates for this learner.</li>
+                            <li>After 15 minutes return to the Apprenticeship Service to add the learner again or change the planned training dates.</li>
+                        </ol>
+                    </div>
+                }
+                else
+                {
+                    <div>
+                        <p> Change the training dates for the learner so there is no longer an overlap</p>
+
+                        <p>If this not possible, contact the support team on <b>0800 150 600</b>. Telephone lines are open <b>8am to 8pm, Monday to Friday.</b> </p>
+                    </div>
+                }
+            </div>
+
+         
+            <button class="govuk-button" type="submit" data-module="govuk-button">
+                Submit
+            </button>
+        </form>
+    </div>
+           
+</div>
+
+@section breadcrumb
+{
+    <div class="das-js-back-link"></div>
+}
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_OverlapOptionsForChangeEmployerPartial.cshtml b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_OverlapOptionsForChangeEmployerPartial.cshtml
new file mode 100644
index 000000000..7df11edaf
--- /dev/null
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_OverlapOptionsForChangeEmployerPartial.cshtml
@@ -0,0 +1,71 @@
+@using SFA.DAS.CommitmentsV2.Shared.Extensions
+@using SFA.DAS.ProviderCommitments.Web.Models.OveralppingTrainingDate
+@using SFA.DAS.CommitmentsV2.Types;
+@model OverlapOptionsForChangeEmployerViewModel
+
+@{
+    ViewBag.Title = "Planned start date overlaps with existing training";
+    ViewBag.GaData.Vpv = "/unapproved/add/apprenticeship/overlap-options-change-employer";
+
+    var radioHeading = Model.Status == ApprenticeshipStatus.Stopped ? "Do you want to update a stop date?" : "Do you want to send a stop date request?";
+}
+
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+        <partial name="_ValidationSummary" />
+        <h1 class="govuk-heading-l">@ViewBag.Title</h1>
+        <p>The dates may be overlapping because:</p>
+        <ul class="govuk-list govuk-list--bullet">
+            <li>the previous employer has not added or updated the stop date</li>
+            <li>the previous employer has entered an incorrect stop date</li>
+        </ul>     
+        <form method="post">
+      
+            <input type="hidden" asp-for="DraftApprenticeshipHashedId" value="@Model.DraftApprenticeshipHashedId" />
+            <input type="hidden" asp-for="ApprenticeshipId" value="@Model.ApprenticeshipId" />
+            <input type="hidden" asp-for="ApprenticeshipHashedId" value="@Model.ApprenticeshipHashedId" />
+            <input type="hidden" asp-for="ProviderId" value="@Model.ProviderId" />
+            <input type="hidden" asp-for="CacheKey" value="@Model.CacheKey" />
+            
+            <div class="govuk-form-group @Html.AddClassIfPropertyInError(x => x.OverlapOptions, "govuk-form-group--error")">
+                <fieldset class="govuk-fieldset">
+                    <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
+                        <h3 class="govuk-fieldset__heading">@radioHeading</h3>
+                    </legend>
+                    
+                    @Html.ValidationMessageFor(m => m.OverlapOptions, null, new { @class = "govuk-error-message", id = "error-message-" + Html.IdFor(m => m.OverlapOptions) })
+                    <div class="govuk-radios" data-module="radios">
+                        <div class="govuk-radios__item">
+                            <input class="govuk-radios__input" id="overlap-option-1" name="OverlapOptions" type="radio" value="@OverlapOptions.SendStopRequest" aria-describedby="hint-previous-employer">
+                            <label class="govuk-label govuk-radios__label" for="overlap-option-1">
+                                Yes, send a stop date request to the previous employer
+                            </label>
+                            <div id="hint-previous-employer" class="govuk-hint govuk-radios__hint">
+                                A draft learner record will be saved and the employer will have 2 weeks to action the changes
+                            </div>
+                        </div>
+                        <div class="govuk-radios__item">
+                            <input class="govuk-radios__input" id="overlap-option-2" name="OverlapOptions" type="radio" value="@OverlapOptions.ContactTheEmployer" aria-describedby="hint-saved-cohort">
+                            <label class="govuk-label govuk-radios__label" for="overlap-option-2">
+                                No, I’ll change the employer later
+                            </label>
+                            <div id="hint-saved-cohort" class="govuk-hint govuk-radios__hint">
+                                The details entered for this learner will not be saved. Go back to view learner details.
+                            </div>
+                        </div>
+                    </div>
+                </fieldset>
+            </div>    
+             <button class="govuk-button" type="submit" data-module="govuk-button">
+        Submit
+    </button>
+</form>           
+        
+    </div>
+</div>
+
+
+@section breadcrumb
+{
+    <div class="das-js-back-link"></div>
+}
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/IOuterApiService.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/IOuterApiService.cs
index 82e07daba..c54838156 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/IOuterApiService.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/IOuterApiService.cs
@@ -18,44 +18,81 @@ namespace SFA.DAS.ProviderCommitments.Interfaces;
 public interface IOuterApiService
 {
     Task<GetAccountLegalEntityQueryResult> GetAccountLegalEntity(long publicAccountLegalEntityId);
+
     Task<GetDraftApprenticeshipsResult> GetDraftApprenticeships(long cohortId);
+
     Task<GetCohortResult> GetCohort(long cohortId);
+
     Task<GetStandardResponse> GetStandardDetails(string courseCode);
+
     Task ValidateBulkUploadRequest(BulkUploadValidateApimRequest data);
+
     Task<BulkUploadAddAndApproveDraftApprenticeshipsResult> BulkUploadAddAndApproveDraftApprenticeships(BulkUploadAddAndApproveDraftApprenticeshipsRequest request);
+
     Task<GetBulkUploadAddDraftApprenticeshipsResult> BulkUploadDraftApprenticeships(BulkUploadAddDraftApprenticeshipsRequest request);
+
     Task CreateOverlappingTrainingDateRequest(CreateOverlappingTrainingDateApimRequest data);
+
     Task ValidateDraftApprenticeshipForOverlappingTrainingDateRequest(ValidateDraftApprenticeshipApimRequest data);
+
     Task<ValidateUlnOverlapOnStartDateQueryResult> ValidateUlnOverlapOnStartDate(long providerId, string uln, string startDate, string endDate);
+
     Task ValidateChangeOfEmployerOverlap(ValidateChangeOfEmployerOverlapApimRequest data);
+
     Task<GetOverlapRequestQueryResult> GetOverlapRequest(long apprenticeshipId);
+
     Task UpdateDraftApprenticeship(long cohortId, long apprenticeshipId, UpdateDraftApprenticeshipApimRequest request);
+
     Task<AddDraftApprenticeshipResponse> AddDraftApprenticeship(long cohortId, AddDraftApprenticeshipApimRequest request);
+
     Task<CreateCohortResponse> CreateCohort(CreateCohortApimRequest request);
+
     Task<GetPriorLearningDataQueryResult> GetPriorLearningData(long providerId, long cohortId, long draftApprenticeshipId);
+
     Task<CreatePriorLearningDataResponse> UpdatePriorLearningData(long providerId, long cohortId, long draftApprenticeshipId, CreatePriorLearningDataRequest request);
+
     Task<GetPriorLearningSummaryQueryResult> GetPriorLearningSummary(long providerId, long cohortId, long apprenticeshipId);
+
     Task<GetCohortDetailsResponse> GetCohortDetails(long providerId, long cohortId);
+
     Task<PostApprenticeshipsCSVResponse> GetApprenticeshipsCSV(PostApprenticeshipsCSVRequest request);
+
     /// <summary>
     /// CONTRACT TO GET THE PROVIDER STATUS FROM THE OUTER API.
     /// </summary>
     /// <param name="ukprn">provider id or ukprn.</param>
     /// <returns>ProviderAccountResponse</returns>
     Task<ProviderAccountResponse> GetProviderStatus(long ukprn);
+
     Task<long> CreateFileUploadLog(long providerId, IFormFile attachment, List<CsvRecord> csvRecords);
+
     Task AddValidationMessagesToFileUploadLog(long providerId, long fileUploadLogId, List<Infrastructure.OuterApi.ErrorHandling.BulkUploadValidationError> errors);
+
     Task AddUnhandledExceptionToFileUploadLog(long providerId, long fileUploadLogId, string errorMessage);
+
     Task<bool> HasPermission(long ukprn, long? accountLegalEntityId);
+
     Task<bool> HasRelationshipWithPermission(long? ukprn);
+
     Task<bool> CanAccessCohort(long providerId, long cohortId);
+
     Task<bool> CanAccessApprenticeship(long providerId, long apprenticeshipId);
+
     Task<GetLearnerDetailsForProviderResponse> GetLearnerDetailsForProvider(long providerId, SelectLearnersRequest request);
+
     Task<GetLearnerSelectedResponse> GetLearnerSelected(long providerId, long learnerId);
+
     Task<GetRplRequirementsResponse> GetRplRequirements(long providerId, long cohortId, long draftApprenticeshipId, string courseCode);
+
     Task<ValidateEditApprenticeshipResponse> EditApprenticeship(long providerId, long apprenticeshipId, ValidateEditApprenticeshipRequest request);
+
     Task<ConfirmEditApprenticeshipResponse> ConfirmEditApprenticeship(long providerId, long apprenticeshipId, ConfirmEditApprenticeshipRequest request);
-    Task<SyncLearnerDataResponse> SyncLearnerData(long providerId, long cohortId, long draftApprenticeshipId);   
+
+    Task<SyncLearnerDataResponse> SyncLearnerData(long providerId, long cohortId, long draftApprenticeshipId);
+
     Task DraftApprenticeshipSetReference(long providerId, long cohortId, long apprenticeshipId, DraftApprenticeshipSetReferenceApimRequest request);
+
     Task DraftApprenticeshipAddEmail(long providerId, long cohortId, long apprenticeshipId, DraftApprenticeAddEmailApimRequest request);
+
+    Task<GetApprenticeshipResponse> GetApprenticeship(long apprenticeshipId, long providerId);
 }
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/OuterApiService.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/OuterApiService.cs
index 3fe6d3f89..2287e034b 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/OuterApiService.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/OuterApiService.cs
@@ -123,12 +123,12 @@ public async Task UpdateDraftApprenticeship(long cohortId, long apprenticeshipId
 
     public Task DraftApprenticeshipAddEmail(long providerId, long cohortId, long apprenticeshipId, DraftApprenticeAddEmailApimRequest request)
     {
-       return outerApiClient.Put<object>(new DraftApprenticeAddEmailRequest(providerId, cohortId, apprenticeshipId) { Data = request });
+        return outerApiClient.Put<object>(new DraftApprenticeAddEmailRequest(providerId, cohortId, apprenticeshipId) { Data = request });
     }
 
-    public Task DraftApprenticeshipSetReference(long providerId, long cohortId, long apprenticeshipId, DraftApprenticeshipSetReferenceApimRequest request )
+    public Task DraftApprenticeshipSetReference(long providerId, long cohortId, long apprenticeshipId, DraftApprenticeshipSetReferenceApimRequest request)
     {
-       return outerApiClient.Put<object>(new PostDraftApprenticeshipSetReferenceRequest(providerId, cohortId, apprenticeshipId) { Data = request });
+        return outerApiClient.Put<object>(new PostDraftApprenticeshipSetReferenceRequest(providerId, cohortId, apprenticeshipId) { Data = request });
     }
 
     public async Task<AddDraftApprenticeshipResponse> AddDraftApprenticeship(long cohortId, AddDraftApprenticeshipApimRequest request)
@@ -325,4 +325,10 @@ public async Task<ConfirmEditApprenticeshipResponse> ConfirmEditApprenticeship(l
 
         return await outerApiClient.Post<ConfirmEditApprenticeshipResponse>(apiRequest);
     }
+
+    public async Task<GetApprenticeshipResponse> GetApprenticeship(long apprenticeshipId, long providerId)
+    {
+        var request = new GetApprenticeshipRequest(apprenticeshipId, providerId);
+        return await outerApiClient.Get<GetApprenticeshipResponse>(request);
+    }
 }
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Requests/Apprentices/GetApprenticeshipRequest.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Requests/Apprentices/GetApprenticeshipRequest.cs
new file mode 100644
index 000000000..4abea03a6
--- /dev/null
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Requests/Apprentices/GetApprenticeshipRequest.cs
@@ -0,0 +1,15 @@
+namespace SFA.DAS.ProviderCommitments.Infrastructure.OuterApi.Requests.Apprentices;
+
+public class GetApprenticeshipRequest : IGetApiRequest
+{
+    private readonly long _apprenticeshipId;
+    private readonly long _providerId;
+
+    public GetApprenticeshipRequest(long apprenticeshipId, long providerId)
+    {
+        _apprenticeshipId = apprenticeshipId;
+        _providerId = providerId;
+    }
+
+    public string GetUrl => $"/provider/{_providerId}/apprentices/{_apprenticeshipId}";
+}
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Responses/GetApprenticeshipResponse.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Responses/GetApprenticeshipResponse.cs
new file mode 100644
index 000000000..9b1fd803d
--- /dev/null
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Responses/GetApprenticeshipResponse.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Text.Json.Serialization;
+using Newtonsoft.Json.Converters;
+using SFA.DAS.Common.Domain.Types;
+
+namespace SFA.DAS.ProviderCommitments.Infrastructure.OuterApi.Responses;
+
+public class GetApprenticeshipResponse
+{
+    public long Id { get; set; }
+    public long CohortId { get; set; }
+    public long ProviderId { get; set; }
+    public string ProviderName { get; set; }
+    public long EmployerAccountId { get; set; }
+    public long AccountId => EmployerAccountId;
+    public long AccountLegalEntityId { get; set; }
+    public string EmployerName { get; set; }
+    public string FirstName { get; set; }
+    public string LastName { get; set; }
+    public string Email { get; set; }
+    public string Uln { get; set; }
+    public string CourseCode { get; set; }
+    public string StandardUId { get; set; }
+    public string Version { get; set; }
+    public string Option { get; set; }
+    public string CourseName { get; set; }
+    public string DeliveryModel { get; set; }
+    public DateTime? StartDate { get; set; }
+    public DateTime? ActualStartDate { get; set; }
+    public DateTime EndDate { get; set; }
+    public DateTime? DateOfBirth { get; set; }
+    public string EmployerReference { get; set; }
+    public string ProviderReference { get; set; }
+    public short Status { get; set; }
+    public DateTime? StopDate { get; set; }
+    public DateTime? PauseDate { get; set; }
+    public DateTime? CompletionDate { get; set; }
+    public string EndpointAssessorName { get; set; }
+    public bool HasHadDataLockSuccess { get; set; }
+    public long? ContinuationOfId { get; set; }
+    public long? ContinuedById { get; set; }
+    public DateTime? OriginalStartDate { get; set; }
+    public long? PreviousProviderId { get; set; }
+    public long? PreviousEmployerAccountId { get; set; }
+    public byte? ApprenticeshipEmployerTypeOnApproval { get; set; }
+    public bool? MadeRedundant { get; set; }
+    public short? ConfirmationStatus { get; set; }
+    public bool EmailAddressConfirmedByApprentice { get; set; }
+    public bool EmailShouldBePresent { get; set; }
+    public int? PledgeApplicationId { get; set; }
+    public int? EmploymentPrice { get; set; }
+    public DateTime? EmploymentEndDate { get; set; }
+    public bool? RecognisePriorLearning { get; set; }
+    public int? DurationReducedBy { get; set; }
+    public int? PriceReducedBy { get; set; }
+    public long? TransferSenderId { get; set; }
+    public int? DurationReducedByHours { get; set; }
+    public int? TrainingTotalHours { get; set; }
+    public bool? IsDurationReducedByRpl { get; set; }
+
+    [JsonConverter(typeof(StringEnumConverter))]
+    public LearningType? LearningType { get; set; }
+
+    public int? EmployerVerificationStatus { get; set; }
+    public string EmployerVerificationNotes { get; set; }
+    public bool HasChangeHistory { get; set; }
+    public int? WithdrawnReasonCode { get; set; }
+}
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Responses/GetOverlappingApprenticeshipDetailsQueryResult.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Responses/GetOverlappingApprenticeshipDetailsQueryResult.cs
index 5c65bcc77..a17a47666 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Responses/GetOverlappingApprenticeshipDetailsQueryResult.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Responses/GetOverlappingApprenticeshipDetailsQueryResult.cs
@@ -4,5 +4,6 @@ public class ValidateUlnOverlapOnStartDateQueryResult
     {
         public long? HasOverlapWithApprenticeshipId { get; set; }
         public bool HasStartDateOverlap { get; set; }
+        public bool? HasOverlapWithIlrWithdrawnApprenticeship { get; set; }
     }
-}
+}
\ No newline at end of file

From aaf35466480f26786cb121da7955bc87015fb4c2 Mon Sep 17 00:00:00 2001
From: skumardfe <Santhosh.KUMAR@education.gov.uk>
Date: Wed, 24 Jun 2026 22:34:40 +0100
Subject: [PATCH 2/7] refactor code

---
 .../OverlappingTrainingDateRequestControllerTestFixture.cs     | 3 +--
 .../Controllers/OverlappingTrainingDateRequestController.cs    | 3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/OverlappingTrainingDateRequestControllerTestFixture.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/OverlappingTrainingDateRequestControllerTestFixture.cs
index 11d032085..144dc5b25 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/OverlappingTrainingDateRequestControllerTestFixture.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/OverlappingTrainingDateRequestControllerTestFixture.cs
@@ -124,8 +124,7 @@ public OverlappingTrainingDateRequestControllerTestFixture()
                 Id = 1,
                 Status = ApprenticeshipStatus.Live
             };
-            // commitmentsApiClient.Setup(x => x.GetApprenticeship(It.IsAny<long>(), It.IsAny<CancellationToken>())).ReturnsAsync(() => _apprenticeshipDetails);
-
+            
             _outerApiService.Setup(x => x.GetApprenticeship(It.Is<long>(t => t == _draftApprenticeshipOverlapOptionRequest.ApprenticeshipId.Value),
                 It.Is<long>(t => t == _draftApprenticeshipOverlapOptionRequest.ProviderId))).ReturnsAsync(_getApprenticeshipResponse);
 
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Controllers/OverlappingTrainingDateRequestController.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Controllers/OverlappingTrainingDateRequestController.cs
index 5a9f22512..9caeda13f 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Controllers/OverlappingTrainingDateRequestController.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Controllers/OverlappingTrainingDateRequestController.cs
@@ -45,9 +45,6 @@ IOuterApiService outerApiService
         public async Task<IActionResult> OverlapOptionsForChangeEmployer(OverlapOptionsForChangeEmployerRequest request)
         {
             var apprenticeshipDetails = await _outerApiService.GetApprenticeship(request.ApprenticeshipId.Value, request.ProviderId);
-            DraftApprenticeshipViewModel model = request.ApprenticeshipHashedId == null
-               ? PeekStoredAddDraftApprenticeshipState()
-               : PeekStoredEditDraftApprenticeshipState();
 
             var viewModel = new OverlapOptionsForChangeEmployerViewModel
             {

From c524405a24b6be16b175c39e68e2746abb3c354c Mon Sep 17 00:00:00 2001
From: skumardfe <Santhosh.KUMAR@education.gov.uk>
Date: Thu, 25 Jun 2026 16:12:44 +0100
Subject: [PATCH 3/7] refactor code

---
 .../DraftApprenticeshipOverlapOptions.cshtml           |  5 +++++
 .../OverlapOptionsForChangeEmployer.cshtml             |  7 ++++++-
 .../_ChangeEmployerOverlapIlrWithdrawnPartial.cshtml   |  7 +------
 .../_DraftApprenticeshipOverlapOptionsPartial.cshtml   |  7 +------
 .../Views/Shared/_OverlapIlrWithdrawnPartial.cshtml    | 10 +++-------
 .../_OverlapOptionsForChangeEmployerPartial.cshtml     |  6 ------
 .../OuterApi/Responses/GetApprenticeshipResponse.cs    |  2 +-
 7 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/OverlappingTrainingDateRequest/DraftApprenticeshipOverlapOptions.cshtml b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/OverlappingTrainingDateRequest/DraftApprenticeshipOverlapOptions.cshtml
index 02c914d3b..2e67440c3 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/OverlappingTrainingDateRequest/DraftApprenticeshipOverlapOptions.cshtml
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/OverlappingTrainingDateRequest/DraftApprenticeshipOverlapOptions.cshtml
@@ -8,4 +8,9 @@
 else
 {
     <partial name="_DraftApprenticeshipOverlapOptionsPartial" />
+}
+
+@section breadcrumb
+{
+    <div class="das-js-back-link"></div>
 }
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/OverlappingTrainingDateRequest/OverlapOptionsForChangeEmployer.cshtml b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/OverlappingTrainingDateRequest/OverlapOptionsForChangeEmployer.cshtml
index 870de30f2..996aaae95 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/OverlappingTrainingDateRequest/OverlapOptionsForChangeEmployer.cshtml
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/OverlappingTrainingDateRequest/OverlapOptionsForChangeEmployer.cshtml
@@ -10,4 +10,9 @@
 else
 {
     <partial name="_OverlapOptionsForChangeEmployerPartial" />
-}   
\ No newline at end of file
+}   
+
+@section breadcrumb
+{
+    <div class="das-js-back-link"></div>
+}
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_ChangeEmployerOverlapIlrWithdrawnPartial.cshtml b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_ChangeEmployerOverlapIlrWithdrawnPartial.cshtml
index 254ddf6be..a7969e701 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_ChangeEmployerOverlapIlrWithdrawnPartial.cshtml
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_ChangeEmployerOverlapIlrWithdrawnPartial.cshtml
@@ -43,9 +43,4 @@
         <a id="link" class="govuk-link" href="@Url.RouteUrl(@RouteNames.ApprenticesIndex, new { Model.ProviderId })">Go back to Manage your learners</a>
            
     </div>
-</div>
-
-@section breadcrumb
-{
-    <div class="das-js-back-link"></div>
-}
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_DraftApprenticeshipOverlapOptionsPartial.cshtml b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_DraftApprenticeshipOverlapOptionsPartial.cshtml
index b39a1e03e..2060840b3 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_DraftApprenticeshipOverlapOptionsPartial.cshtml
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_DraftApprenticeshipOverlapOptionsPartial.cshtml
@@ -55,9 +55,4 @@
             </button>
         </form>
     </div>
-</div>
-     
-@section breadcrumb
-{
-    <div class="das-js-back-link"></div>
-}
+</div>
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_OverlapIlrWithdrawnPartial.cshtml b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_OverlapIlrWithdrawnPartial.cshtml
index 6d152754c..5ab3aac0b 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_OverlapIlrWithdrawnPartial.cshtml
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_OverlapIlrWithdrawnPartial.cshtml
@@ -12,7 +12,8 @@
     <div class="govuk-grid-column-two-thirds">
         <h1 class="govuk-heading-l">@ViewBag.Title</h1>
 
-        <form method="post">
+        <form method="post">            
+            @Html.HiddenFor(x=>x.HasWithdrawnStatusCode)
 
             <p>The learner's unique learner number (ULN) is already linked to a previous learner record which has been withdrawn through the ILR.</p>
         
@@ -49,9 +50,4 @@
         </form>
     </div>
            
-</div>
-
-@section breadcrumb
-{
-    <div class="das-js-back-link"></div>
-}
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_OverlapOptionsForChangeEmployerPartial.cshtml b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_OverlapOptionsForChangeEmployerPartial.cshtml
index 7df11edaf..fb2f15305 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_OverlapOptionsForChangeEmployerPartial.cshtml
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_OverlapOptionsForChangeEmployerPartial.cshtml
@@ -63,9 +63,3 @@
         
     </div>
 </div>
-
-
-@section breadcrumb
-{
-    <div class="das-js-back-link"></div>
-}
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Responses/GetApprenticeshipResponse.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Responses/GetApprenticeshipResponse.cs
index 9b1fd803d..0e7bdd869 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Responses/GetApprenticeshipResponse.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Responses/GetApprenticeshipResponse.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Text.Json.Serialization;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using SFA.DAS.Common.Domain.Types;
 

From 05a990e384565f39eee6465214569e7f3fa65f3c Mon Sep 17 00:00:00 2001
From: skumardfe <Santhosh.KUMAR@education.gov.uk>
Date: Thu, 25 Jun 2026 16:58:06 +0100
Subject: [PATCH 4/7] update models

---
 .../OuterApi/Responses/GetApprenticeshipResponse.cs            | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Responses/GetApprenticeshipResponse.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Responses/GetApprenticeshipResponse.cs
index 0e7bdd869..875633498 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Responses/GetApprenticeshipResponse.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Responses/GetApprenticeshipResponse.cs
@@ -65,4 +65,7 @@ public class GetApprenticeshipResponse
     public string EmployerVerificationNotes { get; set; }
     public bool HasChangeHistory { get; set; }
     public int? WithdrawnReasonCode { get; set; }
+    public bool FreezeStatus { get; set; }
+    public byte? FreezePaymentsReason { get; set; }
+    public DateTime? PaymentFreezeDate { get; set; }
 }
\ No newline at end of file

From aef3d5004b8d36db0e3b4bdd9a95bb916772319d Mon Sep 17 00:00:00 2001
From: skumardfe <Santhosh.KUMAR@education.gov.uk>
Date: Tue, 30 Jun 2026 18:59:21 +0100
Subject: [PATCH 5/7] Refactor code

---
 ...rainingDateRequestControllerTestFixture.cs | 35 ++++++++++++++++---
 ...WhenIGetOverlapOptionsForChangeEmployer.cs |  4 +--
 ...pOptionsForChangeEmployerViewModelTests.cs | 32 +++++++++++++++++
 ...verlappingTrainingDateRequestController.cs | 26 ++++++++++----
 .../Extensions/DateTimeExtensions.cs          | 17 +++++++--
 ...geOfEmployerOverlapAlertViewModelMapper.cs |  6 +++-
 ...verlapOptionsForChangeEmployerViewModel.cs |  5 +++
 .../Services/Cache/ChangeEmployerCacheItem.cs |  1 +
 .../OverlapOptionsForChangeEmployer.cshtml    | 17 +++------
 .../Shared/_OverlapIlrWithdrawnPartial.cshtml | 12 ++++---
 ...lappingApprenticeshipDetailsQueryResult.cs |  2 +-
 11 files changed, 124 insertions(+), 33 deletions(-)
 create mode 100644 src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Models/WhenGettingOverlapOptionsForChangeEmployerViewModelTests.cs

diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/OverlappingTrainingDateRequestControllerTestFixture.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/OverlappingTrainingDateRequestControllerTestFixture.cs
index 144dc5b25..291e10497 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/OverlappingTrainingDateRequestControllerTestFixture.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/OverlappingTrainingDateRequestControllerTestFixture.cs
@@ -8,11 +8,14 @@
 using SFA.DAS.CommitmentsV2.Types;
 using SFA.DAS.ProviderCommitments.Infrastructure.OuterApi.Requests.DraftApprenticeship;
 using SFA.DAS.ProviderCommitments.Infrastructure.OuterApi.Requests.OverlappingTrainingDateRequest;
+using SFA.DAS.ProviderCommitments.Infrastructure.OuterApi.Responses;
 using SFA.DAS.ProviderCommitments.Interfaces;
 using SFA.DAS.ProviderCommitments.Web.Authentication;
 using SFA.DAS.ProviderCommitments.Web.Controllers;
+using SFA.DAS.ProviderCommitments.Web.Extensions;
 using SFA.DAS.ProviderCommitments.Web.Models;
 using SFA.DAS.ProviderCommitments.Web.Models.OveralppingTrainingDate;
+using SFA.DAS.ProviderCommitments.Web.Services.Cache;
 using SFA.DAS.ProviderUrlHelper;
 using CreateCohortRequest = SFA.DAS.ProviderCommitments.Application.Commands.CreateCohort.CreateCohortRequest;
 using CreateCohortResponse = SFA.DAS.ProviderCommitments.Application.Commands.CreateCohort.CreateCohortResponse;
@@ -33,7 +36,7 @@ public class OverlappingTrainingDateRequestControllerTestFixture
         private readonly Mock<IOuterApiService> _outerApiService;
         private readonly DraftApprenticeshipOverlapOptionRequest _draftApprenticeshipOverlapOptionRequest;
         private readonly OverlapOptionsForChangeEmployerRequest _overlapOptionsForChangeEmployerRequest;
-        private GetApprenticeshipResponse _apprenticeshipDetails;
+        private CommitmentsV2.Api.Types.Responses.GetApprenticeshipResponse _apprenticeshipDetails;
 
         private readonly DraftApprenticeshipOverlapOptionWithPendingRequest _overlapRequest;
         private readonly DraftApprenticeshipOverlapOptionWithPendingRequestViewModel _overlapViewModel;
@@ -47,8 +50,14 @@ public class OverlappingTrainingDateRequestControllerTestFixture
         private readonly DraftApprenticeshipOverlapAlertRequest _draftApprenticeshipOverlapAlertRequest;
         private readonly UpdateDraftApprenticeshipApimRequest _updateDraftApprenticeshipRequest;
 
+        private readonly Mock<ICacheStorageService> _cacheStorageService;
+
         private readonly Infrastructure.OuterApi.Responses.GetApprenticeshipResponse _getApprenticeshipResponse;
 
+        private readonly ChangeEmployerCacheItem _changeEmployerCacheItem;
+
+        private readonly ValidateUlnOverlapOnStartDateQueryResult _validateUlnOverlapOnStartDateQueryResult;
+
         public OverlappingTrainingDateRequestControllerTestFixture()
         {
             _autoFixture = new Fixture();
@@ -58,10 +67,13 @@ public OverlappingTrainingDateRequestControllerTestFixture()
 
             var providerId = _autoFixture.Create<long>();
             var apprenticeShipId = _autoFixture.Create<long>();
+            _changeEmployerCacheItem = new ChangeEmployerCacheItem(Guid.NewGuid())
+            { StartDate = "052026", EndDate = "052027", Uln = "123456" };
 
             _draftApprenticeshipOverlapAlertRequest = _autoFixture.Create<DraftApprenticeshipOverlapAlertRequest>();
             _updateDraftApprenticeshipRequest = _autoFixture.Create<UpdateDraftApprenticeshipApimRequest>();
             _getApprenticeshipResponse = _autoFixture.Create<Infrastructure.OuterApi.Responses.GetApprenticeshipResponse>();
+            _cacheStorageService = new Mock<ICacheStorageService>();
 
             _model = new DraftApprenticeshipViewModel
             {
@@ -113,18 +125,23 @@ public OverlappingTrainingDateRequestControllerTestFixture()
             _outerApiService = new Mock<IOuterApiService>();
             var commitmentsApiClient = new Mock<ICommitmentsApiClient>();
             var validateUlnOverlapResult = new ValidateUlnOverlapResult();
+            _validateUlnOverlapOnStartDateQueryResult = new ValidateUlnOverlapOnStartDateQueryResult() { HasOverlapWithIlrWithdrawnApprenticeship = true, HasOverlapWithApprenticeshipId = _overlapOptionsForChangeEmployerRequest.ApprenticeshipId };
             commitmentsApiClient.Setup(x => x.ValidateUlnOverlap(It.IsAny<ValidateUlnOverlapRequest>(), It.IsAny<CancellationToken>())).ReturnsAsync(() => validateUlnOverlapResult);
+            _outerApiService.Setup(x => x.ValidateUlnOverlapOnStartDate(It.Is<long>(t => t == _overlapOptionsForChangeEmployerRequest.ProviderId),
+                It.Is<string>(t => t == _changeEmployerCacheItem.Uln), It.Is<string>(t => t == DateTimeExtensions.FormatMonthYearDateToDateFormat(_changeEmployerCacheItem.StartDate)),
+                It.Is<string>(t => t == DateTimeExtensions.FormatMonthYearDateToDateFormat(_changeEmployerCacheItem.EndDate))))
+                .ReturnsAsync(() => _validateUlnOverlapOnStartDateQueryResult);
 
             _mockModelMapper.Setup(x => x.Map<CreateOverlappingTrainingDateApimRequest>(It.IsAny<CreateCohortResponse>())).ReturnsAsync(() => new CreateOverlappingTrainingDateApimRequest());
             _mockModelMapper.Setup(x => x.Map<CreateCohortRequest>(It.IsAny<DraftApprenticeshipOverlapOptionViewModel>())).ReturnsAsync(() => new CreateCohortRequest());
             _mockModelMapper.Setup(x => x.Map<DraftApprenticeshipOverlapOptionViewModel>(It.IsAny<DraftApprenticeshipOverlapOptionRequest>())).ReturnsAsync(() => new DraftApprenticeshipOverlapOptionViewModel());
 
-            _apprenticeshipDetails = new GetApprenticeshipResponse()
+            _apprenticeshipDetails = new CommitmentsV2.Api.Types.Responses.GetApprenticeshipResponse()
             {
                 Id = 1,
                 Status = ApprenticeshipStatus.Live
             };
-            
+
             _outerApiService.Setup(x => x.GetApprenticeship(It.Is<long>(t => t == _draftApprenticeshipOverlapOptionRequest.ApprenticeshipId.Value),
                 It.Is<long>(t => t == _draftApprenticeshipOverlapOptionRequest.ProviderId))).ReturnsAsync(_getApprenticeshipResponse);
 
@@ -137,13 +154,17 @@ public OverlappingTrainingDateRequestControllerTestFixture()
             _changeOfEmployerNotifiedRequest = _autoFixture.Create<ChangeOfEmployerNotifiedRequest>();
             _changeOfEmployerNotifiedViewModel = _autoFixture.Create<ChangeOfEmployerNotifiedViewModel>();
 
+            _cacheStorageService.Setup(x => x.RetrieveFromCache<ChangeEmployerCacheItem>(It.IsAny<Guid>())).
+                ReturnsAsync(_changeEmployerCacheItem);
+
             _controller = new OverlappingTrainingDateRequestController(
                 mediator.Object,
                 _mockModelMapper.Object,
                 linkGenerator.Object,
                 commitmentsApiClient.Object,
                 Mock.Of<IAuthenticationService>(),
-                _outerApiService.Object
+                _outerApiService.Object,
+                _cacheStorageService.Object
                 );
             _controller.TempData = _tempData.Object;
         }
@@ -416,5 +437,11 @@ public OverlappingTrainingDateRequestControllerTestFixture SetupWithdrawnStatusC
             _getApprenticeshipResponse.WithdrawnReasonCode = statusCode;
             return this;
         }
+
+        public OverlappingTrainingDateRequestControllerTestFixture SetupHasOverlapWithIlrWithdrawnApprenticeship(bool value)
+        {
+            _validateUlnOverlapOnStartDateQueryResult.HasOverlapWithIlrWithdrawnApprenticeship = value;
+            return this;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/WhenIGetOverlapOptionsForChangeEmployer.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/WhenIGetOverlapOptionsForChangeEmployer.cs
index 19595b863..897c21045 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/WhenIGetOverlapOptionsForChangeEmployer.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/OverlappingTrainingDateRequestControllerTests/WhenIGetOverlapOptionsForChangeEmployer.cs
@@ -21,8 +21,8 @@ public async Task AndWhenGetDraftApprenticeshipOverlapOptionsChangeEmployerEndpo
         [Test]
         public async Task AndWhenGetDraftApprenticeshipOverlapOptionsChangeEmployerEndpointIsCalled_NotWithdrawnFromIlrPreviousApprenticeship_CorrectViewModelIsReturned()
         {
-            await _fixture.SetupWithdrawnStatusCode(null).GetOverlapOptionsForChangeEmployer();
+            await _fixture.SetupWithdrawnStatusCode(null).SetupHasOverlapWithIlrWithdrawnApprenticeship(false).GetOverlapOptionsForChangeEmployer();
             _fixture.VerifyOverlapOptionsForChangeEmployerViewModelViewReturnedWithNoWithdrawnReasonCode();
-        }
+        }       
     }
 }
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Models/WhenGettingOverlapOptionsForChangeEmployerViewModelTests.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Models/WhenGettingOverlapOptionsForChangeEmployerViewModelTests.cs
new file mode 100644
index 000000000..d8829a5ab
--- /dev/null
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Models/WhenGettingOverlapOptionsForChangeEmployerViewModelTests.cs
@@ -0,0 +1,32 @@
+using SFA.DAS.ProviderCommitments.Web.Models.OveralppingTrainingDate;
+
+namespace SFA.DAS.ProviderCommitments.Web.UnitTests.Models;
+
+public class WhenGettingOverlapOptionsForChangeEmployerViewModelTests
+{
+    [Test]
+    public void WhenHasWithdrawnReasonCode_ShouldSelectChangeEmployerOverlapIlrWithdrawnPartial()
+    {
+        // Arrange
+        var model = new OverlapOptionsForChangeEmployerViewModel { HasWithdrawnStatusCode = true };
+
+        // Act
+        string partialName = model.GetTargetPartialViewName();
+
+        // Assert
+        Assert.That(partialName, Is.EqualTo("_ChangeEmployerOverlapIlrWithdrawnPartial"));
+    }
+
+    [Test]
+    public void WhenHasWithdrawnReasonCode_ShouldSelectOverlapOptionsForChangeEmployerPartial()
+    {
+        // Arrange
+        var model = new OverlapOptionsForChangeEmployerViewModel { HasWithdrawnStatusCode = false };
+
+        // Act
+        string partialName = model.GetTargetPartialViewName();
+
+        // Assert
+        Assert.That(partialName, Is.EqualTo("_OverlapOptionsForChangeEmployerPartial"));
+    }
+}
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Controllers/OverlappingTrainingDateRequestController.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Controllers/OverlappingTrainingDateRequestController.cs
index 9caeda13f..a3a4dcacf 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Controllers/OverlappingTrainingDateRequestController.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Controllers/OverlappingTrainingDateRequestController.cs
@@ -4,12 +4,14 @@
 using SFA.DAS.ProviderCommitments.Application.Commands.CreateCohort;
 using SFA.DAS.ProviderCommitments.Infrastructure.OuterApi.Requests.DraftApprenticeship;
 using SFA.DAS.ProviderCommitments.Infrastructure.OuterApi.Requests.OverlappingTrainingDateRequest;
+using SFA.DAS.ProviderCommitments.Infrastructure.OuterApi.Responses;
 using SFA.DAS.ProviderCommitments.Interfaces;
 using SFA.DAS.ProviderCommitments.Web.Authentication;
 using SFA.DAS.ProviderCommitments.Web.Extensions;
 using SFA.DAS.ProviderCommitments.Web.Models;
 using SFA.DAS.ProviderCommitments.Web.Models.OveralppingTrainingDate;
 using SFA.DAS.ProviderCommitments.Web.RouteValues;
+using SFA.DAS.ProviderCommitments.Web.Services.Cache;
 using SFA.DAS.ProviderUrlHelper;
 
 namespace SFA.DAS.ProviderCommitments.Web.Controllers
@@ -23,14 +25,16 @@ public class OverlappingTrainingDateRequestController : Controller
         private readonly ICommitmentsApiClient _commitmentsApiClient;
         private readonly IAuthenticationService _authenticationService;
         private readonly IOuterApiService _outerApiService;
+        private readonly ICacheStorageService _cacheStorage;
 
         public OverlappingTrainingDateRequestController(IMediator mediator,
             IModelMapper modelMapper,
             ILinkGenerator urlHelper,
             ICommitmentsApiClient commitmentsApiClient,
             IAuthenticationService authenticationService,
-            IOuterApiService outerApiService
-            )
+            IOuterApiService outerApiService,
+            ICacheStorageService cacheStorage)
+
         {
             _mediator = mediator;
             _modelMapper = modelMapper;
@@ -38,13 +42,23 @@ IOuterApiService outerApiService
             _commitmentsApiClient = commitmentsApiClient;
             _authenticationService = authenticationService;
             _outerApiService = outerApiService;
+            _cacheStorage = cacheStorage;
         }
 
         [HttpGet]
         [Route("overlap-options-change-employer")]
         public async Task<IActionResult> OverlapOptionsForChangeEmployer(OverlapOptionsForChangeEmployerRequest request)
         {
-            var apprenticeshipDetails = await _outerApiService.GetApprenticeship(request.ApprenticeshipId.Value, request.ProviderId);
+            GetApprenticeshipResponse apprenticeshipDetails = new GetApprenticeshipResponse();
+
+            var cacheItem = await _cacheStorage.RetrieveFromCache<ChangeEmployerCacheItem>(request.CacheKey);
+
+            var validateUlnStartDateOverlapResponse = await _outerApiService.ValidateUlnOverlapOnStartDate(request.ProviderId, cacheItem.Uln, DateTimeExtensions.FormatMonthYearDateToDateFormat(cacheItem.StartDate), DateTimeExtensions.FormatMonthYearDateToDateFormat(cacheItem.EndDate));
+
+            if (validateUlnStartDateOverlapResponse.HasOverlapWithIlrWithdrawnApprenticeship)
+            {
+                apprenticeshipDetails = await _outerApiService.GetApprenticeship(validateUlnStartDateOverlapResponse.HasOverlapWithApprenticeshipId.Value, request.ProviderId);
+            }
 
             var viewModel = new OverlapOptionsForChangeEmployerViewModel
             {
@@ -54,9 +68,9 @@ public async Task<IActionResult> OverlapOptionsForChangeEmployer(OverlapOptionsF
                 ProviderId = request.ProviderId,
                 CacheKey = request.CacheKey,
                 Status = request.Status,
-                HasWithdrawnStatusCode = apprenticeshipDetails.WithdrawnReasonCode.HasValue,
-                IsSameProvider = apprenticeshipDetails.ProviderId == request.ProviderId,
-                ProviderName = apprenticeshipDetails.ProviderName
+                HasWithdrawnStatusCode = validateUlnStartDateOverlapResponse.HasOverlapWithIlrWithdrawnApprenticeship,
+                IsSameProvider = apprenticeshipDetails?.ProviderId == request.ProviderId,
+                ProviderName = apprenticeshipDetails?.ProviderName
             };
 
             return View(viewModel);
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Extensions/DateTimeExtensions.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Extensions/DateTimeExtensions.cs
index 792998967..0194e4c60 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Extensions/DateTimeExtensions.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Extensions/DateTimeExtensions.cs
@@ -1,4 +1,7 @@
-namespace SFA.DAS.ProviderCommitments.Web.Extensions
+using System.Globalization;
+using SFA.DAS.ProviderCommitments.Web.Services.Cache;
+
+namespace SFA.DAS.ProviderCommitments.Web.Extensions
 {
     public static class DateTimeExtensions
     {
@@ -8,6 +11,7 @@ public static class DateTimeExtensions
 
             return new DateTime(dateValue.Value.Year, dateValue.Value.Month, 1).Date;
         }
+
         public static string ToGdsHumanisedDate(this DateTime date)
         {
             string ordinal;
@@ -19,14 +23,17 @@ public static string ToGdsHumanisedDate(this DateTime date)
                 case 31:
                     ordinal = "st";
                     break;
+
                 case 2:
                 case 22:
                     ordinal = "nd";
                     break;
+
                 case 3:
                 case 23:
                     ordinal = "rd";
                     break;
+
                 default:
                     ordinal = "th";
                     break;
@@ -35,5 +42,11 @@ public static string ToGdsHumanisedDate(this DateTime date)
             // Eg 12th January 2024
             return string.Format("{0}{1} {2:MMMM yyyy}", date.Day, ordinal, date);
         }
+
+        public static string FormatMonthYearDateToDateFormat(string date)
+        {
+            var formatDate = DateTime.ParseExact(date, "MMyyyy", CultureInfo.InvariantCulture);
+            return formatDate.ToString("dd-MM-yyyy");
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Mappers/Apprentice/ChangeOfEmployerOverlapAlertViewModelMapper.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Mappers/Apprentice/ChangeOfEmployerOverlapAlertViewModelMapper.cs
index 210b5cbe5..ee1fa1f59 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Mappers/Apprentice/ChangeOfEmployerOverlapAlertViewModelMapper.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Mappers/Apprentice/ChangeOfEmployerOverlapAlertViewModelMapper.cs
@@ -1,4 +1,5 @@
-using SFA.DAS.CommitmentsV2.Shared.Interfaces;
+using OpenTelemetry.Resources;
+using SFA.DAS.CommitmentsV2.Shared.Interfaces;
 using SFA.DAS.CommitmentsV2.Shared.Models;
 using SFA.DAS.CommitmentsV2.Types;
 using SFA.DAS.Encoding;
@@ -38,6 +39,9 @@ public async Task<ChangeOfEmployerOverlapAlertViewModel> Map(ChangeOfEmployerOve
             var cacheItem = await _cacheStorage.RetrieveFromCache<ChangeEmployerCacheItem>(source.CacheKey);
 
             var data = await GetApprenticeshipData(source.ProviderId, source.ApprenticeshipId, cacheItem.AccountLegalEntityId);
+            
+            cacheItem.Uln = data.Apprenticeship.Uln;
+            await _cacheStorage.SaveToCache<ChangeEmployerCacheItem>(source.CacheKey.ToString(), cacheItem, TimeSpan.FromHours(1));
 
             var newStartDate = new MonthYearModel(cacheItem.StartDate);
             var newEndDate = new MonthYearModel(cacheItem.EndDate);
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Models/OveralppingTrainingDate/OverlapOptionsForChangeEmployerViewModel.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Models/OveralppingTrainingDate/OverlapOptionsForChangeEmployerViewModel.cs
index 0813dd165..dc45c0b32 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Models/OveralppingTrainingDate/OverlapOptionsForChangeEmployerViewModel.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Models/OveralppingTrainingDate/OverlapOptionsForChangeEmployerViewModel.cs
@@ -5,5 +5,10 @@ public class OverlapOptionsForChangeEmployerViewModel : DraftApprenticeshipOverl
         public Guid CacheKey { get; set; }
         public string ApprenticeshipHashedId { get; set; }
         public long? ApprenticeshipId { get; set; }
+
+        public string GetTargetPartialViewName()
+        {
+            return HasWithdrawnStatusCode ? "_ChangeEmployerOverlapIlrWithdrawnPartial" : "_OverlapOptionsForChangeEmployerPartial";
+        }
     }
 }
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Services/Cache/ChangeEmployerCacheItem.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Services/Cache/ChangeEmployerCacheItem.cs
index 4b9c44104..4ac6973e7 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Services/Cache/ChangeEmployerCacheItem.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Services/Cache/ChangeEmployerCacheItem.cs
@@ -21,5 +21,6 @@ public ChangeEmployerCacheItem(Guid key)
         public string EmploymentEndDate { get; set; }
         public int? Price { get; set; }
         public int? EmploymentPrice { get; set; }
+        public string Uln { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/OverlappingTrainingDateRequest/OverlapOptionsForChangeEmployer.cshtml b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/OverlappingTrainingDateRequest/OverlapOptionsForChangeEmployer.cshtml
index 996aaae95..fdc522b59 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/OverlappingTrainingDateRequest/OverlapOptionsForChangeEmployer.cshtml
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/OverlappingTrainingDateRequest/OverlapOptionsForChangeEmployer.cshtml
@@ -3,16 +3,9 @@
 @using SFA.DAS.CommitmentsV2.Types;
 @model OverlapOptionsForChangeEmployerViewModel
 
-@if (Model.HasWithdrawnStatusCode)
-{   
-    <partial name="_ChangeEmployerOverlapIlrWithdrawnPartial" model="Model" />
-}
-else
-{
-    <partial name="_OverlapOptionsForChangeEmployerPartial" />
-}   
+<partial name="@Model.GetTargetPartialViewName()" model="Model"></partial>
 
-@section breadcrumb
-{
-    <div class="das-js-back-link"></div>
-}
\ No newline at end of file
+    @section breadcrumb
+    {
+        <div class="das-js-back-link"></div>
+    }
\ No newline at end of file
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_OverlapIlrWithdrawnPartial.cshtml b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_OverlapIlrWithdrawnPartial.cshtml
index 5ab3aac0b..6154ddd68 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_OverlapIlrWithdrawnPartial.cshtml
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Views/Shared/_OverlapIlrWithdrawnPartial.cshtml
@@ -5,15 +5,18 @@
 
 @{
     ViewBag.Title = "Planned start date overlaps with existing training";
-    ViewBag.GaData.Vpv = "/unapproved/add/apprenticeship/overlap-options-change-employer";
+    ViewBag.GaData.Vpv = "/unapproved/add/apprenticeship/overlap-options";
 }
 
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
         <h1 class="govuk-heading-l">@ViewBag.Title</h1>
 
-        <form method="post">            
-            @Html.HiddenFor(x=>x.HasWithdrawnStatusCode)
+        <form method="post">
+            @Html.HiddenFor(x => x.HasWithdrawnStatusCode)
+            @Html.HiddenFor(x => x.DraftApprenticeshipHashedId)
+            @Html.HiddenFor(x => x.CohortReference)
+            @Html.HiddenFor(x => x.ProviderId)
 
             <p>The learner's unique learner number (ULN) is already linked to a previous learner record which has been withdrawn through the ILR.</p>
         
@@ -42,10 +45,9 @@
                     </div>
                 }
             </div>
-
          
             <button class="govuk-button" type="submit" data-module="govuk-button">
-                Submit
+                save and return to cohort
             </button>
         </form>
     </div>
diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Responses/GetOverlappingApprenticeshipDetailsQueryResult.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Responses/GetOverlappingApprenticeshipDetailsQueryResult.cs
index a17a47666..299d8a19a 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Responses/GetOverlappingApprenticeshipDetailsQueryResult.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Responses/GetOverlappingApprenticeshipDetailsQueryResult.cs
@@ -4,6 +4,6 @@ public class ValidateUlnOverlapOnStartDateQueryResult
     {
         public long? HasOverlapWithApprenticeshipId { get; set; }
         public bool HasStartDateOverlap { get; set; }
-        public bool? HasOverlapWithIlrWithdrawnApprenticeship { get; set; }
+        public bool HasOverlapWithIlrWithdrawnApprenticeship { get; set; }
     }
 }
\ No newline at end of file

From 3314ad3ec15b5b54876f890b02a4cca38ff7af04 Mon Sep 17 00:00:00 2001
From: skumardfe <Santhosh.KUMAR@education.gov.uk>
Date: Fri, 10 Jul 2026 11:56:52 +0100
Subject: [PATCH 6/7] Refactor code

---
 .../OverlappingTrainingDateRequestController.cs            | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Controllers/OverlappingTrainingDateRequestController.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Controllers/OverlappingTrainingDateRequestController.cs
index a3a4dcacf..35c4d9ea6 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Controllers/OverlappingTrainingDateRequestController.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Controllers/OverlappingTrainingDateRequestController.cs
@@ -50,15 +50,14 @@ public OverlappingTrainingDateRequestController(IMediator mediator,
         public async Task<IActionResult> OverlapOptionsForChangeEmployer(OverlapOptionsForChangeEmployerRequest request)
         {
             GetApprenticeshipResponse apprenticeshipDetails = new GetApprenticeshipResponse();
-
             var cacheItem = await _cacheStorage.RetrieveFromCache<ChangeEmployerCacheItem>(request.CacheKey);
 
             var validateUlnStartDateOverlapResponse = await _outerApiService.ValidateUlnOverlapOnStartDate(request.ProviderId, cacheItem.Uln, DateTimeExtensions.FormatMonthYearDateToDateFormat(cacheItem.StartDate), DateTimeExtensions.FormatMonthYearDateToDateFormat(cacheItem.EndDate));
 
-            if (validateUlnStartDateOverlapResponse.HasOverlapWithIlrWithdrawnApprenticeship)
+            if(validateUlnStartDateOverlapResponse.HasOverlapWithApprenticeshipId.HasValue)
             {
                 apprenticeshipDetails = await _outerApiService.GetApprenticeship(validateUlnStartDateOverlapResponse.HasOverlapWithApprenticeshipId.Value, request.ProviderId);
-            }
+            }            
 
             var viewModel = new OverlapOptionsForChangeEmployerViewModel
             {
@@ -68,7 +67,7 @@ public async Task<IActionResult> OverlapOptionsForChangeEmployer(OverlapOptionsF
                 ProviderId = request.ProviderId,
                 CacheKey = request.CacheKey,
                 Status = request.Status,
-                HasWithdrawnStatusCode = validateUlnStartDateOverlapResponse.HasOverlapWithIlrWithdrawnApprenticeship,
+                HasWithdrawnStatusCode = apprenticeshipDetails?.WithdrawnReasonCode.HasValue ?? false,
                 IsSameProvider = apprenticeshipDetails?.ProviderId == request.ProviderId,
                 ProviderName = apprenticeshipDetails?.ProviderName
             };

From c490a32f4ced16cc67c7782ba23ac5eb1a01f53f Mon Sep 17 00:00:00 2001
From: skumardfe <Santhosh.KUMAR@education.gov.uk>
Date: Thu, 6 Aug 2026 16:46:56 +0100
Subject: [PATCH 7/7] update url

---
 .../OuterApi/Requests/Apprentices/GetApprenticeshipRequest.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Requests/Apprentices/GetApprenticeshipRequest.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Requests/Apprentices/GetApprenticeshipRequest.cs
index 4abea03a6..59477cb53 100644
--- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Requests/Apprentices/GetApprenticeshipRequest.cs
+++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Requests/Apprentices/GetApprenticeshipRequest.cs
@@ -11,5 +11,5 @@ public GetApprenticeshipRequest(long apprenticeshipId, long providerId)
         _providerId = providerId;
     }
 
-    public string GetUrl => $"/provider/{_providerId}/apprentices/{_apprenticeshipId}";
+    public string GetUrl => $"provider/{_providerId}/apprentices/{_apprenticeshipId}";
 }
\ No newline at end of file