From 7141e956ca8488f6feb082828cd60653382b6c89 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 24 十一月 2025 16:37:24 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs |   74 +++++++++++++++++++++++++++++++++++--
 1 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
index c727cfb..2fcd8e6 100644
--- a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
@@ -26,6 +26,7 @@
         DataSet ds;
         string fileip = System.Configuration.ConfigurationManager.AppSettings["FileIP"];
 
+        #region 杩斿洖鑱屽憳鍒楄〃
         /// <summary>
         /// 杩斿洖鑱屽憳鍒楄〃
         ///鍙傛暟锛歴tring sql銆�
@@ -83,6 +84,68 @@
                 return objJsonResult;
             }
         }
+
+        #endregion
+
+        #region 杩斿洖鑱屽憳鍒楄〃
+        /// <summary>
+        /// 杩斿洖鑱屽憳鍒楄〃
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Gy_Employee/listPage")]
+        [HttpGet]
+        public object lislistPaget(string sWhere, string user, string Organization, int page, int size)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+                //缂栬緫鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log_second("Gy_Employee_Query", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                if (sWhere == null || sWhere.Equals(""))
+                {
+                    ds = oCN.RunProcReturn($@"exec h_p_IF_EmployeeListPage {page}, {size}, ''", "h_p_IF_StockPlaceListPage");
+                }
+                else
+                {
+                    sWhere = sWhere.Replace("'", "''");
+
+                    ds = oCN.RunProcReturn($@"exec h_p_IF_EmployeeListPage {page}, {size}, '{sWhere}'", "h_p_IF_StockPlaceListPage");
+                }
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+        #endregion
+
 
         #region 鑱屽憳 鏍戝舰鍥�
         public class TreeModel
@@ -375,6 +438,7 @@
                 string msg4 = sArray[2].ToString();
                 //string msg4 = sArray[2].ToString();
                 //string msg5 = sArray[3].ToString();
+
                 oCN.BeginTran();
                 //缂栬緫鏉冮檺
                 if (!DBUtility.ClsPub.Security_Log_second("Gy_Employee_Edit", 1, false, msg3))
@@ -590,7 +654,6 @@
                         + itemID + "," + listOne.HPostID +",N'" + listOne.HRemark + "');";
 
                     }
-                    LogService.Write(sql3);
                     oCN.RunProcReturn(sql3, "Gy_Employee_Post");
                     
                 }
@@ -612,6 +675,7 @@
                         objJsonResult.data = null;
                         return objJsonResult;
                     }
+
                     oCN.RunProc("Update Gy_Employee set " +
                     " HNumber='" +  HNumber + "'" +
                     ",HName='" +  HName + "'" +
@@ -698,15 +762,17 @@
                     ",HAddress='" +  HAddress.ToString() + "'" +
                     ",HDeptID= '" +  HDeptID + "' Where HItemID=" + HItemID);
 
+                   
+
                     oCN.RunProcReturn("delete from Gy_Employee_Post where HEmpID = " + HItemID, "Gy_Employee_Post");
 
                     string sql3 = "";
                     foreach (ClsGy_EmployeeSub listOne in list1)
                     {
                         sql3 += "insert into Gy_Employee_Post(HEmpID, HPostID, HRemark) Values("
-                       + HItemID + "," + listOne.HPostID  + ",N'" + listOne.HRemark + "');";
+                       + HItemID + ",N'" + listOne.HPostID  + "',N'" + listOne.HRemark + "');";
+            
                     }
-                    LogService.Write(sql3);
                     oCN.RunProcReturn(sql3, "Gy_WorkCenterSub");
                     
                 }
@@ -1331,7 +1397,7 @@
                 string sql = string.Empty;
                 //淇濆瓨
                 oCN.BeginTran();
-                sql = $"delete Gy_Employee where HItemID = {lsmain[0].HItemID}";
+                sql = $"delete Gy_Employee  where HItemID = {lsmain[0].HItemID}";
                 oCN.RunProc(sql);
                 sql = "set identity_insert Gy_Employee on";
                 oCN.RunProc(sql);

--
Gitblit v1.9.1