From 883bc24b2af63f2b5cadf7576e7892720c7ed9b7 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 16 二月 2023 07:54:46 +0800
Subject: [PATCH] 报工人员、班组合并
---
VueWebApi/Controllers/ReportManagerController.cs | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/VueWebApi/Controllers/ReportManagerController.cs b/VueWebApi/Controllers/ReportManagerController.cs
index 213bc99..fbc8c54 100644
--- a/VueWebApi/Controllers/ReportManagerController.cs
+++ b/VueWebApi/Controllers/ReportManagerController.cs
@@ -89,6 +89,7 @@
/// <summary>
/// 鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
/// </summary>
+ /// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -104,7 +105,7 @@
/// <returns></returns>
[Route(template: "GroupSalaryReportSearch")]
[HttpGet]
- public HttpResponseMessage GroupSalaryReportSearch(int page, int rows, string prop, string order, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null)
+ public HttpResponseMessage GroupSalaryReportSearch(int page, int rows, string prop, string order,string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null)
{
string operopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string operclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -115,7 +116,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.GroupSalaryReportSearch(wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.GroupSalaryReportSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -139,6 +140,7 @@
/// <summary>
/// 鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
/// </summary>
+ /// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -150,7 +152,7 @@
/// <returns></returns>
[Route(template: "GroupSalaryReportExcelSearch")]
[HttpGet]
- public HttpResponseMessage GroupSalaryReportExcelSearch(string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null)
+ public HttpResponseMessage GroupSalaryReportExcelSearch(string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null)
{
string operopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string operclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -159,7 +161,7 @@
operopendate = operdate.Split('~')[0].ToString();
operclosedate = operdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.GroupSalaryReportExcelSearch(wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate);
+ mes = ReportManagerBLL.GroupSalaryReportExcelSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate);
return TJson.toJson(mes);
}
#endregion
@@ -169,6 +171,7 @@
/// <summary>
/// 浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃
/// </summary>
+ /// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -184,7 +187,7 @@
/// <returns></returns>
[Route(template: "PeopleSalaryReportSearch")]
[HttpGet]
- public HttpResponseMessage PeopleSalaryReportSearch(int page, int rows, string prop, string order, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string reportname = null, string reportdate = null)
+ public HttpResponseMessage PeopleSalaryReportSearch(int page, int rows, string prop, string order,string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string reportname = null, string reportdate = null)
{
string reportopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string reportclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -195,7 +198,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.PeopleSalaryReportSearch(wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.PeopleSalaryReportSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -204,6 +207,7 @@
/// <summary>
/// 浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃瀵煎嚭
/// </summary>
+ /// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -215,7 +219,7 @@
/// <returns></returns>
[Route(template: "PeopleSalaryReportExcelSearch")]
[HttpGet]
- public HttpResponseMessage PeopleSalaryReportExcelSearch(string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string reportname = null, string reportdate = null)
+ public HttpResponseMessage PeopleSalaryReportExcelSearch(string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string reportname = null, string reportdate = null)
{
string reportopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string reportclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -224,7 +228,7 @@
reportopendate = reportdate.Split('~')[0].ToString();
reportclosedate = reportdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.PeopleSalaryReportExcelSearch(wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate);
+ mes = ReportManagerBLL.PeopleSalaryReportExcelSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate);
return TJson.toJson(mes);
}
#endregion
--
Gitblit v1.9.3