Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

zrg

2024-10-15 0a94e9a23e3fdaf55d962cafefb3e6d012a23388

 WebAPI/Controllers/¹¤×ʹÜÀí/Pay_WorkTimesBillController.cs

@@ -8,7 +8,7 @@
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;

using SyntacticSugar.constant;
namespace WebAPI.Controllers
{

@@ -83,6 +83,61 @@
        }
        #endregion

        #region è€ƒå‹¤æ±‡æŠ¥å•åˆ†é¡µåˆ—表
        [Route("Pay_WorkTimesBillController/page")]
        [HttpGet]
        public json Pay_WorkTimesBillPage(string sWhere, string user, int page, int size)
        {
            DataSet ds;
            json res = new json();
            try
            {
                List<object> columnNameList = new List<object>();
                //判断权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameList, 3, false, user))
                {
                    objJsonResult.code = CodeConstant.FAIL;
                    objJsonResult.count = CountConstant.FAIL;
                    objJsonResult.Message = "您没有该模块权限,请与管理员联系！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                sWhere = sWhere.Replace("'", "''");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCn.RunProcReturn("exec h_p_Pay_WorkTimesBillList " + page + "," + size + ",''", "h_p_Pay_WorkTimesBillList");
                }
                else
                {
                    ds = oCn.RunProcReturn("exec h_p_Pay_WorkTimesBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_Pay_WorkTimesBillList");
                }

                //添加列名
                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));//获取到DataColumn列对象的列名
                }

                res.code = CodeConstant.SUCCEED;
                res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
                res.Message = "Sucess！";
                res.list = columnNameList;
                res.data = ds.Tables[0];
                return res;
            }
            catch (Exception e)
            {
                res.code = CodeConstant.FAIL;
                res.count = CountConstant.FAIL;
                res.Message = "Exception！" + e.ToString();
                res.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region è€ƒå‹¤æ±‡æŠ¥å•åˆ é™¤
        /// <summary>
        /// åˆ é™¤è€ƒå‹¤æ±‡æŠ¥å•