From 33641eb36f27b95c3cc676948043f57f56cb4e4a Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 29 十一月 2022 09:00:31 +0800
Subject: [PATCH] 合并
---
WebAPI/Controllers/BaseSet/Gy_SourceController.cs | 83 ++++++++++++++++++++++++-----------------
1 files changed, 48 insertions(+), 35 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_SourceController.cs b/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
index bb25b6e..28dfdea 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -32,41 +33,53 @@
{
try
{
- //鏌ョ湅鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Gy_Source", 1, false, user))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ //if (!DBUtility.ClsPub.Security_Log("Gy_Source_Query", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_SourceList where 1=1 ", "h_v_IF_SourceList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_SourceList where 1=1 order by 鐢熶骇璧勬簮浠ｇ爜 ", "h_v_IF_SourceList");
}
else
{
string sql1 = "select * from h_v_IF_SourceList where 1=1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ " order by 鐢熶骇璧勬簮浠ｇ爜 ";
ds = oCN.RunProcReturn(sql, "h_v_IF_SourceList");
}
- if (ds == null || ds.Tables[0].Rows.Count == 0)
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
- objJsonResult.data = null;
- return objJsonResult;
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+
+ //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
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
}
catch (Exception e)
{
@@ -94,15 +107,15 @@
string msg1 = sArray[0].ToString();
string msg2 = sArray[1].ToString();
- //鏌ョ湅鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Gy_Source_Edit", 1, false, msg2))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ ////鏌ョ湅鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_Source_Edit", 1, false, msg2))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
Int64 HItemID = 0;
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
--
Gitblit v1.9.1