Compare commits
No commits in common. "0075a58d429410fc5ec5036f6002053abaa79496" and "cc86d5a07e6abbe80e6dec0311cd45fb90494b80" have entirely different histories.
0075a58d42
...
cc86d5a07e
|
@ -68,10 +68,12 @@ namespace FineUIPro.Web.BaseInfo
|
||||||
{
|
{
|
||||||
rowend = source.Count();
|
rowend = source.Count();
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int i = rowbegin; i < rowend; i++)
|
for (int i = rowbegin; i < rowend; i++)
|
||||||
{
|
{
|
||||||
paged.Add(source[i]);
|
paged.Add(source[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
return paged;
|
return paged;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -71,6 +71,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
|
||||||
strSql += " AND p.PersonId = @PersonId";
|
strSql += " AND p.PersonId = @PersonId";
|
||||||
listStr.Add(new SqlParameter("@PersonId", this.PersonId));
|
listStr.Add(new SqlParameter("@PersonId", this.PersonId));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(txtName.Text.Trim()))
|
if (!string.IsNullOrEmpty(txtName.Text.Trim()))
|
||||||
{
|
{
|
||||||
strSql += " AND p.PersonName like '%"+ txtName.Text.Trim() + "%'";
|
strSql += " AND p.PersonName like '%"+ txtName.Text.Trim() + "%'";
|
||||||
|
@ -228,8 +229,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
|
||||||
{
|
{
|
||||||
return (Convert.ToInt32(time) / 60).ToString();
|
return (Convert.ToInt32(time) / 60).ToString();
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
return hours;
|
return hours;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue