From 16bb2f7b48cf2c3cfbb6a026c265d4e52d22eca4 Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期六, 29 十月 2022 17:11:14 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs b/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs index ab437d2..48220d8 100644 --- a/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs @@ -1,4 +1,5 @@ 锘縰sing DBUtility; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; @@ -31,6 +32,7 @@ { try { + List<object> columnNameList = new List<object>(); //鏌ョ湅鏉冮檺 if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckClass_Query", 1, false, user)) { @@ -52,12 +54,22 @@ ds = oCN.RunProcReturn(sql, "h_v_IF_QCCheckClassList"); } + //娣诲姞鍒楀悕 + 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));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + //if (ds.Tables[0].Rows.Count != 0 || ds != null) //{ objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucess锛�"; objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; return objJsonResult; //} //else -- Gitblit v1.9.1