getApproverRequistList orderby added : ps

This commit is contained in:
VE10-Sanjeev 2023-06-15 13:24:20 +05:30
parent 0abed1e100
commit e5bdea36b2

View File

@ -508,33 +508,38 @@ ifnull(Po.Quantity,0) as POQTY,sta.StatusName
EmpID=(select EmpID from tbl_users where userId=?))))'; EmpID=(select EmpID from tbl_users where userId=?))))';
$subQuery1 = $subQuery; $subQuery1 = $subQuery;
$query =''; $query ='';
$order_by = ' order by mast.CreatedDate desc';
if($FromDate != '' && $ToDate != '' && $Status !='' ) if($FromDate != '' && $ToDate != '' && $Status !='' )
{ {
$Where = 'and mast.CreatedDate >= ? and mast.CreatedDate <= ? and Status=?'; $Where = 'and mast.CreatedDate >= ? and mast.CreatedDate <= ? and Status=?';
$subQuery1 .= $Where; $subQuery1 .= $Where;
$subQuery1 .= $order_by;
$query = $this->db->query($subQuery1, array(REQ_DRAFT,REQ_DELETED,REQ_REJECTED,$UserID,$FromDate,$ToDate,$Status)); $query = $this->db->query($subQuery1, array(REQ_DRAFT,REQ_DELETED,REQ_REJECTED,$UserID,$FromDate,$ToDate,$Status));
} }
else if($FromDate != '' && $ToDate != '' && $Status =='') else if($FromDate != '' && $ToDate != '' && $Status =='')
{ {
$Where = 'and mast.CreatedDate >= ? and mast.CreatedDate <= ? '; $Where = 'and mast.CreatedDate >= ? and mast.CreatedDate <= ? ';
$subQuery1 .= $Where; $subQuery1 .= $Where;
$subQuery1 .= $order_by;
$query = $this->db->query($subQuery1, array(REQ_DRAFT,REQ_DELETED,REQ_REJECTED,$UserID,$FromDate,$ToDate)); $query = $this->db->query($subQuery1, array(REQ_DRAFT,REQ_DELETED,REQ_REJECTED,$UserID,$FromDate,$ToDate));
} }
else if($Status != '' && $FromDate == '' && $ToDate == '') else if($Status != '' && $FromDate == '' && $ToDate == '')
{ {
$Where = 'and Status = ?'; $Where = 'and Status = ?';
$subQuery1 .= $Where; $subQuery1 .= $Where;
$subQuery1 .= $order_by;
$query = $this->db->query($subQuery1, array(REQ_DRAFT,REQ_DELETED,REQ_REJECTED,$UserID,$Status)); $query = $this->db->query($subQuery1, array(REQ_DRAFT,REQ_DELETED,REQ_REJECTED,$UserID,$Status));
} }
else else
{ {
$subQuery .= $order_by;
$query = $this->db->query($subQuery, array(REQ_DRAFT,REQ_DELETED,REQ_REJECTED,$UserID)); $query = $this->db->query($subQuery, array(REQ_DRAFT,REQ_DELETED,REQ_REJECTED,$UserID));
} }
//print_r($this->db->last_query()); print_r($this->db->last_query());die();
return $query->result(); return $query->result();
} }