Compare commits
4 Commits
cc86d5a07e
...
0075a58d42
Author | SHA1 | Date |
---|---|---|
|
0075a58d42 | |
|
e0525c4e54 | |
|
1e608129cd | |
|
2569d4d5fa |
|
@ -68,12 +68,10 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -152,7 +150,7 @@ namespace FineUIPro.Web.BaseInfo
|
||||||
BindGrid();
|
BindGrid();
|
||||||
PageContext.RegisterStartupScript("onNewButtonClick();");
|
PageContext.RegisterStartupScript("onNewButtonClick();");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region 编辑
|
#region 编辑
|
||||||
|
|
|
@ -32,7 +32,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
|
||||||
if (!IsPostBack)
|
if (!IsPostBack)
|
||||||
{
|
{
|
||||||
Funs.DropDownPageSize(this.ddlPageSize);
|
Funs.DropDownPageSize(this.ddlPageSize);
|
||||||
|
|
||||||
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
|
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
|
||||||
if (!string.IsNullOrEmpty(Request.Params["personId"])) ///是否文件柜查看页面传项目值
|
if (!string.IsNullOrEmpty(Request.Params["personId"])) ///是否文件柜查看页面传项目值
|
||||||
{
|
{
|
||||||
|
@ -40,7 +40,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
|
||||||
}
|
}
|
||||||
// 绑定表格
|
// 绑定表格
|
||||||
BindGrid();
|
BindGrid();
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -71,10 +71,9 @@ 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() + "%'";
|
||||||
}
|
}
|
||||||
if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim()))
|
if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim()))
|
||||||
{
|
{
|
||||||
|
@ -200,7 +199,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
|
||||||
{
|
{
|
||||||
html = (row.FindControl("lblVideoProgress") as AspNet.Label).Text;
|
html = (row.FindControl("lblVideoProgress") as AspNet.Label).Text;
|
||||||
}
|
}
|
||||||
|
|
||||||
//sb.AppendFormat("<td>{0}</td>", html);
|
//sb.AppendFormat("<td>{0}</td>", html);
|
||||||
sb.AppendFormat("<td style='vnd.ms-excel.numberformat:@;width:140px;'>{0}</td>", html);
|
sb.AppendFormat("<td style='vnd.ms-excel.numberformat:@;width:140px;'>{0}</td>", html);
|
||||||
}
|
}
|
||||||
|
@ -229,10 +228,11 @@ namespace FineUIPro.Web.HSSE.EduTrain
|
||||||
{
|
{
|
||||||
return (Convert.ToInt32(time) / 60).ToString();
|
return (Convert.ToInt32(time) / 60).ToString();
|
||||||
}
|
}
|
||||||
else {
|
else
|
||||||
|
{
|
||||||
return hours;
|
return hours;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
return hours;
|
return hours;
|
||||||
}
|
}
|
||||||
|
|
|
@ -88,7 +88,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
|
||||||
this.UnitId = Request.Params["UnitId"];
|
this.UnitId = Request.Params["UnitId"];
|
||||||
this.PersonId = Request.Params["PersonId"];
|
this.PersonId = Request.Params["PersonId"];
|
||||||
this.InitDropDownList();
|
this.InitDropDownList();
|
||||||
this.drpIdcardType.SelectedValue = "SHENFEN_ZHENGJIAN";
|
this.drpIdcardType.SelectedValue = "SHENFEN_ZHENGJIAN";
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(this.PersonId))
|
if (!string.IsNullOrEmpty(this.PersonId))
|
||||||
{
|
{
|
||||||
|
@ -285,7 +285,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
|
||||||
BasicDataService.InitBasicDataProjectUnitDropDownList(this.drpPoliticsStatus, "POLITICAL_LANDSCAPE", true);
|
BasicDataService.InitBasicDataProjectUnitDropDownList(this.drpPoliticsStatus, "POLITICAL_LANDSCAPE", true);
|
||||||
BasicDataService.InitBasicDataProjectUnitDropDownList(this.drpNation, "MINZU_TYPE", true);
|
BasicDataService.InitBasicDataProjectUnitDropDownList(this.drpNation, "MINZU_TYPE", true);
|
||||||
SynchroSetService.InitCountryDropDownList(this.drpCountryCode, true);
|
SynchroSetService.InitCountryDropDownList(this.drpCountryCode, true);
|
||||||
Funs.FineUIPleaseSelect(this.drpProvinceCode);
|
Funs.FineUIPleaseSelect(this.drpProvinceCode);
|
||||||
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
|
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))
|
//if (!BLL.PersonService.IsExistPersonByUnit(this.UnitId, this.txtPersonName.Text.Trim(), this.ProjectId))
|
||||||
//{
|
//{
|
||||||
this.PersonId = SQLHelper.GetNewID(typeof(Model.SitePerson_Person));
|
this.PersonId = SQLHelper.GetNewID(typeof(Model.SitePerson_Person));
|
||||||
person.PersonId = this.PersonId;
|
person.PersonId = this.PersonId;
|
||||||
BLL.PersonService.AddPerson(person);
|
BLL.PersonService.AddPerson(person);
|
||||||
//}
|
//}
|
||||||
|
|
||||||
BLL.LogService.AddSys_Log(this.CurrUser, person.PersonName, person.PersonId, BLL.Const.PersonListMenuId, BLL.Const.BtnAdd);
|
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);
|
var user = Funs.DB.Sys_User.FirstOrDefault(x => x.IdentityCard == person.IdentityCard);
|
||||||
if (user!=null && user.UnitId != person.UnitId)
|
if (user != null && user.UnitId != person.UnitId)
|
||||||
{
|
{
|
||||||
user.UnitId = person.UnitId;
|
user.UnitId = person.UnitId;
|
||||||
Funs.DB.SubmitChanges();
|
Funs.DB.SubmitChanges();
|
||||||
|
@ -624,7 +624,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
|
||||||
///上传人脸库
|
///上传人脸库
|
||||||
var getProject = ProjectService.GetProjectByProjectId(person.ProjectId);
|
var getProject = ProjectService.GetProjectByProjectId(person.ProjectId);
|
||||||
if (!string.IsNullOrEmpty(person.PhotoUrl) && getProject != null && getProject.IsFace == true)
|
if (!string.IsNullOrEmpty(person.PhotoUrl) && getProject != null && getProject.IsFace == true)
|
||||||
{
|
{
|
||||||
Alert.ShowInParent(APIPersonService.PersonFace(person), MessageBoxIcon.Warning);
|
Alert.ShowInParent(APIPersonService.PersonFace(person), MessageBoxIcon.Warning);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue