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

基础字典补充：员工分类、员工子组、机构划分

Browse Source
This commit is contained in:
夏菊
2025-08-08 10:14:10 +08:00
parent 79a7f35e22
commit fd849d42e1
243 changed files with 3117 additions and 26975 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs
+82 -58
View File
@@ -155,7 +155,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 36);
AddDatasetToSQL(ds.Tables[0], 38);
}
catch (Exception ex)
{
@@ -505,19 +505,6 @@ namespace FineUIPro.Web.HSSE.SitePerson
}
}
string col26 = pds.Rows[i][26].ToString().Trim();
if (!string.IsNullOrEmpty(col26))
{
try
{
DateTime date = Convert.ToDateTime(col26);
}
catch (Exception)
{
result += "第" + (i + 2).ToString() + "行," + "证书有效期" + "," + "[" + col26 + "]错误！" + "|";
}
}
string col27 = pds.Rows[i][27].ToString().Trim();
if (!string.IsNullOrEmpty(col27))
{
@@ -527,38 +514,45 @@ namespace FineUIPro.Web.HSSE.SitePerson
}
catch (Exception)
{
result += "第" + (i + 2).ToString() + "行," + "出生日期" + "," + "[" + col27 + "]错误！" + "|";
result += "第" + (i + 2).ToString() + "行," + "发证日期" + "," + "[" + col27 + "]错误！" + "|";
}
}
string col30 = pds.Rows[i][30].ToString().Trim();
if (!string.IsNullOrEmpty(col30))
string col28 = pds.Rows[i][28].ToString().Trim();
if (!string.IsNullOrEmpty(col28))
{
try
{
DateTime date = Convert.ToDateTime(col30);
DateTime date = Convert.ToDateTime(col28);
}
catch (Exception)
{
result += "第" + (i + 2).ToString() + "行," + "出场时间" + "," + "[" + col30 + "]错误！" + "|";
result += "第" + (i + 2).ToString() + "行," + "证书有效期" + "," + "[" + col28 + "]错误！" + "|";
}
}
string col29 = pds.Rows[i][29].ToString().Trim();
if (!string.IsNullOrEmpty(col29))
{
try
{
DateTime date = Convert.ToDateTime(col29);
}
catch (Exception)
{
result += "第" + (i + 2).ToString() + "行," + "出生日期" + "," + "[" + col29 + "]错误！" + "|";
}
}
string col32 = pds.Rows[i][32].ToString().Trim();
if (!string.IsNullOrEmpty(col32))
{
if (col32 != "是" && col32 != "否")
try
{
result += "第" + (i + 2).ToString() + "行," + "外籍" + "," + "[" + col32 + "]错误！" + "|";
DateTime date = Convert.ToDateTime(col32);
}
}
string col33 = pds.Rows[i][33].ToString().Trim();
if (!string.IsNullOrEmpty(col33))
{
if (col33 != "是" && col33 != "否")
catch (Exception)
{
result += "第" + (i + 2).ToString() + "行," + "外聘" + "," + "[" + col33 + "]错误！" + "|";
result += "第" + (i + 2).ToString() + "行," + "出场时间" + "," + "[" + col32 + "]错误！" + "|";
}
}
@@ -567,20 +561,38 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
if (col34 != "是" && col34 != "否")
{
result += "第" + (i + 2).ToString() + "行," + "人员是否在场" + "," + "[" + col34 + "]错误！" + "|";
result += "第" + (i + 2).ToString() + "行," + "外籍" + "," + "[" + col34 + "]错误！" + "|";
}
}
else
{
result += "第" + (i + 2).ToString() + "行," + "人员是否在场" + "," + "此项为必填项！" + "|";
}
string col35 = pds.Rows[i][35].ToString().Trim();
if (!string.IsNullOrEmpty(col35))
{
if (col35 != "是" && col35 != "否")
{
result += "第" + (i + 2).ToString() + "行," + "考勤卡是否启用" + "," + "[" + col35 + "]错误！" + "|";
result += "第" + (i + 2).ToString() + "行," + "外聘" + "," + "[" + col35 + "]错误！" + "|";
}
}
string col36 = pds.Rows[i][36].ToString().Trim();
if (!string.IsNullOrEmpty(col36))
{
if (col36 != "是" && col36 != "否")
{
result += "第" + (i + 2).ToString() + "行," + "人员是否在场" + "," + "[" + col36 + "]错误！" + "|";
}
}
else
{
result += "第" + (i + 2).ToString() + "行," + "人员是否在场" + "," + "此项为必填项！" + "|";
}
string col37 = pds.Rows[i][37].ToString().Trim();
if (!string.IsNullOrEmpty(col37))
{
if (col37 != "是" && col37 != "否")
{
result += "第" + (i + 2).ToString() + "行," + "考勤卡是否启用" + "," + "[" + col37 + "]错误！" + "|";
}
}
//else
@@ -682,7 +694,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 36);
AddDatasetToSQL2(ds.Tables[0], 38);
}
catch (Exception ex)
{
@@ -772,6 +784,8 @@ namespace FineUIPro.Web.HSSE.SitePerson
string col33 = pds.Rows[i][33].ToString().Trim();
string col34 = pds.Rows[i][34].ToString().Trim();
string col35 = pds.Rows[i][35].ToString().Trim();
string col36 = pds.Rows[i][36].ToString().Trim();
string col37 = pds.Rows[i][37].ToString().Trim();
if (!string.IsNullOrEmpty(col0))//卡号
{
@@ -972,47 +986,55 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
personQuality.CertificateNo = col25;
}
if (!string.IsNullOrEmpty(col26))//证书有效期
if (!string.IsNullOrEmpty(col26))//发证单位
{
personQuality.LimitDate = Funs.GetNewDateTime(col26);
personQuality.SendUnit = col26;
}
if (!string.IsNullOrEmpty(col27))//出生日期
if (!string.IsNullOrEmpty(col27))//发证日期
{
person.Birthday = Funs.GetNewDateTime(col27);
personQuality.SendDate = Funs.GetNewDateTime(col27);
}
if (!string.IsNullOrEmpty(col28))//电话
if (!string.IsNullOrEmpty(col28))//证书有效期
{
person.Telephone = col28;
personQuality.LimitDate = Funs.GetNewDateTime(col28);
}
if (!string.IsNullOrEmpty(col29))//家庭地址
if (!string.IsNullOrEmpty(col29))//出生日期
{
person.Address = col29;
person.Birthday = Funs.GetNewDateTime(col29);
}
if (!string.IsNullOrEmpty(col30))//出场时间
if (!string.IsNullOrEmpty(col30))//电话
{
person.OutTime = Funs.GetNewDateTime(col30);
person.Telephone = col30;
}
if (!string.IsNullOrEmpty(col31))//出场原因
if (!string.IsNullOrEmpty(col31))//家庭地址
{
person.OutResult = col31;
person.Address = col31;
}
if (!string.IsNullOrEmpty(col32))//外籍
if (!string.IsNullOrEmpty(col32))//出场时间
{
person.IsForeignStr = col32;
person.IsForeign = col32 == "是" ? true : false;
person.OutTime = Funs.GetNewDateTime(col32);
}
if (!string.IsNullOrEmpty(col33))//外聘
if (!string.IsNullOrEmpty(col33))//出场原因
{
person.IsOutsideStr = col33;
person.IsOutside = col33 == "是" ? true : false;
person.OutResult = col33;
}
if (!string.IsNullOrEmpty(col34))//人员是否在场
if (!string.IsNullOrEmpty(col34))//外籍
{
person.IsUsedName = col34;
person.IsForeignStr = col34;
person.IsForeign = col34 == "是" ? true : false;
}
if (!string.IsNullOrEmpty(col35))//考勤卡是否启用
if (!string.IsNullOrEmpty(col35))//外聘
{
person.IsCardUsedName = col35;
person.IsOutsideStr = col35;
person.IsOutside = col35 == "是" ? true : false;
}
if (!string.IsNullOrEmpty(col36))//人员是否在场
{
person.IsUsedName = col36;
}
if (!string.IsNullOrEmpty(col37))//考勤卡是否启用
{
person.IsCardUsedName = col37;
}
person.PersonId = SQLHelper.GetNewID(typeof(Model.SitePerson_Person));
persons.Add(person);
@@ -1197,6 +1219,8 @@ namespace FineUIPro.Web.HSSE.SitePerson
}
newPersonQuality.CertificateName = item.CertificateName;
newPersonQuality.CertificateNo = item.CertificateNo;
newPersonQuality.SendUnit = item.SendUnit;
newPersonQuality.SendDate = item.SendDate;
newPersonQuality.LimitDate = item.LimitDate;
BLL.PersonQualityService.AddPersonQuality(newPersonQuality);
}