SVN r1072

SVN-Revision: r1072
This commit is contained in:
tdx
2025-12-04 07:58:58 +00:00
parent 0c6b903cf1
commit d9b0743ee5
2 changed files with 25 additions and 9 deletions
+24 -8
View File
@@ -89,7 +89,7 @@ namespace Lskj.QueryEssentialInfo
{
QueryApiUtil.Init(out string initResult, out string initMsg);
var rowsEnumerable = QueryApiUtil.detailTab.AsEnumerable();
if (rowsEnumerable.Where(n => !(n["p_emp_addTag"] + "").Equals("1")).Count() > 0)
if (rowsEnumerable.Where(n => string.IsNullOrEmpty(n["p_emp_addTag"] + "") || (n["p_emp_addTag"] + "").Equals("0")).Count() > 0)
{
SetProcessMsg($"正在报送人员...");
string personCode = QueryApiUtil.Person(out string personResult, out string personMsg);
@@ -125,16 +125,24 @@ namespace Lskj.QueryEssentialInfo
DataRow selectRow = rowsEnumerable.Where(n => (n["idNumber"] + "").Equals(sfzh)).FirstOrDefault();
if (selectRow != null)
{
selectRow["p_emp_addTag"] = "1";
SqlHelper.ExecuteNonQuery($"update p_employeeTab set p_emp_addTag = 1 where p_emp_idcardnum = '{sfzh}'");
}
}
else
{
DataRow selectRow = rowsEnumerable.Where(n => (n["idNumber"] + "").Equals(sfzh)).FirstOrDefault();
if (selectRow != null)
{
SqlHelper.ExecuteNonQuery($"update p_employeeTab set p_emp_addTag = 2,error_msg='{bszt},{sfyzzt}' where p_emp_idcardnum = '{sfzh}'");
}
//SqlHelper.ExecuteNonQuery($"update p_employeeTab set p_emp_addTag = 1 where p_emp_idcardnum = '{sfzh}'");
}
SetProcessMsg($"已报送:{name}");
}
}
}
}
//QueryApiUtil.detailTab = BaseImpl.GetDataTableResult(Model.DetailSourceSql);
QueryApiUtil.detailTab = BaseImpl.GetDataTableResult(Model.DetailSourceSql);
rowsEnumerable = QueryApiUtil.detailTab.AsEnumerable();
Invoke(new Action(() =>
{
int maxCount = rowsEnumerable.Where(n => (n["p_emp_addTag"] + "").Equals("1")).Count();
@@ -431,7 +439,7 @@ namespace Lskj.QueryEssentialInfo
{
QueryApiUtil.Init(out string initResult, out string initMsg);
var rowsEnumerable = QueryApiUtil.detailTab.AsEnumerable();
if (rowsEnumerable.Where(n => !(n["p_emp_addTag"] + "").Equals("1")).Count() > 0)
if (rowsEnumerable.Where(n => string.IsNullOrEmpty(n["p_emp_addTag"] + "") || (n["p_emp_addTag"] + "").Equals("0")).Count() > 0)
{
SetProcessMsg($"正在报送人员...");
string personCode = QueryApiUtil.Person(out string personResult, out string personMsg);
@@ -467,18 +475,26 @@ namespace Lskj.QueryEssentialInfo
DataRow selectRow = rowsEnumerable.Where(n => (n["idNumber"] + "").Equals(sfzh)).FirstOrDefault();
if (selectRow != null)
{
selectRow["p_emp_addTag"] = "1";
SqlHelper.ExecuteNonQuery($"update p_employeeTab set p_emp_addTag = 1 where p_emp_idcardnum = '{sfzh}'");
}
}
else
{
DataRow selectRow = rowsEnumerable.Where(n => (n["idNumber"] + "").Equals(sfzh)).FirstOrDefault();
if (selectRow != null)
{
SqlHelper.ExecuteNonQuery($"update p_employeeTab set p_emp_addTag = 2,error_msg='{bszt},{sfyzzt}' where p_emp_idcardnum = '{sfzh}'");
}
//SqlHelper.ExecuteNonQuery($"update p_employeeTab set p_emp_addTag = 1 where p_emp_idcardnum = '{sfzh}'");
}
SetProcessMsg($"已报送:{name}");
}
}
}
}
//QueryApiUtil.detailTab = BaseImpl.GetDataTableResult(Model.DetailSourceSql);
QueryApiUtil.detailTab = BaseImpl.GetDataTableResult(Model.DetailSourceSql);
Invoke(new Action(() =>
{
rowsEnumerable = QueryApiUtil.detailTab.AsEnumerable();
int maxCount = rowsEnumerable.Where(n => (n["p_emp_addTag"] + "").Equals("1")).Count();
if (maxCount > 0)
{
@@ -416,7 +416,7 @@ namespace Lskj.QueryEssentialInfo
foreach (DataRow detailRow in detailTab.Rows)
{
string addTag = detailRow["p_emp_addTag"] + "";
if (addTag.Equals("1"))
if (!string.IsNullOrEmpty(addTag) && !addTag.Equals("0"))
{
continue;
}