lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
高飞
2024-07-24 11:36:38 +08:00
parent 2551f96820
commit 6f82435bd2
8 changed files with 356 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs
+9 -7
View File
@@ -246,7 +246,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
}
var safePersonQuality = BLL.SafePersonQualityService.GetSafePersonQualityByPersonId(person.PersonId);
if (safePersonQuality!=null)
if (safePersonQuality != null)
{
this.drpCertificate.SelectedValue = safePersonQuality.CertificateId;
this.txtCertificateCode.Text = safePersonQuality.CertificateNo;
@@ -334,16 +334,17 @@ namespace FineUIPro.Web.HSSE.SitePerson
}
else
{
if (this.drpIdcardType.SelectedValue == "SHENFEN_ZHENGJIAN" && (IdCard.Length != 18 && IdCard.Length != 15))
var project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
if (this.drpIdcardType.SelectedValue == "SHENFEN_ZHENGJIAN" && (IdCard.Length != 18 && IdCard.Length != 15) && (project.IsForeign == null || project.IsForeign == false))
{
ShowNotify("身份证号码位数不对！", MessageBoxIcon.Warning);
return;
}
//判断是否在黑名单中
var model = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == IdCard && x.IsBlacklist == true);
if (model!=null)
if (model != null)
{
ShowNotify("该身份证号码在系统黑名单中（"+ ProjectService.GetProjectNameByProjectId(model.ProjectId) +"），请联系管理员！", MessageBoxIcon.Warning);
ShowNotify("该身份证号码在系统黑名单中（" + ProjectService.GetProjectNameByProjectId(model.ProjectId) + "），请联系管理员！", MessageBoxIcon.Warning);
return;
}
}
@@ -636,14 +637,14 @@ namespace FineUIPro.Web.HSSE.SitePerson
#region 安管人员资质
var safePersonQuality = BLL.SafePersonQualityService.GetSafePersonQualityByPersonId(person.PersonId);
if (safePersonQuality!=null)
if (safePersonQuality != null)
{
if (this.drpCertificate.SelectedValue != BLL.Const._Null)
{
safePersonQuality.CertificateId = this.drpCertificate.SelectedValue;
safePersonQuality.CertificateName = this.drpCertificate.SelectedItem.Text;
}
safePersonQuality.CertificateNo = this.txtCertificateCode.Text.Trim();
safePersonQuality.LimitDate = Funs.GetNewDateTime(this.txtCertificateLimitTime.Text);
safePersonQuality.CompileMan = this.CurrUser.UserId;
@@ -955,7 +956,8 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
ShowNotify("输入的身份证号码已存在！", MessageBoxIcon.Warning);
}
if (this.drpIdcardType.SelectedValue == "SHENFEN_ZHENGJIAN")
var project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
if (this.drpIdcardType.SelectedValue == "SHENFEN_ZHENGJIAN" && (project.IsForeign == null || project.IsForeign == false))
{
if (!IDCardValid.CheckIDCard(idCard))
{