SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Paydata issue fixed

Browse Source
This commit is contained in:
gandhimathi Bharathirajan 2017-11-28 14:48:20 +05:30
parent 02fecfe91e
commit 3461c7f75b
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
application/models/monthlypay_model.php
View File

@ -28,20 +28,15 @@ class monthlypay_model extends CI_Model
function getEmpPayDetails($current="",$s="") function getEmpPayDetails($current="",$s="")
{ {
//echo $s;die();
if($s == ''){
$current = '01-'.$current; $this->db->select('T_Employee_Details.EmpID,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Employee_Details.DateofJoining');
$current = date_create($current); $this->db->from('T_Employee_Details');
$current = date_format($current,"Y-m-d"); //$this->db->join('T_Emp_Pay_Data','T_Emp_Pay_Data.EmpID=T_Employee_Details.EmpID','Left');
} $this->db->where('T_Employee_Details.IsActive',1);
$this->db->select('T_Emp_Pay_Data.EmpID,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Employee_Details.DateofJoining');
$this->db->from('T_Emp_Pay_Data');
$this->db->join('T_Employee_Details ','T_Emp_Pay_Data.EmpID=T_Employee_Details.EmpID');
$this->db->where('T_Employee_Details.DateofJoining <=',$current);
$this->db->order_by('EmpID','asc'); $this->db->order_by('EmpID','asc');
$query = $this->db->get(); $query = $this->db->get();
$result = $query->result(); $result = $query->result();
return $result; return $result;
} }