From 08eb622ca126ed938ea723e2958e7d87d146fce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=A4=E6=97=BA?= Date: Thu, 6 Jun 2024 13:53:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=B0=E5=80=BC=E6=8E=A5=E6=94=B6=E9=82=AE?= =?UTF-8?q?=E4=BB=B6=E5=8F=91=E9=80=81=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ClientModule/ClientDataQueryService.cs | 21 ++++++++++++++++--- .../SettlementReportFotShanXiService.cs | 2 +- .../Controllers/clientbalanceController.cs | 3 ++- .../TradeMarketClientSend.cshtml | 9 ++++---- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/YLErpDAL/Modules/ClientModule/ClientDataQueryService.cs b/YLErpDAL/Modules/ClientModule/ClientDataQueryService.cs index d25ff0d3..7a9ad09d 100644 --- a/YLErpDAL/Modules/ClientModule/ClientDataQueryService.cs +++ b/YLErpDAL/Modules/ClientModule/ClientDataQueryService.cs @@ -234,7 +234,7 @@ namespace YLErp.Modules.ClientModule /// /// /// 多个邮件地址，用分号隔开 - public static IEnumerable GetClientEmails(int clientId, bool includeClientMail = false, List receiver = null) + public static IEnumerable GetClientEmails(int clientId, bool includeClientMail = false, List receiver = null,bool isEodValue = false) { if (clientId < 1) { @@ -248,7 +248,7 @@ namespace YLErp.Modules.ClientModule && (x.DeadLine == null || x.DeadLine > DateTime.Now) && x.IsReceiveEmail == 1 && x.Email != null) .ToList(); - + if (receiver != null && receiver.Count > 0) { foreach (var item in clientContacts) @@ -262,7 +262,22 @@ namespace YLErp.Modules.ClientModule } else { - clientContactMails = clientContacts.Select(o => o.Email).ToList(); + if (isEodValue) + { + foreach (var item in clientContacts) + { + var ids = item.ContactTypeId.Split(','); + //1 是估值接收人 + if (ids.Contains("1")) + { + clientContactMails.Add(item.Email); + } + } + } + else + { + clientContactMails = clientContacts.Select(o => o.Email).ToList(); + } } if (includeClientMail) diff --git a/YLErpDAL/Modules/ReportModule/SettlementReportModule/SettlementReportFotShanXiService.cs b/YLErpDAL/Modules/ReportModule/SettlementReportModule/SettlementReportFotShanXiService.cs index 50f1be78..424f0777 100644 --- a/YLErpDAL/Modules/ReportModule/SettlementReportModule/SettlementReportFotShanXiService.cs +++ b/YLErpDAL/Modules/ReportModule/SettlementReportModule/SettlementReportFotShanXiService.cs @@ -153,7 +153,7 @@ namespace YLErp.Modules.ReportModule.SettlementReportModule } } // 要向该客户的所有订阅了邮件通知的人员发送邮件 - var emails = ClientDataQueryService.GetClientEmails(report.client.id, false, recevier); + var emails = ClientDataQueryService.GetClientEmails(report.client.id, false, recevier,true); var status = EmailTradeConfirmResultType.Succeed; if (emails.All(o => string.IsNullOrWhiteSpace(o))) { diff --git a/YLErpWeb/Controllers/clientbalanceController.cs b/YLErpWeb/Controllers/clientbalanceController.cs index 6df99171..02a0ecdd 100644 --- a/YLErpWeb/Controllers/clientbalanceController.cs +++ b/YLErpWeb/Controllers/clientbalanceController.cs @@ -590,7 +590,8 @@ namespace YLErp.Web.Controllers public ViewResult TradeMarketClientSend(int clientid, double payablemargin = -1, double payableFund = -1, string reportType = "", bool ParentFlag = false) { - ViewBag.emails = ClientDataQueryService.GetClientEmails(clientid, false); + var isEodValue = true; + ViewBag.emails = ClientDataQueryService.GetClientEmails(clientid, false,isEodValue:isEodValue); ViewBag.TradeMarketSheets = DBCacheManager.Single.GetStr(CacheTable.TradeMarketSheets); ViewBag.LuoKuanDesc = DBCacheManager.Single.GetStr(CacheTable.LuoKuanDesc); ViewBag.MarginLuoKuanDesc = DBCacheManager.Single.GetStr(CacheTable.MarginLuoKuanDesc); diff --git a/YLErpWeb/Views/clientbalance/TradeMarketClientSend.cshtml b/YLErpWeb/Views/clientbalance/TradeMarketClientSend.cshtml index e37b58fd..7b1f736a 100644 --- a/YLErpWeb/Views/clientbalance/TradeMarketClientSend.cshtml +++ b/YLErpWeb/Views/clientbalance/TradeMarketClientSend.cshtml @@ -173,7 +173,6 @@ thisObj.Model.CCEmail = $("#CCEmail").val(); var template = $("#setTemplate").val(); - var receiver = ContractTypeCtrl.getValue(); var doneFunc = function (res) { if (!res || !res.obj) { @@ -187,13 +186,13 @@ area: ["430px", "175px"], btn: ['使用', '不使用',"取消"], yes: function (index, layero) { - main.post("/clientbalance/GenerateTradeMarketBill2", { emailData: thisObj.Model, skipOrNot: "Not", template: template, receiver: receiver}) + main.post("/clientbalance/GenerateTradeMarketBill2", { emailData: thisObj.Model, skipOrNot: "Not", template: template}) .done(function () { layer.close(layerIndex); }); }, btn2: function (index, layero) { - main.post("/clientbalance/GenerateTradeMarketBill2", { emailData: thisObj.Model, skipOrNot: "Skip", template: template, receiver: receiver }) + main.post("/clientbalance/GenerateTradeMarketBill2", { emailData: thisObj.Model, skipOrNot: "Skip", template: template }) .done(function () { layer.close(layerIndex); }); @@ -204,7 +203,7 @@ }); } } - main.post("/clientbalance/GenerateTradeMarketBill2", { emailData: thisObj.Model, skipOrNot: "", template: template, receiver: receiver }).done(doneFunc); + main.post("/clientbalance/GenerateTradeMarketBill2", { emailData: thisObj.Model, skipOrNot: "", template: template }).done(doneFunc); }, close: function () { parent.layer.closeAll(); @@ -334,7 +333,7 @@
- +