From d9b0743ee516c6c33660b8950743683957dd8390 Mon Sep 17 00:00:00 2001
From: tdx <tdx@local>
Date: Thu, 4 Dec 2025 07:58:58 +0000
Subject: [PATCH] SVN r1072

SVN-Revision: r1072
---
 插件库/Lskj.QueryEssentialInfo/FrmMain.cs     | 32 ++++++++++++++-----
 .../Lskj.QueryEssentialInfo/QueryApiUtil.cs   |  2 +-
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/插件库/Lskj.QueryEssentialInfo/FrmMain.cs b/插件库/Lskj.QueryEssentialInfo/FrmMain.cs
index 72d2aba..db8941c 100644
--- a/插件库/Lskj.QueryEssentialInfo/FrmMain.cs
+++ b/插件库/Lskj.QueryEssentialInfo/FrmMain.cs
@@ -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)
                 {
diff --git a/插件库/Lskj.QueryEssentialInfo/QueryApiUtil.cs b/插件库/Lskj.QueryEssentialInfo/QueryApiUtil.cs
index 233aacd..96672fd 100644
--- a/插件库/Lskj.QueryEssentialInfo/QueryApiUtil.cs
+++ b/插件库/Lskj.QueryEssentialInfo/QueryApiUtil.cs
@@ -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;
                     }