diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php index bbdabd87..b031e487 100755 --- a/app/Controllers/EmployeeController.php +++ b/app/Controllers/EmployeeController.php @@ -335,20 +335,46 @@ class EmployeeController extends AdminController ->find(); // dd($data['fileList']); - $data['batch_list'] = $this->batchFileModel->select( - 'batch_files.*, + $data['batch_list'] = $this->batchFileModel->select(" + + batch_files.id, + batch_files.client_id, + batch_files.client_policy_id, + batch_files.batch_code, + batch_files.file_name, + batch_files.insurer_or_tpa, + batch_files.event_type, + batch_files.actions, + batch_files.count, + batch_files.created_by, + batch_files.created_at, + batch_files.updated_by, + batch_files.updated_at, + batch_files.is_active, + batch_files.amount, + batch_files.status, + batch_files.client_branch_id, + + CASE + WHEN batch_files.status = 'partially success' THEN + batch_files.error_data + ELSE + error_data = null + END AS error_data, + clients.short_name as client_short_name, client_branch.branch_name, client_policy.policy_no, policy_type.policy_type - ') - ->join('client_policy', 'client_policy.id = batch_files.client_policy_id') - ->join('client_branch', 'client_branch.id = batch_files.client_branch_id') - ->join('policy_type', 'policy_type.id = client_policy.policy_type_id') - ->join('clients', 'clients.id = client_policy.client_id') - ->orderBy('batch_files.id', 'desc') - ->limit(100) - ->find(); + + ") + ->join('client_policy', 'client_policy.id = batch_files.client_policy_id') + ->join('client_branch', 'client_branch.id = batch_files.client_branch_id') + ->join('policy_type', 'policy_type.id = client_policy.policy_type_id') + ->join('clients', 'clients.id = client_policy.client_id') + ->orderBy('batch_files.id', 'desc') + ->limit(100) + ->find(); // dd($data['fileList']);die();