From ab827809e020777c1c482846e1af90a16a51b067 Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期四, 17 十一月 2022 20:02:52 +0800 Subject: [PATCH] 合并 --- WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs index bed3260..20e9a95 100644 --- a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs +++ b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs @@ -1,4 +1,5 @@ -锘縰sing Newtonsoft.Json.Linq; +锘縰sing Newtonsoft.Json; +using Newtonsoft.Json.Linq; using Pub_Class; using System; using System.Collections.Generic; @@ -35,6 +36,7 @@ { try { + List<object> columnNameList = new List<object>(); if (!DBUtility.ClsPub.Security_Log("Sb_EquipRepairWorkBillList", 1, false, user)) { objJsonResult.code = "0"; @@ -46,10 +48,19 @@ ds = Sb_EquipRepairWorkBill_s(sWhere); + //娣诲姞鍒楀悕 + 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鍒楀璞$殑鍒楀悕 + } + objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�"; objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; return objJsonResult; } catch (Exception ex) @@ -151,6 +162,7 @@ { try { + List<object> columnNameList = new List<object>(); if (!DBUtility.ClsPub.Security_Log("Sb_EquipConkBookBillList", 1, false, user)) { objJsonResult.code = "0"; @@ -162,10 +174,19 @@ ds = Sb_EqpConkBookBillList_s(sWhere); + //娣诲姞鍒楀悕 + 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鍒楀璞$殑鍒楀悕 + } + objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�"; objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; return objJsonResult; } -- Gitblit v1.9.1