diff --git a/YLErpDAL/BLL/EodSettlement/RealtimePnlCalc.cs b/YLErpDAL/BLL/EodSettlement/RealtimePnlCalc.cs index 51924251..7e51f2ef 100644 --- a/YLErpDAL/BLL/EodSettlement/RealtimePnlCalc.cs +++ b/YLErpDAL/BLL/EodSettlement/RealtimePnlCalc.cs @@ -649,7 +649,6 @@ namespace YLErp.BLL.Eod clientPosition.update_time = DateTime.Now; bondDb.client_position.Add(clientPosition); } - bondDb.SaveChanges(); SetClientPositionPrice(clientPosition); clientPosition.swap_market_value = clientPosition.full_price_now * clientPosition.position_qty * (clientPosition.side == 0 ? 1 : -1); clientPosition.position_profit_loss = (clientPosition.full_price_now - clientPosition.deal_full_price_avg) * clientPosition.position_qty * (clientPosition.side == 0 ? 1 : -1); diff --git a/YLErpDAL/Helpers/EmailHelper.cs b/YLErpDAL/Helpers/EmailHelper.cs index 19dbceb4..89086f15 100644 --- a/YLErpDAL/Helpers/EmailHelper.cs +++ b/YLErpDAL/Helpers/EmailHelper.cs @@ -82,7 +82,7 @@ namespace YLErp.Helpers CC = ccEmail }); - return result; + return string.Empty; } catch (Exception ex) { diff --git a/YLErpDAL/Modules/ClientModule/ClientBankCardService.cs b/YLErpDAL/Modules/ClientModule/ClientBankCardService.cs index 6f9e3358..93c0d8dd 100644 --- a/YLErpDAL/Modules/ClientModule/ClientBankCardService.cs +++ b/YLErpDAL/Modules/ClientModule/ClientBankCardService.cs @@ -362,7 +362,7 @@ namespace YLErp.Modules.ClientModule new ExcelHelper.DataColumnModel("账号", "Card",typeof(string)), new ExcelHelper.DataColumnModel("户名", "ClientName"), new ExcelHelper.DataColumnModel("大额行号", "Payment",typeof(string)), - new ExcelHelper.DataColumnModel("用途", "Use"), + //new ExcelHelper.DataColumnModel("用途", "Use"), new ExcelHelper.DataColumnModel("是否有效", "ValidState", (cv, obj) => { if (cv == "InValid") diff --git a/YLErpDAL/Modules/ClientModule/ClientDutyService.cs b/YLErpDAL/Modules/ClientModule/ClientDutyService.cs index 5b775014..39ced04a 100644 --- a/YLErpDAL/Modules/ClientModule/ClientDutyService.cs +++ b/YLErpDAL/Modules/ClientModule/ClientDutyService.cs @@ -3,6 +3,7 @@ using NPOI.Util; using Org.BouncyCastle.Ocsp; using Qdp.Pricing.Library.Base.Utilities; using System.Data; +using System.Globalization; using YieldChain.Helpers; using YLErp.Commons; using YLErp.Configuration; @@ -347,6 +348,20 @@ namespace YLErp.Modules.ClientModule new ExcelHelper.DataColumnModel("电子邮箱", "Email", typeof(string)), new ExcelHelper.DataColumnModel("联系电话", "PhoneNumber", typeof(string)), + new ExcelHelper.DataColumnModel("授权有效期", "AuthorizeEffectiveEndDateStr", (cv, obj) => + { + if (string.IsNullOrEmpty(cv)) + { + return string.Empty; + } + string value="长期有效"; + if (cv!="30001231") + { + DateTime time= DateTime.ParseExact(cv, "yyyyMMdd", CultureInfo.InvariantCulture); + value=time.ToString("yyyy-MM-dd"); + } + return value; + }), }; diff --git a/YLErpDAL/Modules/ClientModule/ClientImportService.cs b/YLErpDAL/Modules/ClientModule/ClientImportService.cs index 562d4ea9..1e2843f9 100644 --- a/YLErpDAL/Modules/ClientModule/ClientImportService.cs +++ b/YLErpDAL/Modules/ClientModule/ClientImportService.cs @@ -1543,6 +1543,7 @@ namespace YLErp.Modules.ClientModule var Fax = ""; var Address = ""; var Remarks = ""; + var authorizeEffectiveEndDateStr = ""; DateTime? DeadLine = null; DateTime? AuthorizeEndDate = null; string IdCardEffectiveDateStr = ""; @@ -1617,6 +1618,27 @@ namespace YLErp.Modules.ClientModule } } break; + case "授权有效期": + if (!string.IsNullOrEmpty(clientDutys.Rows[i][j].ToString())) + { + if (clientDutys.Rows[i][j].ToString() == "长期有效") + { + authorizeEffectiveEndDateStr = "30001231"; + } + else + { + if (DateTime.TryParse(clientDutys.Rows[i][j].ToString(), out DateTime authorizeEfEndDate)) + { + authorizeEffectiveEndDateStr = authorizeEfEndDate.ToString("yyyyMMdd"); + } + else + { + formatErrorColumn += "授权有效期,"; + } + } + + } + break; case "微信号": WexinNo = clientDutys.Rows[i][j].ToString(); break; @@ -1733,7 +1755,8 @@ namespace YLErp.Modules.ClientModule IdCardEffectiveDateStr = IdCardEffectiveDateStr, AuthorizeEndDate = AuthorizeEndDate, Weixin = WexinNo, - ApprovalOrder = 0 + ApprovalOrder = 0, + AuthorizeEffectiveEndDateStr=authorizeEffectiveEndDateStr }; var contactypelist = DbContext.contactype.ToList(); diff --git a/YLErpWeb/App_Docs/导入模板/客户导入_人员信息模板.xlsx b/YLErpWeb/App_Docs/导入模板/客户导入_人员信息模板.xlsx index 0c3732c0..fde6ae63 100644 Binary files a/YLErpWeb/App_Docs/导入模板/客户导入_人员信息模板.xlsx and b/YLErpWeb/App_Docs/导入模板/客户导入_人员信息模板.xlsx differ diff --git a/YLErpWeb/App_Docs/导入模板/客户导入_人员信息模板_东吴.xlsx b/YLErpWeb/App_Docs/导入模板/客户导入_人员信息模板_东吴.xlsx deleted file mode 100644 index 99f73fba..00000000 Binary files a/YLErpWeb/App_Docs/导入模板/客户导入_人员信息模板_东吴.xlsx and /dev/null differ diff --git a/YLErpWeb/App_Docs/导入模板/客户导入_人员信息模板_招证.xlsx b/YLErpWeb/App_Docs/导入模板/客户导入_人员信息模板_招证.xlsx deleted file mode 100644 index dea625c8..00000000 Binary files a/YLErpWeb/App_Docs/导入模板/客户导入_人员信息模板_招证.xlsx and /dev/null differ diff --git a/YLErpWeb/App_Docs/导入模板/客户导入_银行卡模板.xlsx b/YLErpWeb/App_Docs/导入模板/客户导入_银行卡模板.xlsx index 339ab356..c6f8d2a1 100644 Binary files a/YLErpWeb/App_Docs/导入模板/客户导入_银行卡模板.xlsx and b/YLErpWeb/App_Docs/导入模板/客户导入_银行卡模板.xlsx differ