From 0d31583ca94755714f2cbf8fb78268ef55c37d5e Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Thu, 4 May 2023 16:25:37 +0530 Subject: [PATCH] Completed On : ps --- api/application/controllers/PD_Controller.php | 1 + .../controllers/SMC_Credit_PD_Controller.php | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 916debcd..40c9a222 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -9926,6 +9926,7 @@ class PD_Controller extends REST_Controller if ($smc_lender_id == $current_lender_id && isset($agency_id) && $agency_id != null && $records['is_smc_vendor'] == true) { if (isset($records['vendor_status']) && ($records['vendor_status'] == QC_COMPLETED)) { $fields_to_update['pd_status'] = COMPLETED; //Here vendor_status is (QC_COMPLETED) means i have to update the Normal Status as COMPLETED. + $fields_to_update['completed_on'] = date('Y-m-d H:i:s'); $this->load->helper('smc_creditpd'); if(isset($records['random_string'])){ $random_string = $records['random_string']; diff --git a/api/application/controllers/SMC_Credit_PD_Controller.php b/api/application/controllers/SMC_Credit_PD_Controller.php index 04be13a1..98d67688 100644 --- a/api/application/controllers/SMC_Credit_PD_Controller.php +++ b/api/application/controllers/SMC_Credit_PD_Controller.php @@ -1406,7 +1406,9 @@ class SMC_Credit_PD_Controller extends REST_Controller { //Dont Delete below Select Statement Because 3rd dec22 MIS Officer Name REPORTED by Venkat //$this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.pd_sno, PDTYPE.type_name, PDTRIGGER.lender_applicant_id, PDTRIGGER.fk_product_id, PRODUCT.abbr, PDTRIGGER.pd_status, PDAPPLICANTSDETAILS.applicant_name, (SELECT createdon FROM h_common_masters where PDTRIGGER.pd_id = primary_key AND field_name = "pd_status" order by log_id DESC limit 1) as updatedon, (SELECT concat(m_user_profile.first_name," " ,m_user_profile.last_name) FROM h_common_masters JOIN m_user_profile on h_common_masters.new_value = m_user_profile.userid where PDTRIGGER.pd_id = primary_key AND field_name = "fk_pd_allocated_to" order by log_id DESC limit 1) as officer_name,PDTRIGGER.mis_report_remarks,PDTRIGGER.vendor_status,PDTRIGGER.fk_city,CITY.name as city_name'); - $this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.pd_sno, PDTYPE.type_name, PDTRIGGER.lender_applicant_id, PDTRIGGER.fk_product_id, PRODUCT.abbr, PDTRIGGER.pd_status, PDAPPLICANTSDETAILS.applicant_name, (SELECT createdon FROM h_common_masters where PDTRIGGER.pd_id = primary_key AND field_name = "pd_status" order by log_id DESC limit 1) as updatedon,PDTRIGGER.mis_report_remarks,PDTRIGGER.vendor_status,PDTRIGGER.fk_city,CITY.name as city_name'); + $this->db->SELECT('PDTRIGGER.pd_id, PDTRIGGER.pd_sno, PDTYPE.type_name, PDTRIGGER.lender_applicant_id, PDTRIGGER.fk_product_id, PRODUCT.abbr, PDTRIGGER.pd_status, PDAPPLICANTSDETAILS.applicant_name, + (SELECT createdon FROM h_common_masters where PDTRIGGER.pd_id = primary_key AND field_name = "pd_status" order by log_id DESC limit 1) as updatedon, + PDTRIGGER.mis_report_remarks,PDTRIGGER.vendor_status,PDTRIGGER.fk_city,CITY.name as city_name'); $this->db->SELECT('(SELECT GROUP_CONCAT(concat(m_user_profile.first_name, " ", m_user_profile.last_name,"(",DATE_FORMAT(h_common_masters.createdon, "%d-%m-%Y %r"),") ")) FROM h_common_masters JOIN m_user_profile on h_common_masters.fk_createdby = m_user_profile.userid where PDTRIGGER.pd_id = h_common_masters.primary_key and field_name = "video_call_initiate_user" order by log_id DESC) as video_call_initiate_user, (SELECT count(log_id) FROM h_common_masters where PDTRIGGER.pd_id = h_common_masters.primary_key and field_name = "video_call_initiate_user") as total_video'); $this->db->SELECT('concat(ifnull(mup.first_name, mup1.first_name)," ",ifnull(mup.last_name, mup1.last_name)) AS officer_name'); $this->db->FROM(PDTRIGGER.' as PDTRIGGER'); @@ -1423,14 +1425,14 @@ class SMC_Credit_PD_Controller extends REST_Controller { if($from_date) { - //$this->db->WHERE('date(PDTRIGGER.updatedon) >=',$from_date); - $this->db->WHERE('date(PDTRIGGER.completed_on) >=',$from_date); + $this->db->WHERE('date(PDTRIGGER.updatedon) >=',$from_date); + // $this->db->WHERE('date(PDTRIGGER.completed_on) >=',$from_date); } if($to_date) { - //$this->db->WHERE('date(PDTRIGGER.updatedon) <=',$to_date); - $this->db->WHERE('date(PDTRIGGER.completed_on) <=',$to_date); + $this->db->WHERE('date(PDTRIGGER.updatedon) <=',$to_date); + // $this->db->WHERE('date(PDTRIGGER.completed_on) <=',$to_date); } if($officer_name)