diff --git a/application/models/requistion_model.php b/application/models/requistion_model.php index 844a8883..674b72ff 100644 --- a/application/models/requistion_model.php +++ b/application/models/requistion_model.php @@ -400,7 +400,7 @@ class requistion_model extends CI_Model from T_Requestion_Master mast join T_Employee_Details emp on mast.Requestedby = emp.EmpID join T_DepartmentDetails Dept on emp.Departmentcode = Dept.HeadDept join T_Status st on st.StatusCode = mast.Status - where status != ? and emp.Departmentcode = (select HeadDept from T_DepartmentDetails where DEPCode = (select Departmentcode from T_Employee_Details where EmpID=(select EmpID from tbl_users where userId=?)))'; + where status not in(?,?,?) and emp.Departmentcode = (select HeadDept from T_DepartmentDetails where DEPCode = (select Departmentcode from T_Employee_Details where EmpID=(select EmpID from tbl_users where userId=?)))'; $subQuery1 = $subQuery; $query =''; @@ -409,24 +409,24 @@ class requistion_model extends CI_Model $Where = 'and mast.CreatedDate >= ? and mast.CreatedDate <= ? and Status=?'; $subQuery1 .= $Where; - $query = $this->db->query($subQuery1, array(REQ_DRAFT,$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 =='') { $Where = 'and mast.CreatedDate >= ? and mast.CreatedDate <= ? '; $subQuery1 .= $Where; - $query = $this->db->query($subQuery1, array(REQ_DRAFT,$UserID,$FromDate,$ToDate)); + $query = $this->db->query($subQuery1, array(REQ_DRAFT,REQ_DELETED,REQ_REJECTED,$UserID,$FromDate,$ToDate)); } else if($Status != '' && $FromDate == '' && $ToDate == '') { $Where = 'and Status = ?'; $subQuery1 .= $Where; - $query = $this->db->query($subQuery1, array(REQ_DRAFT,$UserID,$Status)); + $query = $this->db->query($subQuery1, array(REQ_DRAFT,REQ_DELETED,REQ_REJECTED,$UserID,$Status)); } else { - $query = $this->db->query($subQuery, array(REQ_DRAFT,$UserID)); + $query = $this->db->query($subQuery, array(REQ_DRAFT,REQ_DELETED,REQ_REJECTED,$UserID)); } // print_r($this->db->last_query());