lpf
/
xinjiang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lpf:0075a58d429410fc5ec5036f6002053abaa79496
Branches Tags
lpf:master
..
compare: lpf:cc86d5a07e6abbe80e6dec0311cd45fb90494b80
Branches Tags
lpf:master

No commits in common. "0075a58d429410fc5ec5036f6002053abaa79496" and "cc86d5a07e6abbe80e6dec0311cd45fb90494b80" have entirely different histories.
0075a58d42 ... cc86d5a07e

3 changed files with 18 additions and 16 deletions
Show Stats Expand all files Collapse all files

4
SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.cs
View File

@ -68,10 +68,12 @@ namespace FineUIPro.Web.BaseInfo
{
rowend = source.Count();
}
for (int i = rowbegin; i < rowend; i++)
{
paged.Add(source[i]);
}
return paged;
}
@ -150,7 +152,7 @@ namespace FineUIPro.Web.BaseInfo
BindGrid();
PageContext.RegisterStartupScript("onNewButtonClick();");
}
}
}
#endregion
#region 编辑

14
SGGL/FineUIPro.Web/HSSE/EduTrain/Trainingrecords.aspx.cs
View File

@ -32,7 +32,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
if (!string.IsNullOrEmpty(Request.Params["personId"])) ///是否文件柜查看页面传项目值
{
@ -40,7 +40,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
}
// 绑定表格
BindGrid();
}
}
@ -71,9 +71,10 @@ namespace FineUIPro.Web.HSSE.EduTrain
strSql += " AND p.PersonId = @PersonId";
listStr.Add(new SqlParameter("@PersonId", this.PersonId));
}
if (!string.IsNullOrEmpty(txtName.Text.Trim()))
{
strSql += " AND p.PersonName like '%" + txtName.Text.Trim() + "%'";
strSql += " AND p.PersonName like '%"+ txtName.Text.Trim() + "%'";
}
if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim()))
{
@ -199,7 +200,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
{
html = (row.FindControl("lblVideoProgress") as AspNet.Label).Text;
}
//sb.AppendFormat("<td>{0}</td>", html);
sb.AppendFormat("<td style='vnd.ms-excel.numberformat:@;width:140px;'>{0}</td>", html);
}
@ -228,11 +229,10 @@ namespace FineUIPro.Web.HSSE.EduTrain
{
return (Convert.ToInt32(time) / 60).ToString();
}
else
{
else {
return hours;
}
}
return hours;
}

16
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs
View File

@ -88,7 +88,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
this.UnitId = Request.Params["UnitId"];
this.PersonId = Request.Params["PersonId"];
this.InitDropDownList();
this.drpIdcardType.SelectedValue = "SHENFEN_ZHENGJIAN";
this.drpIdcardType.SelectedValue = "SHENFEN_ZHENGJIAN";
if (!string.IsNullOrEmpty(this.PersonId))
{
@ -285,7 +285,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
BasicDataService.InitBasicDataProjectUnitDropDownList(this.drpPoliticsStatus, "POLITICAL_LANDSCAPE", true);
BasicDataService.InitBasicDataProjectUnitDropDownList(this.drpNation, "MINZU_TYPE", true);
SynchroSetService.InitCountryDropDownList(this.drpCountryCode, true);
Funs.FineUIPleaseSelect(this.drpProvinceCode);
Funs.FineUIPleaseSelect(this.drpProvinceCode);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
}
@ -546,9 +546,9 @@ namespace FineUIPro.Web.HSSE.SitePerson
//if (!BLL.PersonService.IsExistPersonByUnit(this.UnitId, this.txtPersonName.Text.Trim(), this.ProjectId))
//{
this.PersonId = SQLHelper.GetNewID(typeof(Model.SitePerson_Person));
person.PersonId = this.PersonId;
BLL.PersonService.AddPerson(person);
this.PersonId = SQLHelper.GetNewID(typeof(Model.SitePerson_Person));
person.PersonId = this.PersonId;
BLL.PersonService.AddPerson(person);
//}
BLL.LogService.AddSys_Log(this.CurrUser, person.PersonName, person.PersonId, BLL.Const.PersonListMenuId, BLL.Const.BtnAdd);
@ -613,8 +613,8 @@ namespace FineUIPro.Web.HSSE.SitePerson
var user = Funs.DB.Sys_User.FirstOrDefault(x => x.IdentityCard == person.IdentityCard);
if (user != null && user.UnitId != person.UnitId)
var user = Funs.DB.Sys_User.FirstOrDefault(x => x.IdentityCard == person.IdentityCard);
if (user!=null && user.UnitId != person.UnitId)
{
user.UnitId = person.UnitId;
Funs.DB.SubmitChanges();
@ -624,7 +624,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
///上传人脸库
var getProject = ProjectService.GetProjectByProjectId(person.ProjectId);
if (!string.IsNullOrEmpty(person.PhotoUrl) && getProject != null && getProject.IsFace == true)
{
{
Alert.ShowInParent(APIPersonService.PersonFace(person), MessageBoxIcon.Warning);
}
}