From 7687ad80c90a1e8f2d9f5796dd6a36079fcdaae5 Mon Sep 17 00:00:00 2001 From: shakun Date: Sat, 20 Jan 2024 22:45:15 +0545 Subject: [PATCH] add customer name in reward list --- Business/Mobile/MobileServices.cs | 38 ++++----- Business/SendMoney/SendMoneyBusiness.cs | 2 +- Common/Helper/GetStatic.cs | 7 ++ Common/Model/ExRateCalculateRequest.cs | 2 + JsonRx/Api/CustomerController.cs | 10 +-- JsonRx/Api/MobileController.cs | 14 +++- JsonRx/Api/SendMoneyController.cs | 12 +-- .../Authentication/AuthenticationRepo.cs | 80 +++++++++---------- Repository/Mobile/MobileServicesRepo.cs | 42 +++++----- 9 files changed, 114 insertions(+), 93 deletions(-) diff --git a/Business/Mobile/MobileServices.cs b/Business/Mobile/MobileServices.cs index 83c663d..90cd5a4 100644 --- a/Business/Mobile/MobileServices.cs +++ b/Business/Mobile/MobileServices.cs @@ -398,7 +398,7 @@ namespace Business.Mobile CAmount = Convert.ToDecimal(m.cAmount == "" ? "0" : m.cAmount), CardOnline = "", CollCurrency = m.sCurrency, - CouponCode = "", + CouponCode = m.DeviceType, CustomerId = 0, IsExRateCalcByPartner = false, IsManualSc = false, @@ -719,7 +719,7 @@ namespace Business.Mobile if (!jsonRx.ErrorCode.Equals("0")) { Log.Debug("RegisterKYC | Validate form failed : " + JsonConvert.SerializeObject(jsonRx)); - jsonRx.SetResponse("1", jsonRx.Msg); + jsonRx.SetResponse("100", jsonRx.Msg); return jsonRx; } @@ -1028,7 +1028,7 @@ namespace Business.Mobile { enumString = RESPONSE_MSG.VALIDATE_FORM_2.ToString(); var map = Utilities.GetLanguageMapping(enumString, lang); - jsonRx.SetResponse("1", map.Message); + jsonRx.SetResponse("100", map.Message); return jsonRx; } @@ -1038,7 +1038,7 @@ namespace Business.Mobile { enumString = RESPONSE_MSG.VALIDATE_FORM_9.ToString(); var map = Utilities.GetLanguageMapping(enumString, lang); - jsonRx.SetResponse("1", map.Message); + jsonRx.SetResponse("100", map.Message); return jsonRx; } @@ -1047,19 +1047,19 @@ namespace Business.Mobile if (string.IsNullOrEmpty(kyc.idExpiryDate)) { - jsonRx.SetResponse("1", "IdExpiryDate is required"); + jsonRx.SetResponse("100", "IdExpiryDate is required"); return jsonRx; } if (string.IsNullOrEmpty(kyc.idStartDate)) { - jsonRx.SetResponse("1", "Idissue Date is required"); + jsonRx.SetResponse("100", "Idissue Date is required"); return jsonRx; } if (string.IsNullOrEmpty(kyc.idIssuingCountry)) { - jsonRx.SetResponse("1", "idIssuingCountry is required"); + jsonRx.SetResponse("100", "idIssuingCountry is required"); return jsonRx; } } @@ -1117,7 +1117,7 @@ namespace Business.Mobile { enumString = RESPONSE_MSG.VALIDATE_FORM_1.ToString(); var map = Utilities.GetLanguageMapping(enumString, lang); - jsonRx.SetResponse("1", map.Message); + jsonRx.SetResponse("100", map.Message); return jsonRx; } } @@ -1125,7 +1125,7 @@ namespace Business.Mobile { enumString = RESPONSE_MSG.VALIDATE_FORM_10.ToString(); var map = Utilities.GetLanguageMapping(enumString, lang); - jsonRx.SetResponse("1", map.Message); + jsonRx.SetResponse("100", map.Message); return jsonRx; } @@ -1133,14 +1133,14 @@ namespace Business.Mobile { if (isBackRequired == "1" && additionalIdBackUrl == null) { - jsonRx.SetResponse("1", "Additional ID Back is required!"); + jsonRx.SetResponse("100", "Additional ID Back is required!"); return jsonRx; } if (string.IsNullOrEmpty(kyc.additionalIdType)) { enumString = RESPONSE_MSG.VALIDATE_FORM_8.ToString(); var map = Utilities.GetLanguageMapping(enumString, lang); - jsonRx.SetResponse("1", map.Message); + jsonRx.SetResponse("100", map.Message); return jsonRx; } } @@ -1149,7 +1149,7 @@ namespace Business.Mobile if (!IsValidImage(ref kyc, idFrontUrl, idBackUrl, idSideUrl, additionalIdUrl, facePictureUrl, additionalIdBackUrl)) { Log.Debug("IsValidatedForm | Validate Image : Failed"); - jsonRx.SetResponse("1", "Invalid image file."); + jsonRx.SetResponse("100", "Invalid image file."); return jsonRx; } @@ -1709,12 +1709,12 @@ namespace Business.Mobile JsonRxResponse _resp = new JsonRxResponse() { ErrorCode = "0", Msg = "Success" }; if (string.IsNullOrEmpty(confirmpwd)) { - _resp.SetResponse("1", "Password can not be empty!"); + _resp.SetResponse("100", "Password can not be empty!"); return _resp; } if (confirmpwd.Length < 6) { - _resp.SetResponse("1", "Password must be of atleast 6 digits!"); + _resp.SetResponse("100", "Password must be of atleast 6 digits!"); return _resp; } @@ -1754,7 +1754,7 @@ namespace Business.Mobile { enumString = RESPONSE_MSG.NEW_USER_REGISTER_FAIL_4.ToString(); var map = Utilities.GetLanguageMapping(enumString, lang); - res.SetResponse("1", map.Message); + res.SetResponse("100", map.Message); return res; } @@ -1763,7 +1763,7 @@ namespace Business.Mobile { enumString = RESPONSE_MSG.NEW_USER_REGISTER_FAIL_6.ToString(); var map = Utilities.GetLanguageMapping(enumString, lang); - res.SetResponse("1", map.Message); + res.SetResponse("100", map.Message); return res; } @@ -1772,7 +1772,7 @@ namespace Business.Mobile { enumString = RESPONSE_MSG.NEW_USER_REGISTER_FAIL_5.ToString(); var map = Utilities.GetLanguageMapping(enumString, lang); - res.SetResponse("1", map.Message); + res.SetResponse("100", map.Message); return res; } @@ -2180,7 +2180,7 @@ namespace Business.Mobile if (liWalletStmtResponse == null) { jsonRx.ErrorCode = "1"; - jsonRx.Msg = "No wallet statement found."; + jsonRx.Msg = "No Record(s) Found!"; jsonRx.Data = new System.Collections.ArrayList(); Log.Debug("GetWalletStatement | Returning null while fetching the list of wallet statements."); return jsonRx; @@ -2414,7 +2414,7 @@ namespace Business.Mobile if (requiredList.Count > 0) { // string.Format("Required Fields:-" , string.Join(", ", requiredList.Select(x => x.Key).ToList())); - jsonResult.SetResponse("1", string.Format("Required Fields:-\r\n {0}", string.Join("\r\n", requiredList.Select(x => findMapKeyValue(x.Key)).ToList()))); + jsonResult.SetResponse("100", string.Format("Required Fields:-\r\n{0}", string.Join("\r\n", requiredList.Select(x => findMapKeyValue(x.Key)).ToList()))); return jsonResult; } diff --git a/Business/SendMoney/SendMoneyBusiness.cs b/Business/SendMoney/SendMoneyBusiness.cs index 3426171..34445b4 100644 --- a/Business/SendMoney/SendMoneyBusiness.cs +++ b/Business/SendMoney/SendMoneyBusiness.cs @@ -157,7 +157,7 @@ namespace Business.SendMoney CAmount = Convert.ToDecimal(m.cAmount == "" ? "0" : m.cAmount), CardOnline = "", CollCurrency = m.sCurrency, - CouponCode = "", + CouponCode = m.DeviceType, CustomerId = 0, IsManualSc = false, IsOnline = false, diff --git a/Common/Helper/GetStatic.cs b/Common/Helper/GetStatic.cs index 6e2091c..6ca8ce6 100644 --- a/Common/Helper/GetStatic.cs +++ b/Common/Helper/GetStatic.cs @@ -57,6 +57,13 @@ namespace Common.Helper else return strVal; } + public static String ShowDecimal1(String strVal) + { + if (strVal != "") + return double.Parse(strVal).ToString("0.00"); + else + return strVal; + } public static String ShowCommaAmt(string strVal) { diff --git a/Common/Model/ExRateCalculateRequest.cs b/Common/Model/ExRateCalculateRequest.cs index 1d242f5..8bea140 100644 --- a/Common/Model/ExRateCalculateRequest.cs +++ b/Common/Model/ExRateCalculateRequest.cs @@ -23,6 +23,8 @@ namespace Common.Model public string tpPCurrnecy { get; set; } public string userId { get; set; } public string discountedFee { get; set; } + + public string DeviceType { get; set; } } public class CommonRequest diff --git a/JsonRx/Api/CustomerController.cs b/JsonRx/Api/CustomerController.cs index 4c50966..ca4c93e 100644 --- a/JsonRx/Api/CustomerController.cs +++ b/JsonRx/Api/CustomerController.cs @@ -113,7 +113,7 @@ namespace JsonRx.Api JsonRxResponse res = new JsonRxResponse(); if (string.IsNullOrEmpty(newUserRegister.UserId)) { - res.SetResponse("1", "Email is required!"); + res.SetResponse("100", "Email is required!"); return Ok(res); } @@ -123,11 +123,11 @@ namespace JsonRx.Api // newUserRegister.phoneOs = Util.GetDeviceType(Request); newUserRegister.FullName= newUserRegister.FullName.ToTitleCase(TitleCase.All); var custRegisterResponse = _requestServices.NewUserRegister(newUserRegister); - + Log.Debug("NewUserRegister | RESPONSE : " + JsonConvert.SerializeObject(custRegisterResponse)); return Ok(custRegisterResponse); } - return ModelValidationError(ModelState); + return ModelValidationError(ModelState,"100"); } /// @@ -378,14 +378,14 @@ namespace JsonRx.Api /// /// /// - protected IHttpActionResult ModelValidationError(ModelStateDictionary modelState) + protected IHttpActionResult ModelValidationError(ModelStateDictionary modelState, string error="") { var modelErrors = modelState.Select(x => x.Value.Errors) .Where(y => y.Count > 0) .First()[0].ErrorMessage; JsonRxResponse jsonRx = new JsonRxResponse() { - ErrorCode = "1", + ErrorCode = error??"1", Msg = string.IsNullOrEmpty(modelErrors) ? "It seems like incorrect Json input(s)." : modelErrors, Data = "" }; diff --git a/JsonRx/Api/MobileController.cs b/JsonRx/Api/MobileController.cs index b4de293..5043525 100644 --- a/JsonRx/Api/MobileController.cs +++ b/JsonRx/Api/MobileController.cs @@ -165,7 +165,16 @@ namespace JsonRx.Api requestOTPModel.DeviceType = Util.GetDeviceType(Request); requestOTPModel.ProcessId = ProcessId; Log.Debug("RequestOTP | REQUEST : " + JsonConvert.SerializeObject(requestOTPModel)); - var staticDataResponse = _requestServices.RequestOTP(requestOTPModel); + + + JsonRxResponse staticDataResponse = new JsonRxResponse(); + //if (string.IsNullOrEmpty(requestOTPModel.userId)) + //{ + // staticDataResponse.SetResponse("100", "Email is required!"); + // return Ok(staticDataResponse); + //} + + staticDataResponse = _requestServices.RequestOTP(requestOTPModel); return Ok(staticDataResponse); } @@ -219,6 +228,9 @@ namespace JsonRx.Api LogicalThreadContext.Properties[LoggerProperty.CREATEDBY] = model.userId ?? model.pCurrency; LogicalThreadContext.Properties[LoggerProperty.METHODNAME] = "CalculateDefExRate"; LogicalThreadContext.Properties[LoggerProperty.IPADDRESS] = Request.GetClientIpAddress(); + + model.DeviceType = Util.GetDeviceType(Request); + Log.Debug("CalculateDefExRate | REQUEST : " + JsonConvert.SerializeObject(model)); if (ModelState.IsValid) { diff --git a/JsonRx/Api/SendMoneyController.cs b/JsonRx/Api/SendMoneyController.cs index 03e89e7..b2d9e89 100644 --- a/JsonRx/Api/SendMoneyController.cs +++ b/JsonRx/Api/SendMoneyController.cs @@ -135,6 +135,7 @@ namespace JsonRx.Api LogicalThreadContext.Properties[LoggerProperty.PROCESSID] = pId; LogicalThreadContext.Properties[LoggerProperty.METHODNAME] = "calculate"; LogicalThreadContext.Properties[LoggerProperty.CREATEDBY] = model.userId; + model.DeviceType= Util.GetDeviceType(Request); Log.Debug("Calculate | REQUEST : " + JsonConvert.SerializeObject(model)); if (ModelState.IsValid) { @@ -195,7 +196,7 @@ namespace JsonRx.Api if (model.DeliveryMethodId == "2" && (model.PAgent == null || model.PAgent == "" || model.PAgent == "0")) { - res.SetResponse("1", "Bank Id Is Required !"); + res.SetResponse("100", "Bank Id Is Required !"); return Ok(res); } if (!string.IsNullOrEmpty(model.PurposeOfRemittance) && @@ -203,17 +204,17 @@ namespace JsonRx.Api { if (string.IsNullOrEmpty(model.GoodsOrigin)) { - res.SetResponse("1", "GoodsOrigin is required!"); + res.SetResponse("100", "GoodsOrigin is required!"); return Ok(res); } if (string.IsNullOrEmpty(model.GoodsType)) { - res.SetResponse("1", "GoodsType is required!"); + res.SetResponse("100", "GoodsType is required!"); return Ok(res); } if (string.IsNullOrEmpty(model.PortOfShipment)) { - res.SetResponse("1", "PortOfShipment is required!"); + res.SetResponse("100", "PortOfShipment is required!"); return Ok(res); } @@ -231,7 +232,6 @@ namespace JsonRx.Api { res = _bussiness.SendTransaction(model); Log.Debug("DOTRANSACTION | RESPONSE : " + JsonConvert.SerializeObject(res)); - Log.Debug("DOTRANSACTION | RESPONSE : " + JsonConvert.SerializeObject(res)); if (res.ErrorCode == "0") { @@ -270,7 +270,7 @@ namespace JsonRx.Api } if (res.ErrorCode.Equals("0")) { - if (res.Extra3 != null && res.Extra3.ToString() == "N") + if (res.Extra3 != null && res.Extra3.ToString() == "N") enumString = RESPONSE_MSG.SEND_TRANSACTION_SUCCESS.ToString(); else diff --git a/Repository/Authentication/AuthenticationRepo.cs b/Repository/Authentication/AuthenticationRepo.cs index 5381ed0..14864cc 100644 --- a/Repository/Authentication/AuthenticationRepo.cs +++ b/Repository/Authentication/AuthenticationRepo.cs @@ -129,48 +129,48 @@ namespace Repository.Authentication ls.ErrorCode = "1"; // ls.Msg = dataTable.Rows[0]["errorCode"] + Convert.ToString(dataTable.Rows[0]["msg"]); - //return ls; - string enumString = string.Empty; + ////return ls; + //string enumString = string.Empty; - if (dataTable.Rows[0]["errorCode"].Equals("1")) - { - enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_1.ToString(); - } - else if (dataTable.Rows[0]["errorCode"].Equals("2")) - { - enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_2.ToString(); - } - else if (dataTable.Rows[0]["errorCode"].Equals("3")) - { - enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_3.ToString(); - } - else if (dataTable.Rows[0]["errorCode"].Equals("4")) - { - enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_4.ToString(); - } - else if (dataTable.Rows[0]["errorCode"].Equals("5")) - { - enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_5.ToString(); - } - else if (dataTable.Rows[0]["errorCode"].Equals("6")) - { - enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_6.ToString(); - } - else if (dataTable.Rows[0]["errorCode"].Equals("7")) - { - enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_7.ToString(); - } - else if (dataTable.Rows[0]["errorCode"].Equals("8")) - { - enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_8.ToString(); - } - else if (dataTable.Rows[0]["errorCode"].Equals("20")) - { - enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_20.ToString(); - } + //if (dataTable.Rows[0]["errorCode"].Equals("1")) + //{ + // enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_1.ToString(); + //} + //else if (dataTable.Rows[0]["errorCode"].Equals("2")) + //{ + // enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_2.ToString(); + //} + //else if (dataTable.Rows[0]["errorCode"].Equals("3")) + //{ + // enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_3.ToString(); + //} + //else if (dataTable.Rows[0]["errorCode"].Equals("4")) + //{ + // enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_4.ToString(); + //} + //else if (dataTable.Rows[0]["errorCode"].Equals("5")) + //{ + // enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_5.ToString(); + //} + //else if (dataTable.Rows[0]["errorCode"].Equals("6")) + //{ + // enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_6.ToString(); + //} + //else if (dataTable.Rows[0]["errorCode"].Equals("7")) + //{ + // enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_7.ToString(); + //} + //else if (dataTable.Rows[0]["errorCode"].Equals("8")) + //{ + // enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_8.ToString(); + //} + //else if (dataTable.Rows[0]["errorCode"].Equals("20")) + //{ + // enumString = RESPONSE_MSG.LOGIN_TO_SYSTEM_FAIL_20.ToString(); + //} - var map = Utilities.GetLanguageMapping(enumString, lang); - return new LoginResponse { ErrorCode = dataTable.Rows[0]["errorCode"].Equals("0") ? "0" : "1", Msg = map.Message}; + // var map = Utilities.GetLanguageMapping(enumString, lang); + return new LoginResponse { ErrorCode = dataTable.Rows[0]["errorCode"].Equals("0") ? "0" : "1", Msg = Convert.ToString(dataTable.Rows[0]["msg"]) }; //ls.Msg = map.Message; } diff --git a/Repository/Mobile/MobileServicesRepo.cs b/Repository/Mobile/MobileServicesRepo.cs index ee0ac84..9a7d7ef 100644 --- a/Repository/Mobile/MobileServicesRepo.cs +++ b/Repository/Mobile/MobileServicesRepo.cs @@ -114,13 +114,13 @@ namespace Repository.Mobile - //return new JsonRxResponse - //{ - // ErrorCode = _dbRes.ResponseCode, - //Msg = _dbRes.Msg, - //Extra = _dbRes.Id - //}; - } + //return new JsonRxResponse + //{ + // ErrorCode = _dbRes.ResponseCode, + //Msg = _dbRes.Msg, + //Extra = _dbRes.Id + //}; + } public JsonRxResponse GetNotifyInfo(string customerId) { var lang = Convert.ToString(CallContext.GetData(Constants.Language)); @@ -214,7 +214,7 @@ namespace Repository.Mobile { lst.Add(new KeyValues() { Key = row["detailTitle"].ToString(), Value = row["detailDesc"].ToString() }); } - + return lst; } public JsonRxResponse SubmitOTP(RequestOTPModel requestOTPModel) @@ -1005,18 +1005,18 @@ namespace Repository.Mobile accountNo = sRow["accountNo"].ToString(), payoutBankBranch = sRow["pBranchName"].ToString(), pAgentBank = sRow["pAgent"].ToString() ?? "[ANY WHERE]", - collAmount = GetStatic.ShowDecimal(sRow["cAmt"].ToString()) + " " + sRow["collCurr"].ToString(), + collAmount = GetStatic.ShowDecimal1(sRow["cAmt"].ToString()) + " " + sRow["collCurr"].ToString(), exRate = sRow["exRate"].ToString(), - serviceCharge = GetStatic.ShowDecimal(sRow["serviceCharge"].ToString()) + " " + sRow["collCurr"].ToString(), + serviceCharge = GetStatic.ShowDecimal1(sRow["serviceCharge"].ToString()) + " " + sRow["collCurr"].ToString(), payOutAmount = GetStatic.ShowDecimal(sRow["pAmt"].ToString()) + " " + sRow["payoutCurr"].ToString(), couponName = sRow["couponName"].ToString(), discountType = sRow["discountType"].ToString(), discountValue = sRow["discountValue"].ToString(), discountPercent = sRow["discountPercent"].ToString(), tranStatus = sRow["tranStatus"].ToString(), - rewardPoints = sRow["rewardPoints"].ToString(), + rewardPoints = GetStatic.ShowDecimal1(sRow["rewardPoints"].ToString()), ColorIcon = GetColor(sRow["PayStatus"].ToString()), - SenderFullName = sRow["senderName"].ToString(), + SenderFullName = sRow["senderName"].ToString(), PaymentDetails = new PaymentDetails() { AccountName = "IME LONDON", @@ -1027,7 +1027,7 @@ namespace Repository.Mobile Reference = sRow["senderName"].ToString(), SortCode = "04-06-93" } - + }; double discountval = 0, discountpercent = 0; @@ -1337,8 +1337,8 @@ namespace Repository.Mobile sql += ", @address1 = " + _dao.FilterString(newUserRegister.Address1); sql += ", @address2 = " + _dao.FilterString(newUserRegister.Address2); sql += ", @city = " + _dao.FilterString(newUserRegister.City); - sql += ", @gender = " + _dao.FilterString(newUserRegister.Gender); - + sql += ", @gender = " + _dao.FilterString(newUserRegister.Gender); + if (!string.IsNullOrEmpty(newUserRegister.FullName)) { var str = newUserRegister.FullName.Trim().Split(' '); @@ -1668,18 +1668,18 @@ namespace Repository.Mobile sql += ", @fromDate=" + _dao.FilterString(search.FromDate); sql += ", @toDate=" + _dao.FilterString(search.ToDate); Log.DebugFormat("GetWalletStatement | SQL : {0}", sql); - + var dt = _dao.ExecuteDataTable(sql); if (dt == null || dt.Rows.Count == 0) { return null; } - + foreach (DataRow dr in dt.Rows) { WalletStatementResponse tranHistoryResponse = new WalletStatementResponse() { - + TranId = Convert.ToString(dr["tranId"]), ControlNo = Convert.ToString(dr["controlNo"]), CollAmt = Convert.ToString(dr["collAmount"]), @@ -1689,8 +1689,8 @@ namespace Repository.Mobile PayStatus = Convert.ToString(dr["payStatus"]), PayoutMode = Convert.ToString(dr["payoutMode"]), TransactionDate = Convert.ToString(dr["sendDate"]), - ReceiverName= Convert.ToString(dr["ReceiverName"]), - PayoutCountry = Convert.ToString(dr["PayoutCountry"]), + ReceiverName = Convert.ToString(dr["ReceiverName"]), + PayoutCountry = Convert.ToString(dr["PayoutCountry"]), ColorCode = GetColorCode(dr["payStatus"].ToString()), TextCode = GetTextCode(dr["payStatus"].ToString()), }; @@ -3130,7 +3130,7 @@ namespace Repository.Mobile { CustomerName = row1["CUSTOMER_NAME"].ToString(), RewardAmount = string.Format("{0:0.##}", row1["REWARD_AMOUNT"].ToString()), - RewardType = row1["REWARD_TYPE"].ToString(), + RewardType = $"{row1["CUSTOMER_NAME"].ToString()} - { row1["REWARD_TYPE"].ToString()}", DestinationCustomerId = row1["DESTINATION_CUSTOMERID"].ToString(), CreatedDate = row1["CREATED_DATE"].ToString() });