From efa57c53b1b4c94e188a52f5a35d0a4ca8a82cb5 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 29 六月 2023 14:55:30 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/工资管理/Pay_WorkTimesBillController.cs | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 102 insertions(+), 17 deletions(-)
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_WorkTimesBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_WorkTimesBillController.cs"
index 42f6c0b..a1f74c1 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_WorkTimesBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_WorkTimesBillController.cs"
@@ -31,12 +31,20 @@
/// </summary>
[Route("Pay_WorkTimesBill/GetWorkTimesBill")]
[HttpGet]
- public object GetWorkTimesBill(string sWhere)
+ public object GetWorkTimesBill(string sWhere,string user)
{
try
{
-
+ if (!DBUtility.ClsPub.Security_Log("Pay_WorkTimesBillList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
ds = Sc_GetWorkTimesBill(sWhere);
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -57,12 +65,12 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_WorkTimesBillList order by 鏃ユ湡 desc", "h_v_Pay_WorkTimesBillList");
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_WorkTimesBillList order by hmainid desc", "h_v_Pay_WorkTimesBillList");
}
else
{
string sql1 = "select * from h_v_Pay_WorkTimesBillList where 1 = 1 ";
- string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere + " order by hmainid desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Pay_WorkTimesBillList");
}
@@ -99,7 +107,8 @@
",瀹℃牳鏃ユ湡,淇敼浜�,淇敼鏃ユ湡,鍏抽棴浜�, 鍏抽棴鏃ユ湡,HEmpID" +
",HEmpNumber,HEmpName,鑱屽憳绯绘暟 HEmpRate,鍩烘湰澶╂暟 HBaseDays,鍩烘湰宸ユ椂 HBaseTimes,鍔犵彮宸ユ椂 HOverTimes,璇峰亣宸ユ椂 HLeaveTimes,鍔犵彮澶╂暟 HOverDays,璇峰亣澶╂暟 HLeaveDays,杩熷埌娆℃暟 HLateQty" +
",鍏嚭 HOutForComQty,绉佸嚭 HOutForEmpQty,鍏嚭鏃堕棿 HOutForComTimes,绉佸嚭鏃堕棿 HOutForEmpTimes,杩熷埌鏃堕棿 HLateTimes,鏃╅��娆℃暟 HEarlyQty,鏃╅��鏃堕棿 HEarlyTimes" +
- ",鏃峰伐澶╂暟 HAbsentDays,涓婂崍 HAMTimes,涓嬪崍 HPMTimes, 琛ㄤ綋澶囨敞 HRemark,HRestFlag,HSchClassID FROM h_v_Pay_WorkTimesBillList where 1 = 1 ";
+ ",鏃峰伐澶╂暟 HAbsentDays,涓婂崍 HAMTimes,涓嬪崍 HPMTimes,HCTPrjID,HCTPrjNumber,HCTPrjName,HWorkTypeID,HWorkTypeNumber,HWorkTypeName,HPayMoney,HMoney" +
+ ",琛ㄤ綋澶囨敞 HRemark,HRestFlag,HSchClassID FROM h_v_Pay_WorkTimesBillList where 1 = 1 ";
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Pay_WorkTimesBillList");
objJsonResult.code = "0";
@@ -117,6 +126,7 @@
return objJsonResult;
}
#endregion
+
/// <summary>
/// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
@@ -132,22 +142,22 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
string refSav = sArray[2].ToString();
- //string msg4 = sArray[3].ToString();
+ string msg4 = sArray[3].ToString();
string UserName = "";
string s = "";
ListModels oListModels = new ListModels();
try
{
- ////缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second("Pay_SingleBalBill_Edit", 1, false, msg4))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Pay_WorkTimesBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
DLL.ClsPay_WorkTimesBill oBill = new DLL.ClsPay_WorkTimesBill();
List<Models.ClsPay_WorkTimesBillMain> lsmain = new List<Models.ClsPay_WorkTimesBillMain>();
@@ -286,10 +296,18 @@
/// <returns></returns>
[Route("Pay_WorkTimesBill/DeltetWorkTimesBill")]
[HttpGet]
- public object DeltetWorkTimesBill(string HInterID)
+ public object DeltetWorkTimesBill(string HInterID,string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Pay_WorkTimesBill_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
oCN.BeginTran();
oCN.RunProc("Delete From Pay_WorkTimesBillMain where HInterID = " + HInterID);
oCN.RunProc("Delete From Pay_WorkTimesBillSub where HInterID = " + HInterID);
@@ -310,6 +328,73 @@
return objJsonResult;
}
}
- //
+ /// <summary>
+ /// 閫氳繃鐝粍鏌ヨ鑱屽憳淇℃伅
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Pay_WorkTimesBill/GetEmployeeByHGroup")]
+ [HttpGet]
+ public object GetEmployeeByHGroup(int HGroupID)
+ {
+ if (HGroupID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐝粍鏈�夋嫨";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ List<object> list = new List<object>();
+ DataSet ds1;
+ string sql1 = string.Format(@"select a.HItemID HEmpID,a.HNumber HEmpNumber,a.HName HEmpName,a.HEmpRate HEmpRate,a.HCTPrjID,b.HName HCTPrjName from Gy_Employee a
+ left join Gy_ClassTimePrjGroup b on a.HCTPrjID=b.HItemID
+ where a.HGroupID=" + HGroupID);
+ ds1 = oCN.RunProcReturn(sql1, "Gy_Employee");
+ list.Add(ds1.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ [Route("Pay_WorkTimesBill/calcAvgMoney")]
+ [HttpPost]
+ public object GetEmployeeByHGroup([FromBody] JObject msg) {
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ List<object> list = new List<object>();
+ DataSet ds;
+ string sql = string.Format($"exec h_p_CalcAvgMoney '{msg["msg"]}'");
+ ds = oCN.RunProcReturn(sql, "h_p_CalcAvgMoney");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1