王 垚
2022-07-12 ddabe21abf229d23ccb248276e818c5e1101033d
工资管理 优化
3个文件已修改
35 ■■■■ 已修改文件
WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/WebAPIController.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/工资管理/Pay_WorkTimesBillController.cs 31 ●●●● 补丁 | 查看 | 原始文档 | 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;
            }
        }
    }
}