This commit is contained in:
gaofei
2021-08-13 11:15:59 +08:00
parent 43acc57060
commit d8dff88c39
320 changed files with 37219 additions and 4678 deletions
@@ -362,7 +362,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
checking.UnitName = col0;
checking.PersonName = col1;
checking.IdentityCard = col2;
checking.IntoOut = (col3 == "进"? "1": "0");
checking.IntoOut = col3 == "进" ? "1" : "0";
checking.IntoOutTime = Convert.ToDateTime(col4);
var person = BLL.PersonService.GetPersonByIdentityCard(this.CurrUser.LoginProjectId, checking.IdentityCard);
if (person != null)
@@ -403,15 +403,13 @@ namespace FineUIPro.Web.HSSE.SitePerson
int a = viewCheckings.Count();
for (int i = 0; i < a; i++)
{
Model.SitePerson_Checking newChecking = new Model.SitePerson_Checking
{
CheckingId = viewCheckings[i].CheckingId,
ProjectId = this.CurrUser.LoginProjectId,
IdentityCard = viewCheckings[i].IdentityCard,
IntoOutTime = viewCheckings[i].IntoOutTime,
IntoOut = viewCheckings[i].IntoOut,
PersonId = viewCheckings[i].PersonId
};
Model.SitePerson_Checking newChecking = new Model.SitePerson_Checking();
newChecking.CheckingId = viewCheckings[i].CheckingId;
newChecking.ProjectId = this.CurrUser.LoginProjectId;
newChecking.IdentityCard = viewCheckings[i].IdentityCard;
newChecking.IntoOutTime = viewCheckings[i].IntoOutTime;
newChecking.IntoOut = viewCheckings[i].IntoOut;
newChecking.PersonId = viewCheckings[i].PersonId;
BLL.SitePerson_CheckingService.AddPersonInfo(newChecking);
}
string rootPath = Server.MapPath("~/");
@@ -466,29 +464,6 @@ namespace FineUIPro.Web.HSSE.SitePerson
Response.End();
}
}
#endregion
#region
/// <summary>
/// 把进出转换为字符串类型
/// </summary>
/// <param name="sex"></param>
/// <returns></returns>
protected string ConvertIntoOut(object intoOut)
{
if (intoOut != null)
{
if (Convert.ToBoolean(intoOut) == true)
{
return "进场";
}
else
{
return "出场";
}
}
return "";
}
#endregion
#endregion
}
}