邮件修改

2022-10-26 15:13:16 +08:00
parent 55e26202d8
commit 792f7b8ade
3 changed files with 11 additions and 11 deletions
@@ -82,7 +82,7 @@ namespace IRaCIS.Core.Application.ViewModel

        public CriterionType CriterionTypeEnum { get; set; }

-
+        public string FromName { get; set; } = string.Empty;

        public string FromEmail { get; set; }

@@ -130,7 +130,7 @@ namespace IRaCIS.Core.Application.Service
            }

            //邮件内容html
-            var (isNeedSend, templateStream) = await FillWordTemplateAndSetEmailAsync(visitTaskId, sendEmailConfig, businessScenarioEnum, emailConfig.FilePath, path);
+            var isNeedSend = await FillWordTemplateAndSetEmailAsync(visitTaskId, sendEmailConfig, businessScenarioEnum, emailConfig.FilePath, path);

           

@@ -144,7 +144,7 @@ namespace IRaCIS.Core.Application.Service



-        private async Task<(bool IsNeedSend,FileStream? TemplateStream)> FillWordTemplateAndSetEmailAsync(Guid visitTaskId, SMTPEmailConfig sendEmailConfig, CommonDocumentBusinessScenario businessScenarioEnum, string  fileName,string filePath)
+        private async Task<bool> FillWordTemplateAndSetEmailAsync(Guid visitTaskId, SMTPEmailConfig sendEmailConfig, CommonDocumentBusinessScenario businessScenarioEnum, string  fileName,string filePath)
        {

            var isNeedSend = true;
@@ -197,7 +197,7 @@ namespace IRaCIS.Core.Application.Service
            else
            {
                //isNeedSend = false;
-                return (false,null);
+                return false;
            }

            //入组确认仅在基线
@@ -211,7 +211,7 @@ namespace IRaCIS.Core.Application.Service
                {
                    //isNeedSend = false;

-                    return (false, null);
+                    return false;
                }

                sendEmailConfig.TopicDescription = "入组确认";
@@ -329,7 +329,7 @@ namespace IRaCIS.Core.Application.Service
                            {
                                //isNeedSend = false;

-                                return (false, null);
+                                return false;
                            }

                           
@@ -393,7 +393,7 @@ namespace IRaCIS.Core.Application.Service
                                {
                                    //isNeedSend = false;

-                                    return (false, null);
+                                    return false;
                                }
                            }

@@ -446,7 +446,7 @@ namespace IRaCIS.Core.Application.Service
                        else
                        {
                            //isNeedSend = false;
-                            return (false, null);
+                            return false;
                        }

                    }
@@ -476,11 +476,11 @@ namespace IRaCIS.Core.Application.Service
                    FileStream = docFileStream
                });

-                return (false, null);
+                return false;
            }
            else
            {
-                return (false, null);
+                return false;
            }
        }

@@ -26,7 +26,7 @@ namespace IRaCIS.Core.Domain.Models
 		public string AuthorizationCode { get; set; } = string.Empty;


-
+		public string FromName { get; set; } = string.Empty;
 		public List<TrialEmailNoticeUser> TrialEmailNoticeUserList { get; set; } = new List<TrialEmailNoticeUser>();