From 2cea3c0d7cb988f28b9c296457cd89a34ea1d0e8 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 16 八月 2022 16:24:11 +0800
Subject: [PATCH] 设备履历+器具履历
---
WebAPI/Controllers/GZGL/Gy_WorkPayTypeBillController.cs | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/WebAPI/Controllers/GZGL/Gy_WorkPayTypeBillController.cs b/WebAPI/Controllers/GZGL/Gy_WorkPayTypeBillController.cs
index b9c2fbd..230388f 100644
--- a/WebAPI/Controllers/GZGL/Gy_WorkPayTypeBillController.cs
+++ b/WebAPI/Controllers/GZGL/Gy_WorkPayTypeBillController.cs
@@ -42,30 +42,31 @@
}
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_WorkPayTypeList " + sWhere, "h_v_Gy_WorkPayTypeList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_WorkPayTypeList order by 宸ヨ祫绫诲瀷浠ｇ爜 ", "h_v_Gy_WorkPayTypeList");
}
else
{
string sql1 = "select * from h_v_Gy_WorkPayTypeList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ " order by 宸ヨ祫绫诲瀷浠ｇ爜 ";
ds = oCN.RunProcReturn(sql, "h_v_Gy_WorkPayTypeList");
}
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- 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];
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
}
catch (Exception e)
{
--
Gitblit v1.9.1