危险源管理模块接入真实数据库:新增危大/超危工程、风险控制清单、安全验收、安全巡检、临时用电管理(含前端页面、BLL/API服务、WebAPI控制器、Model项、SQL脚本与接口文档)
排除 CreateModel.bat(含明文sa密码与本地服务器名,未入库)
This commit is contained in:
@@ -381,7 +381,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
|
||||
|
||||
if (idcard != null)
|
||||
{
|
||||
var p = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId && x.IdentityCard == idcard );
|
||||
var p = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId && x.IdentityCard == (string)idcard );
|
||||
if (p != null&& p.InTime.HasValue)
|
||||
{
|
||||
inTime= p.InTime.Value.ToString("yyyy-MM-dd");
|
||||
@@ -395,7 +395,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
|
||||
|
||||
if (idcard != null)
|
||||
{
|
||||
var p = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId && x.IdentityCard == idcard);
|
||||
var p = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId && x.IdentityCard == (string)idcard);
|
||||
if (p != null && p.OutTime.HasValue)
|
||||
{
|
||||
inTime = p.OutTime.Value.ToString("yyyy-MM-dd");
|
||||
@@ -470,7 +470,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
|
||||
/// </summary>
|
||||
/// <param name="grid"></param>
|
||||
/// <returns></returns>
|
||||
private string GetGridTableHtml(Grid grid)
|
||||
private new string GetGridTableHtml(Grid grid)
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
|
||||
|
||||
@@ -266,7 +266,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
|
||||
try
|
||||
{
|
||||
DateTime dateValue = DateTime.Parse(col6);
|
||||
} catch (Exception e)
|
||||
} catch (Exception)
|
||||
{
|
||||
result += "第" + (i + 2).ToString() + "行," + "出生日期" + "," + "[" + col6 + "]错误!" + "|";
|
||||
}
|
||||
@@ -282,7 +282,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
|
||||
{
|
||||
DateTime dateValue = DateTime.Parse(col7);
|
||||
}
|
||||
catch (Exception e)
|
||||
catch (Exception)
|
||||
{
|
||||
result += "第" + (i + 2).ToString() + "行," + "有效日期" + "," + "[" + col7 + "]错误!" + "|";
|
||||
}
|
||||
|
||||
@@ -355,7 +355,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
|
||||
/// </summary>
|
||||
/// <param name="grid"></param>
|
||||
/// <returns></returns>
|
||||
private string GetGridTableHtml(Grid grid)
|
||||
private new string GetGridTableHtml(Grid grid)
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
grid.PageSize = this.Grid1.RecordCount;
|
||||
|
||||
Reference in New Issue
Block a user