From f10feb72cae8d10d2e05ca8919b791a8f38dd763 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 03 十一月 2022 18:01:51 +0800
Subject: [PATCH] 安灯报表报错问题修改 设备点检标准导入，模板验证、数据验证接口开发
---
VueWebApi/Controllers/ReportManagerController.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/VueWebApi/Controllers/ReportManagerController.cs b/VueWebApi/Controllers/ReportManagerController.cs
index 462eb8c..213bc99 100644
--- a/VueWebApi/Controllers/ReportManagerController.cs
+++ b/VueWebApi/Controllers/ReportManagerController.cs
@@ -11,7 +11,7 @@
{
[RoutePrefix(prefix: "api/ReportManager")]
[ControllerGroup("鎶ヨ〃绠＄悊", "鍦ㄧ嚎鎺ュ彛")]
- [ChannelActionFilter]
+ //[ChannelActionFilter]
public class ReportManagerController : ApiController
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -467,13 +467,14 @@
/// <param name="prop">鎺掑簭瀛楁</param>
/// <param name="order">鎺掑簭瑙勫垯</param>
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <param name="eqpcode">璁惧缂栫爜</param>
/// <param name="calltypecode">鍛煎彨绫诲瀷缂栫爜</param>
/// <param name="calldate">鍛煎彨鏃堕棿</param>
/// <param name="responddate">鍝嶅簲鏃堕棿</param>
/// <returns></returns>
[Route(template: "AnDonReportSumSearch")]
[HttpGet]
- public HttpResponseMessage AnDonReportSumSearch(int page, int rows, string prop, string order, string wkshopcode = null, string calltypecode = null, string calldate = null, string responddate = null)
+ public HttpResponseMessage AnDonReportSumSearch(int page, int rows, string prop, string order, string wkshopcode = null,string eqpcode=null, string calltypecode = null, string calldate = null, string responddate = null)
{
string callopendate = ""; //鍛煎彨寮�濮嬫椂闂�
string callclosedate = ""; //鍛煎彨缁撴潫鏃堕棿
@@ -491,7 +492,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.AnDonReportSumSearch(wkshopcode, calltypecode, callopendate, callclosedate, respondopendate, respondclosedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.AnDonReportSumSearch(wkshopcode, eqpcode, calltypecode, callopendate, callclosedate, respondopendate, respondclosedate, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -501,13 +502,14 @@
/// 瀹夌伅鎶ヨ〃姹囨�诲鍑�
/// </summary>
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <param name="eqpcode">璁惧缂栫爜</param>
/// <param name="calltypecode">鍛煎彨绫诲瀷缂栫爜</param>
/// <param name="calldate">鍛煎彨鏃堕棿</param>
/// <param name="responddate">鍝嶅簲鏃堕棿</param>
/// <returns></returns>
[Route(template: "AnDonReportSumExcelSearch")]
[HttpGet]
- public HttpResponseMessage AnDonReportSumExcelSearch(string wkshopcode = null, string calltypecode = null, string calldate = null, string responddate = null)
+ public HttpResponseMessage AnDonReportSumExcelSearch(string wkshopcode = null,string eqpcode=null, string calltypecode = null, string calldate = null, string responddate = null)
{
string callopendate = ""; //鍛煎彨寮�濮嬫椂闂�
string callclosedate = ""; //鍛煎彨缁撴潫鏃堕棿
@@ -523,7 +525,7 @@
respondopendate = responddate.Split('~')[0].ToString();
respondclosedate = responddate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.AnDonReportSumExcelSearch(wkshopcode, calltypecode, callopendate, callclosedate, respondopendate, respondclosedate);
+ mes = ReportManagerBLL.AnDonReportSumExcelSearch(wkshopcode, eqpcode, calltypecode, callopendate, callclosedate, respondopendate, respondclosedate);
return TJson.toJson(mes);
}
#endregion
--
Gitblit v1.9.3