From 4625a964be61b460b484c575219f7a5b90694f5f Mon Sep 17 00:00:00 2001
From: wy <1qaz@123>
Date: 星期一, 26 九月 2022 21:19:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/YqnApi
---
WebAPI/Controllers/WebAPIController.cs | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index eadcfb0..277aa9e 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -631,7 +631,7 @@
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- ds = oCN.RunProcReturn("Select HItemID,HNumber 鐝粍浠ｇ爜,HName 鐝粍 from h_v_IF_Group where HStopflag=0 " + sWhere + " Order by HItemID ", "h_v_IF_Group");
+ ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName from h_v_IF_Group where HStopflag=0 " + sWhere + " Order by HItemID ", "h_v_IF_Group");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objjson.code = "0";
@@ -811,6 +811,39 @@
return objjson; ;
}
}
+
+ //鏍规嵁鐧诲綍浜哄憳杩斿洖 鐝粍 鍜� 鑱屽憳1锛�2
+ [Route("Web/getGroupEmp")]
+ [HttpGet]
+ public object getGroupEmp(string HUserName)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ string sql = string.Format(@"
+select t1.*,isnull(t2.HName,'') as HGroupName,isnull(t3.HName,'') as HEmpName1,isnull(t4.HName,'') as HEmpName2 from pay_scan_GroupEmp t1
+left join Gy_Group t2 on t1.HGROUPID =t2.HItemID
+left join Gy_Employee t3 on t1.HEMPID1 =t3.HItemID
+left join Gy_Employee t4 on t1.HEMPID2 =t4.HItemID
+where t1.HMAKER ='{0}'
+", HUserName);
+ ds = oCn.RunProcReturn(sql, "pay_scan_GroupEmp");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
}
}
--
Gitblit v1.9.1