From dbda463cdacc6c6101acdf9d58e22450a281b9b0 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期二, 07 六月 2022 23:11:04 +0800
Subject: [PATCH] 客户信息管理 停用客户信息管理
---
web/Dao/GwOrderDao.cs | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/web/Dao/GwOrderDao.cs b/web/Dao/GwOrderDao.cs
index 5c5090f..44532b5 100644
--- a/web/Dao/GwOrderDao.cs
+++ b/web/Dao/GwOrderDao.cs
@@ -32,7 +32,7 @@
//flag: 0-寰呭鏍歌鍗�(宸叉彁浜ゃ�佸鏍镐腑)锛�1-宸插畬鎴愯鍗曪紙瀹℃牳閫氳繃銆佸鏍镐笉閫氳繃銆佸彇娑堬級
- public List<GwOrder> LoadInfoList(string spId, string clientId, string clientName, int flag, DateTime startDate, DateTime endDate, int pageSize, int PageIndex, out int recordcount)
+ public List<GwOrder> LoadInfoList(string spId, string clientId, string compay, int flag, DateTime startDate, DateTime endDate, int pageSize, int PageIndex, string permissionsSQL, out int recordcount)
{
List<GwOrder> list = new List<GwOrder>();
@@ -41,8 +41,9 @@
{
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.Append(" FROM ( ");
- stringBuilder.Append("SELECT GWO.*, GWC.CLIENT_NAME ");
+ stringBuilder.Append("SELECT GWO.*, GWC.CLIENT_NAME, GWC.COMPANY, GWOA.AUDITOR ");
stringBuilder.Append(" FROM GW_ORDER GWO ");
+ stringBuilder.Append(" LEFT JOIN (select ORDER_ID, wm_concat(SU.USER_NAME) AUDITOR from (select ORDER_ID, AUDITOR FROM GW_ORDER_AUDIT order by ORDER_ID, AUDIT_SORT) GOA LEFT JOIN SYS_USER SU ON SU.ACCOUNT = GOA.AUDITOR group by ORDER_ID ) GWOA ON GWOA.ORDER_ID = GWO.ORDER_ID ");
stringBuilder.Append(" LEFT JOIN GW_SP GWS ON GWS.SP_ID = GWO.SP_ID ");
stringBuilder.Append(" LEFT JOIN GW_CLIENT GWC ON GWC.CLIENT_ID = GWO.CLIENT_ID ");
stringBuilder.Append(" WHERE 1=1 ");
@@ -81,10 +82,13 @@
{
stringBuilder.Append(" and GWO.CLIENT_ID like '%" + clientId + "%'");
}
- if ((clientName != null) && (clientName != ""))
+ if ((compay != null) && (compay != ""))
{
- stringBuilder.Append(" and GWC.CLIENT_NAME like '%" + clientName + "%'");
+ stringBuilder.Append(" and GWC.COMPANY like '%" + compay + "%'");
}
+ //瀹㈡埛鏉冮檺SQL鑴氭湰
+ stringBuilder.Append(permissionsSQL);
+
stringBuilder.Append(" ) T ");
OracleParameter[] parameterArray = new OracleParameter[] { new OracleParameter(":START_TIME", startDate), new OracleParameter(":END_TIME", endDate) };
@@ -305,7 +309,8 @@
OracleReaderWrapper oracleReaderWrapper = new OracleReaderWrapper(reader);
o.OrderId = oracleReaderWrapper.GetString("ORDER_ID", "");
o.SpId = oracleReaderWrapper.GetString("SP_ID", "");
- o.ClientId = oracleReaderWrapper.GetString("CLIENT_ID", "");
+ o.ClientId = oracleReaderWrapper.GetString("CLIENT_ID", "");
+ o.Company = oracleReaderWrapper.GetString("COMPANY", "");
o.ClientName = oracleReaderWrapper.GetString("CLIENT_NAME", "");
o.ProductId = oracleReaderWrapper.GetString("PRODUCT_ID", "");
o.ComboId = oracleReaderWrapper.GetString("COMBO_ID", "");
@@ -318,7 +323,7 @@
o.BeforeBalanceNum = oracleReaderWrapper.GetInt("BEFORE_BALANCE_NUM", 0);
o.Creator = oracleReaderWrapper.GetString("CREATOR", "");
o.CreateTime = oracleReaderWrapper.GetDateTime("CREATE_TIME");
- //o.Auditor = oracleReaderWrapper.GetString("AUDITOR", "");
+ o.Auditor = oracleReaderWrapper.GetString("AUDITOR", ""); //鍚勭骇瀹℃牳浜�
//o.AuditTime = oracleReaderWrapper.GetDateTime("AUDIT_TIME");
o.Status = oracleReaderWrapper.GetInt("STATUS", 0);
o.Remark = oracleReaderWrapper.GetString("REMARK", "");
--
Gitblit v1.9.1