合并冲突

chenhaozhe

2025-05-30 edcd7574e709748c5d3ccc0bd54930414ddcfc9a

 WebAPI/Controllers/Æ·ÖʹÜÀí/»·¾³¼ì²âµ¥/QC_EnvironmentTestDotCheckBillController.cs

@@ -938,7 +938,64 @@
                return objJsonResult;
            }
        }
        #endregion     
        #endregion

        #region çŽ¯å¢ƒæ£€æµ‹ æœˆæŸ¥è¯¢ æŠ¥è¡¨
        [Route("QC_EnvironmentTestDotCheckBill/getQC_EnvironmentTestDotCheckReport")]
        [HttpGet]
        public object getQC_EnvironmentTestDotCheckReport(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();


                Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);

                string sDate = dic["sDate"].ToString();
                string HEnvironmentTestSchemeID = dic["HEnvironmentTestSchemeID"].ToString();

                ds = oCN.RunProcReturn("exec h_p_QC_EnvironmentTestDotCheckReport '" + sDate + "','" + HEnvironmentTestSchemeID + "'", "h_p_QC_EnvironmentTestDotCheckReport");
                if (ds.Tables.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未查询到数据！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (ds == null || 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

    }
}