From 3e761e2ad2642600b250bcbc724e97cb9e003303 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期二, 25 十月 2022 17:03:21 +0800
Subject: [PATCH] 修复bug
---
web/web/GwStatisV3.ashx | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/web/web/GwStatisV3.ashx b/web/web/GwStatisV3.ashx
index 0604141..465c896 100644
--- a/web/web/GwStatisV3.ashx
+++ b/web/web/GwStatisV3.ashx
@@ -10,8 +10,13 @@
public class GwStatisV3 : PageHandler<SysUser>
{
private GwStatisV3Dao _Dao = new GwStatisV3Dao();
+ private GwOrderDao orderDao = new GwOrderDao();
+ private GwSpPrePatternDao spPrePatternDao = new GwSpPrePatternDao();
+ private GwAuditCacheDao gwAuditCacheDao = new GwAuditCacheDao();
+ private GwEventLogDao gwEventLogDao = new GwEventLogDao();
+
private int _userId = -1;
- private int _userType = -1;
+ private string _userType = "";
private string _account = "";
public override JsonPageResult ProcessRequestInternal(PageContext<Model.SysUser> context)
@@ -34,10 +39,46 @@
private JsonPageResult GetRealtimeStatis5m(PageContext<SysUser> context)
{
+
+ string permissionsSQL = new GwClientDao().GetClientPermissions(_userId, _userType, null);
+
var oplist = _Dao.GetRealtimeStatis5mOut();
var aplist = _Dao.GetRealtimeStatis5mIn();
+
+ //娲诲姩瀹㈡埛锛氬鎴�-鍙戦�侀噺銆愬綋鏃ャ��
+ var activeClientDayList = _Dao.GetActiveClientDay(permissionsSQL);
+ //閫氶亾-鍙戦�侀噺銆愬綋鏃ャ��
+ var opSendDayList = _Dao.GetOpSendDay(permissionsSQL);
+ //浜у搧-鍙戦�侀噺銆愬綋鏃ャ��
+ var productSendDayList = _Dao.GetProductSendDay(permissionsSQL);
+ //璁㈠崟:浠婃棩宸插畬鎴愯鍗�
+ var orderDayList = orderDao.GetOrderDay(permissionsSQL);
+ //璁㈠崟:寰呭鏍歌鍗�
+ var orderAuditList = orderDao.GetOrderAudit(permissionsSQL);
+ //鍙戦�佸唴瀹�:寰呭鏍�
+ var sendAuditList = gwAuditCacheDao.GetSendAudit(permissionsSQL);
+ //鍙戦�佸唴瀹�:浜屾寰呭鏍�
+ var sendAuditTowList = gwAuditCacheDao.GetSendAuditTow(permissionsSQL);
+ //璐﹀彿鎶ュ鍐呭:寰呭鏍�
+ var spPrePatternAuditList = spPrePatternDao.GetSpPrePatternAudit(permissionsSQL);
+ //閫氶亾鐘舵��
+ var opStatusList = gwEventLogDao.GetOpStatus(permissionsSQL);
+
+
- return new JsonPageResult(true, new { ApList = aplist, OpList = oplist } );
+ return new JsonPageResult(true, new {
+ ApList = aplist,
+ OpList = oplist,
+ ActiveClientDayList = activeClientDayList,
+ OpSendDayList = opSendDayList,
+ ProductSendDayList = productSendDayList,
+ OrderDayList = orderDayList,
+ OrderAuditList = orderAuditList,
+ SendAuditList = sendAuditList,
+ SendAuditTowList = sendAuditTowList,
+ SpPrePatternAuditList = spPrePatternAuditList,
+ OpStatusList = opStatusList
+ } );
}
private string GetApName(List<GwAp>aplist, int apID)
{
@@ -81,6 +122,8 @@
string opID = context.GetString("opid");
string statistype = context.GetString("statistype");
StatisOption statisoption = (StatisOption)context.GetInt("statisoption");
+
+ string permissionsSQL = new GwClientDao().GetClientPermissions(_userId, _userType, null);
List<GwOp> opList;
@@ -93,7 +136,7 @@
using (GwClientDao dao = new GwClientDao())
{
- clientList = dao.LoadInfoList("", "", "", "");
+ clientList = dao.LoadInfoList("", "", "", "", permissionsSQL);
}
List<GwAp> apList;
@@ -104,10 +147,10 @@
apList = dao.LoadInfoList("", "", "", out recordCount, 99999, 1);
}
+
+ //var list = _Dao.Query(beginTime, endTime, clientID, spID, apID, opID, statistype, (StatisOption)statisoption);
//鏍规嵁绯荤粺鐢ㄦ埛鑾峰彇鏈夋潈闄愬鎴�
- string permissionsSQL = new GwClientDao().GetClientPermissions(_userId, _userType, null);
-
var list = _Dao.Query(beginTime, endTime, clientID, spID, apID, opID, statistype, permissionsSQL, (StatisOption)statisoption);
System.Text.StringBuilder sb = new System.Text.StringBuilder();
--
Gitblit v1.9.1