SMGW_NewWeb.git

			@@ -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, string permissionsSQL, 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,9 +82,9 @@
			{
			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);
			@@ -284,7 +285,7 @@
			GwOrder o = new GwOrder();
			if (string.IsNullOrEmpty(orderId))
			return o;
			using (OracleDataReader reader = OracleHelper.ExecuteReader(string.Format("select * from GW_ORDER where ORDER_ID=:ORDER_ID"), OracleHelper.Connection, new OracleParameter(":ORDER_ID", (object)orderId)))
			using (OracleDataReader reader = OracleHelper.ExecuteReader(string.Format("select gwo.*, gc.COMPANY, gp.name PRODUCT_NAME from gw_order gwo left join gw_client gc on gc.client_id = gwo.client_id left join gw_product gp on gp.id = gwo.product_id where gwo.ORDER_ID=:ORDER_ID"), OracleHelper.Connection, new OracleParameter(":ORDER_ID", (object)orderId)))
			{
			if (((DbDataReader)reader).Read())
			{
			@@ -308,9 +309,11 @@
			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.ProductName = oracleReaderWrapper.GetString("PRODUCT_NAME", "");
			o.ComboId = oracleReaderWrapper.GetString("COMBO_ID", "");
			o.BasicNum = oracleReaderWrapper.GetInt("BASIC_NUM", 0);
			o.GivingNum = oracleReaderWrapper.GetInt("GIVING_NUM", 0);
			@@ -321,7 +324,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", "");