From 1e632ead4e4cc8938edb7006798568abbaf764c9 Mon Sep 17 00:00:00 2001 From: Gowtham M Date: Wed, 4 Mar 2026 14:47:06 +0530 Subject: [PATCH] GWM : endorsement excel changes --- app/Controllers/EndorsementController.php | 15 +++++++- app/Controllers/ExcelExportController.php | 42 ++++++++++++++++------- 2 files changed, 43 insertions(+), 14 deletions(-) diff --git a/app/Controllers/EndorsementController.php b/app/Controllers/EndorsementController.php index 07850c1..92f2594 100644 --- a/app/Controllers/EndorsementController.php +++ b/app/Controllers/EndorsementController.php @@ -6,6 +6,7 @@ use App\Models\EndorsementModel; use App\Models\PolicyModel; use App\Models\EnquiryModel; use App\Models\QuotationModel; +use App\Models\StaffModel; use CodeIgniter\RESTful\ResourceController; class EndorsementController extends ResourceController @@ -15,6 +16,7 @@ class EndorsementController extends ResourceController protected $PolicyModel; protected $QuotationModel; protected $EnquiryModel; + protected $StaffModel; public function __construct() { @@ -23,6 +25,7 @@ class EndorsementController extends ResourceController $this->PolicyModel = new PolicyModel(); $this->QuotationModel = new QuotationModel(); $this->EnquiryModel = new EnquiryModel(); + $this->StaffModel = new StaffModel(); } @@ -360,7 +363,17 @@ class EndorsementController extends ResourceController $updateData['updated_by'] = $reqData['updated_by'] ?? null; - $updateData['is_data_accuracy_checked'] = 1; + if (!empty($updateData['updated_by'])) { + + $staff = $this->StaffModel + ->select('role_id') + ->where('id', $updateData['updated_by']) + ->first(); + + if (!empty($staff) && $staff['role_id'] == 4) { + $updateData['is_data_accuracy_checked'] = 1; + } + } /** * =========================== diff --git a/app/Controllers/ExcelExportController.php b/app/Controllers/ExcelExportController.php index 30dc8cd..4defb8f 100644 --- a/app/Controllers/ExcelExportController.php +++ b/app/Controllers/ExcelExportController.php @@ -1534,15 +1534,22 @@ class ExcelExportController extends ResourceController // Define column headers - $header = ['S.No', 'Internal/External', - 'Date','Partner', - 'Insurer','Staff', - 'Reg.No','Policy No', - 'Type of Endorsement', - 'Contact Person', - 'Financial/Non-Financial', - 'Pending Days','Remarks', - 'End. Premium' + $header = [ + 'S.No', + 'Created Date', + 'Internal/External', + 'Created By', + 'Policy Number', + 'Vehicle No', + 'Type Of Endorsement', + 'Endorsement Number', + 'Insured Name', + 'Insurer', + 'Broker', + 'Contact Person', + 'Remarks', + 'Endorsement Premium Amount', + 'Commission Amount' ]; $finalData = []; @@ -2449,14 +2456,22 @@ class ExcelExportController extends ResourceController try { $sql = "SELECT - per.policy_from, DATE_FORMAT(per.created_at, '%d-%m-%Y %h:%i %p') AS received_date, - I.name AS insurer_name, - pa.name AS agent_name, + per.policy_from, ps.name AS staff_name, - pe.reg_no, CONCAT('`', pp.policy_number) AS policy_number, + pe.reg_no, petm.endorsement_type AS endorsement_type, + per.endorsement_no, + per.insured_name, + I.name AS insurer_name, + pb.name AS broker_name, + per.contact_person, + per.endorsement_description, + per.endorsement_premium, + per.commission_amount, + + pa.name AS agent_name, per.contact_person, per.financia_or_non_financial, per.pending_days, @@ -2470,6 +2485,7 @@ class ExcelExportController extends ResourceController LEFT JOIN partner_staff ps ON ps.id = pe.assigned_to LEFT JOIN insurers I ON I.id = pe.insurer_id LEFT JOIN partner_endorsement_type_master petm ON petm.id = per.endorsement_type + LEFT JOIN partner_brokers pb ON pb.id = per.broker_id WHERE per.manager_id = ? AND per.is_active = 1";