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

yangle

2023-08-15 c9ff4ffc79fcae265cbaac4df6aa421944377dab

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

@@ -1288,5 +1288,52 @@
            }
        }
        #endregion

        #region æ ¹æ®ç­ç»„获得职员列表
        [Route("Pay_GroupBalBill/getEmpListBasedGroupID")]
        [HttpGet]
        public object getEmpListBasedGroupID(int HGroupID)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                string sql = "select * from Gy_Employee where HGroupID = " + HGroupID;
                ds = oCN.RunProcReturn(sql, "EmpList");

                if (ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未找到该班组对应的职员列表！！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //添加列名
                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列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                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
    }
}