diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index 4277837b..aabea33a 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -169,7 +169,7 @@ group by sid,sem) as apdate on apdate.sid=sms.sid and apdate.sem=cfd.syear left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.semyr=sms.sem where std.active = 1 and sms.branch = '".$br."' "; - $sql = "SELECT ifnull(sfs.sid,'-') AS Student_id,ifnull(scd.eid,'-') AS Enrollment_id,ifnull(sfs.rollno,'-') AS Roll_NO,ifnull(std.name,'-') AS Student_name,ifnull(std.father,'-') AS Father_name,ifnull(std.phone,'-') AS Phone_number,ifnull(sfs.ftype,'-') AS Course_id,ifnull(sms.cdate,'-') AS Date,ifnull(cfd.syear,'-') AS Sem_year,ifnull(sms.sem,'-') AS Sem,ifnull(sfs.batch,'-') AS Batch_code,ifnull(sms.branch,'-') AS Branch_code,ifnull(cm.course,'-') AS Course_name,ifnull(cm.uname,'-') AS University,ifnull(list.status,'-') AS Status,ifnull(sfp.bdate,'-') AS Initial_paid_date,bal.balpayable AS Balance_Fee,ifnull(std.address,'-') AS address,ifnull(std.AlternateNumber,'') AS AlternateNumber,ifnull(appdate,'-') AS appdate,ifnull(ansdate,'-') AS ansdate ,scd.coursestatus AS Course_Status,ifnull(andate.courierdetails,'-') AS Courier_Details,IFNULL(sfs.batchname, '-') AS Batch_Name + $sql = "SELECT sfs.fid,ifnull(sfs.sid,'-') AS Student_id,ifnull(scd.eid,'-') AS Enrollment_id,ifnull(sfs.rollno,'-') AS Roll_NO,ifnull(std.name,'-') AS Student_name,ifnull(std.father,'-') AS Father_name,ifnull(std.phone,'-') AS Phone_number,ifnull(sfs.ftype,'-') AS Course_id,ifnull(sms.cdate,'-') AS Date,ifnull(cfd.syear,'-') AS Sem_year,ifnull(sms.sem,'-') AS Sem,ifnull(sfs.batch,'-') AS Batch_code,ifnull(sms.branch,'-') AS Branch_code,ifnull(cm.course,'-') AS Course_name,ifnull(cm.uname,'-') AS University,ifnull(list.status,'-') AS Status,ifnull(sfp.bdate,'-') AS Initial_paid_date,bal.balpayable AS Balance_Fee,ifnull(std.address,'-') AS address,ifnull(std.AlternateNumber,'') AS AlternateNumber,ifnull(appdate,'-') AS appdate,ifnull(ansdate,'-') AS ansdate ,scd.coursestatus AS Course_Status,ifnull(andate.courierdetails,'-') AS Courier_Details,IFNULL(sfs.batchname, '-') AS Batch_Name FROM (SELECT FeesID AS fid,T_Students_Fees_Status.BatchCode AS batch,T_BatchMaster.BatchName AS batchname,StudentID AS sid,RollNO AS rollno,CourseID AS cid,FeesType AS ftype,sum(CourseFees) AS cf,Sum(STFOrWR) AS stf,sum(Others) AS others , T_Students_Fees_Status.BranchCode AS branch FROM T_Students_Fees_Status LEFT JOIN T_BatchMaster ON T_BatchMaster.BatchCode = T_Students_Fees_Status.BatchCode @@ -260,6 +260,7 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se $tod=date("Y-m-d",strtotime($to)); $sql.=" and sms.CreatedOn <= '".$tod."'"; } + $sql.=" and sfs.fid IS not null"; $sql.=" AND (scd.coursestatus IS NULL OR (scd.coursestatus != 'Refund_issued' AND scd.coursestatus != 'Discontinued' AND scd.coursestatus != 'Cancelled'))"; $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem,Sem_year"; // print_r($sql);die(); @@ -357,11 +358,10 @@ LEFT JOIN LEFT JOIN (SELECT StudentID AS sid,UniversityID AS uid,CourseID AS cid,EnrollmentID AS eid,BranchID AS branch,ifnull(Status,'-') as coursestatus FROM T_Student_CourseDetails) AS scd ON scd.sid=sms.sid AND scd.cid=sms.cid - where sms.branch = '".$br."'"; - + where sms.branch = '".$br."'"; $sql = "SELECT sfs.sid AS Student_id, - sfs.cid, + sfs.cid,sfs.fid IFNULL(sms.status, '-') AS STATUS, IFNULL(DATE_FORMAT(sms.adate, '%d-%m-%Y'), '-') AS adate, IFNULL(sms.acmts, '-') AS acmts, @@ -509,6 +509,7 @@ LEFT JOIN $sql.=" and sms.lcode = '".$st."'"; } } + $sql.=" and sfs.fid IS not null"; $sql.=" group by Student_id,cid,ctype"; $sql.=" ORDER BY sfb.bdate ASC"; //echo $sql; @@ -953,7 +954,7 @@ LEFT JOIN T_CourseMaster AS COUR ON COUR.CourseID = sfs.CourseID LEFT JOIN T_Student_CourseDetails AS STU_COUR ON STU_COUR.StudentID = sfs.StudentID AND STU_COUR.CourseID = sfs.CourseID LEFT JOIN T_Course_Fees_Details AS CFD ON CFD.ID = sfs.FeesType -LEFT JOIN T_UniversityMaster AS UNIV ON UNIV.UniversityID = sfs.CourseID +LEFT JOIN T_UniversityMaster AS UNIV ON UNIV.UniversityID = COUR.UniversityID LEFT JOIN BalFees AS BALFEE ON BALFEE.student = sfs.StudentID AND BALFEE.totalpayable is not null LEFT JOIN (SELECT @@ -1065,7 +1066,7 @@ WHERE $sql.=" ORDER BY StatusUpdationOn,InitialPayDate ASC "; $leadDet=$this->db->query($sql); - // print_r($sql);die(); + print_r($sql);die(); $answer = $leadDet->result(); if (count($answer) > 0) { $results['app_pendingList'] = true;