微调

performance/Performance.Api/Controllers/AllotController.cs

@@ -155,8 +155,9 @@ public ApiResponse Generate([CustomizeValidator(RuleSet = "Delete"), FromBody]Al
             var allot = _allotService.GetAllot(request.ID);
             if (null == allot || string.IsNullOrEmpty(allot.Path))
                 throw new PerformanceException("当前绩效记录不存在或没有上传数据文件");
-            //_perExcelService.Execute(allot);
-            BackgroundJob.Enqueue(() => _allotService.Generate(allot));
+            var user = _claim.At(request);
+            _allotService.Generate(allot, user);
+            //BackgroundJob.Enqueue(() => _allotService.Generate(allot, user));
             return new ApiResponse(ResponseType.OK);
         }
     }

performance/Performance.Services/AllotService.cs

@@ -22,9 +22,11 @@ public class AllotService : IAutoInjection
         private ProcessComputService processComputService;
         private ResultComputeService resultComputeService;
 
+        private ConfigService configService;
         private IHostingEnvironment _evn;
         private ILogger<AllotService> _logger;
         private PerforPerAllotRepository _allotRepository;
+        private IEmailService emailService;
 
         public AllotService(PerforPerAllotRepository allotRepository,
              BaiscNormService baiscNormService,
@@ -32,7 +34,9 @@ public class AllotService : IAutoInjection
              ImportDataService importDataService,
              ProcessComputService processComputService,
              ResultComputeService resultComputeService,
-             IHostingEnvironment evn, ILogger<AllotService> logger)
+             ConfigService configService,
+             IHostingEnvironment evn, ILogger<AllotService> logger,
+             IEmailService emailService)
         {
             _allotRepository = allotRepository;
             _logger = logger;
@@ -42,6 +46,8 @@ public class AllotService : IAutoInjection
             this.importDataService = importDataService;
             this.processComputService = processComputService;
             this.resultComputeService = resultComputeService;
+            this.emailService = emailService;
+            this.configService = configService;
         }
 
         #region 基础功能
@@ -163,14 +169,21 @@ public bool Update(per_allot allot)
         }
         #endregion
 
-        public void Generate(per_allot allot)
+        /// <summary>
+        /// 生成绩效
+        /// </summary>
+        /// <param name="allot"></param>
+        /// <param name="user"></param>
+        public void Generate(per_allot allot, UserIdentity user)
         {
+            configService.Clear(allot.ID);
             _allotRepository.UpdateAllotStates(allot.ID, (int)AllotStates.InCheckData, EnumHelper.GetDescription(AllotStates.InCheckData));
             // 导出数据
             var excel = importDataService.ReadDataAndSave(allot);
-            if (checkDataService.Check(excel, allot))
+            if (!checkDataService.Check(excel, allot))
             {
                 _allotRepository.UpdateAllotStates(allot.ID, (int)AllotStates.CheckFail, EnumHelper.GetDescription(AllotStates.CheckFail));
+                SendEmail(allot, user);
                 return;
             }
             _allotRepository.UpdateAllotStates(allot.ID, (int)AllotStates.InGenerate, EnumHelper.GetDescription(AllotStates.InGenerate));
@@ -185,12 +198,19 @@ public void Generate(per_allot allot)
 
             _allotRepository.UpdateAllotStates(allot.ID, (int)AllotStates.GenerateSucceed, EnumHelper.GetDescription(AllotStates.GenerateSucceed));
             //发送邮件
-            SendEmail(allot);
+            SendEmail(allot, user);
         }
 
-        private void SendEmail(per_allot allot)
+        private void SendEmail(per_allot allot, UserIdentity user)
         {
-
+            var message = new EmailMessage
+            {
+                To = new List<string> { user.Mail },
+                DisplayName = "溯直健康",
+                Subject = "绩效生成结束",
+                Body = "绩效生成结束"
+            };
+            emailService.SendAsync(message);
         }
     }
 }