From c0ccf33aa093837d25a8c054759535b0c21e27e0 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 19 Feb 2019 16:29:48 +0530 Subject: [PATCH] issue no :1664 --- .../api/application/models/Reports_model.php | 48 ++++++++++++++----- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index b584604c..41c13a88 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -1120,29 +1120,51 @@ from T_Lead_Tracking_Followup as ltf // die(); -$subQuery="SELECT T_StudentDetails.StudentID,T_Student_CourseDetails.DOJ,T_Students_Fees_PaidDetails.BillDate,BatchName,CourseName ,T_Student_CourseDetails.UniversityID, T_Student_CourseDetails.CourseID, T_StudentDetails.Firstname,T_StudentDetails.Lastname,T_StudentDetails. MobileNumber, T_StudentDetails.Fathername,CourseName,ReferredBy,ReferersMobileNumber,T_StaffDetails.Firstname as Fname,T_StaffDetails.Lastname as Lname,Sem_Year,UniversityName FROM T_Student_CourseDetails +// $subQuery="SELECT T_StudentDetails.StudentID,T_Student_CourseDetails.DOJ,T_Students_Fees_PaidDetails.BillDate,BatchName,CourseName ,T_Student_CourseDetails.UniversityID, T_Student_CourseDetails.CourseID, T_StudentDetails.Firstname,T_StudentDetails.Lastname,T_StudentDetails. MobileNumber, T_StudentDetails.Fathername,CourseName,ReferredBy,ReferersMobileNumber,T_StaffDetails.Firstname as Fname,T_StaffDetails.Lastname as Lname,Sem_Year,UniversityName FROM T_Student_CourseDetails +// JOIN T_StudentDetails ON T_StudentDetails.StudentID=T_Student_CourseDetails.StudentID +// JOIN T_UniversityMaster ON T_UniversityMaster.UniversityID=T_Student_CourseDetails.UniversityID +// JOIN T_CourseMaster ON T_CourseMaster.CourseID=T_Student_CourseDetails.CourseID +// join T_Students_Fees_PaidDetails ON T_Students_Fees_PaidDetails.StudentID = T_StudentDetails.StudentID +// left JOIN T_Registration_Details ON T_Registration_Details.CourseID = T_Student_CourseDetails.CourseID and T_Registration_Details.StudentID=T_Student_CourseDetails.StudentID +// left JOIN T_BatchMaster ON T_BatchMaster.BatchCode = T_Registration_Details.BatchCode +// left JOIN T_StaffDetails ON T_StaffDetails.StaffID = T_StudentDetails.AdmittedBy +// left JOIN T_Course_Fees_Details on T_Course_Fees_Details.ID=T_Registration_Details.FeeType and T_Course_Fees_Details.CourseID=T_Registration_Details.CourseID +// WHERE T_Registration_Details.RegistrationType = '".$regconst."' and T_Registration_Details.RegistrationMode='".'1'."' and +// T_Registration_Details.BranchCode= '".$branch."'"; + + +$subQuery="SELECT T_StudentDetails.StudentID,T_Student_CourseDetails.DOJ,T_Students_Fees_PaidDetails.BillDate,BatchName,CourseName ,T_Student_CourseDetails.UniversityID, T_Student_CourseDetails.CourseID, T_StudentDetails.Firstname,T_StudentDetails.Lastname,T_StudentDetails. MobileNumber, T_StudentDetails.Fathername,CourseName,ReferredBy,ReferersMobileNumber,T_StaffDetails.Firstname as Fname,T_StaffDetails.Lastname as Lname,Sem_Year,UniversityName +FROM T_Student_CourseDetails JOIN T_StudentDetails ON T_StudentDetails.StudentID=T_Student_CourseDetails.StudentID -JOIN T_UniversityMaster ON T_UniversityMaster.UniversityID=T_Student_CourseDetails.UniversityID - JOIN T_CourseMaster ON T_CourseMaster.CourseID=T_Student_CourseDetails.CourseID - join T_Students_Fees_PaidDetails ON T_Students_Fees_PaidDetails.StudentID = T_StudentDetails.StudentID -left JOIN T_Registration_Details ON T_Registration_Details.CourseID = T_Student_CourseDetails.CourseID and T_Registration_Details.StudentID=T_Student_CourseDetails.StudentID -left JOIN T_BatchMaster ON T_BatchMaster.BatchCode = T_Registration_Details.BatchCode -left JOIN T_StaffDetails ON T_StaffDetails.StaffID = T_StudentDetails.AdmittedBy +JOIN T_UniversityMaster ON T_UniversityMaster.UniversityID=T_Student_CourseDetails.UniversityID JOIN T_CourseMaster ON T_CourseMaster.CourseID=T_Student_CourseDetails.CourseID + +JOIN T_Registration_Details ON T_Registration_Details.CourseID = T_Student_CourseDetails.CourseID and T_Registration_Details.StudentID=T_Student_CourseDetails.StudentID + +join T_Students_Fees_PaidDetails ON T_Students_Fees_PaidDetails.StudentID = T_StudentDetails.StudentID and T_Registration_Details.StudentID=T_Students_Fees_PaidDetails.StudentID and +T_Students_Fees_PaidDetails.FeesId=T_Registration_Details.Student_Fee_Status_Id and +T_Students_Fees_PaidDetails.Installment='1' + +left JOIN T_BatchMaster ON T_BatchMaster.BatchCode = T_Registration_Details.BatchCode +left JOIN T_StaffDetails ON T_StaffDetails.StaffID = T_StudentDetails.AdmittedBy left JOIN T_Course_Fees_Details on T_Course_Fees_Details.ID=T_Registration_Details.FeeType and T_Course_Fees_Details.CourseID=T_Registration_Details.CourseID -WHERE T_Registration_Details.RegistrationType = '".$regconst."' and T_Registration_Details.RegistrationMode='".'1'."' and -T_Registration_Details.BranchCode= '".$branch."'"; +WHERE T_Registration_Details.RegistrationType = '".$regconst."' and T_Registration_Details.RegistrationMode='1' and T_Registration_Details.BranchCode= '".$branch."'"; + + + + + if ($fromd != ''){ // $fromd= date("Y-m-d",strtotime($from)); //and str_to_date(DOJ,?)>=? - $subQuery.=" and str_to_date(T_Students_Fees_PaidDetails.BillDate,'%d-%m-%Y')>='".$fromd."'"; + $subQuery.=" and str_to_date(T_Registration_Details.CreatedOn,'%Y-%m-%d')>='".$fromd."'"; } if ($tod != ''){ // $tod=date("Y-m-d",strtotime($to)); - $subQuery.="and str_to_date(T_Students_Fees_PaidDetails.BillDate,'%d-%m-%Y')<='".$tod."'"; + $subQuery.="and str_to_date(T_Registration_Details.CreatedOn,'%Y-%m-%d')<='".$tod."'"; } @@ -1160,8 +1182,8 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y')); $searchDetails =$query->result(); -// print_r( $this->db->last_query()); -// die(); + //print_r( $this->db->last_query()); + //die(); //print_r($searchDetails);die();