From 63e4200281b5146850667584fe345f5974bc1cd3 Mon Sep 17 00:00:00 2001 From: sriramv Date: Mon, 22 Apr 2024 08:28:40 +0530 Subject: [PATCH] 'FIX_EMP_MODULE_EXPORT_IMPORT_INCEPTION_RV' --- app/Controllers/EmpDataServiceController.php | 11 +++++++++-- app/Controllers/EmployeeController.php | 10 ++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/app/Controllers/EmpDataServiceController.php b/app/Controllers/EmpDataServiceController.php index 18106a1d..80095b64 100644 --- a/app/Controllers/EmpDataServiceController.php +++ b/app/Controllers/EmpDataServiceController.php @@ -618,9 +618,16 @@ class EmpDataServiceController extends BaseController foreach ($empty_emp_tpa_uh_ids as $key => $id) { - $dataToUpdate = ['tpa_id' => $tpa_id[$key], 'uhid' => $uhid[$key]]; + $dataToUpdateTPAID = ['tpa_id' => $tpa_id[$key]]; + $dataToUpdateUHID = ['uhid' => $uhid[$key]]; + $this->employeePolicyModel->where('id', $id) - ->set($dataToUpdate)->update(); + ->where('(employee_polices.tpa_id IS NULL OR employee_polices.tpa_id = "")') + ->set($dataToUpdateTPAID)->update(); + + $this->employeePolicyModel->where('id', $id) + ->where('(employee_polices.uhid IS NULL OR employee_polices.uhid = "")') + ->set($dataToUpdateUHID)->update(); } diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php index 1871fab0..4a029f00 100644 --- a/app/Controllers/EmployeeController.php +++ b/app/Controllers/EmployeeController.php @@ -351,8 +351,14 @@ class EmployeeController extends AdminController $return = $empDataServiceController->generateExcelForAdditionandInception($batch_data); if(!$return){ - session()->setFlashdata('error', 'No data found about this action'); - return redirect()->to(base_url('employee/upload')); + if($insurer_or_tpa == 'tpa'){ + session()->setFlashdata('error', "No data was found for this action. The TPA ID has already been updated."); + return redirect()->to(base_url('employee/upload')); + + }else if($insurer_or_tpa == 'insurer'){ + session()->setFlashdata('error', "No data was found for this action. The UHID has already been updated."); + return redirect()->to(base_url('employee/upload')); + } } else{ $this->myLogger->logme('error','Successfully exported Excel file in {data}.', ['data' => $event_type]); }