WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/WebAPIController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/工资管理/Pay_WorkTimesBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
@@ -382,7 +382,6 @@ string HEmpRate = list[0].HEmpRate ?? ""; string HExamRate = list[0].HExamRate ?? ""; DateTime HHealthCardEDate = Convert.ToDateTime("1900/1/1"); ////夿æé //if (!ClsPub.Security_Log(msg5, 1, false, msg4)) //{ WebAPI/Controllers/WebAPIController.cs
@@ -1023,7 +1023,8 @@ } try { ds = webserver.GetEmployeeList(sWhere, ref DBUtility.ClsPub.sErrInfo); string sql = $"Select * from h_v_IF_Emp {sWhere} Order by HNumber"; ds = oCN.RunProcReturn(sql, "h_v_IF_Emp"); if (ds == null || ds.Tables[0].Rows.Count <= 0) { objjson.code = "0"; WebAPI/Controllers/¹¤×ʹÜÀí/Pay_WorkTimesBillController.cs
@@ -328,8 +328,6 @@ return objJsonResult; } } // /// <summary> /// éè¿çç»æ¥è¯¢èåä¿¡æ¯ ///åæ°ï¼string sqlã @@ -343,7 +341,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "产åå¨å ·æªéæ©"; objJsonResult.Message = "çç»æªéæ©"; objJsonResult.data = null; return objJsonResult; } @@ -372,6 +370,31 @@ return objJsonResult; } } [Route("Pay_WorkTimesBill/calcAvgMoney")] [HttpPost] public object GetEmployeeByHGroup([FromBody] JObject msg) { try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); List<object> list = new List<object>(); DataSet ds; string sql = string.Format($"exec h_p_CalcAvgMoney '{msg["msg"]}'"); ds = oCN.RunProcReturn(sql, "h_p_CalcAvgMoney"); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "è·åä¿¡æ¯æåï¼"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } catch (Exception ex) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æè¿åä»»ä½è®°å½ï¼" + ex.ToString(); objJsonResult.data = null; return objJsonResult; } } } }