院领导绩效测算，渝北院领导特殊

performance/Performance.Api/Controllers/AllotController.cs

 using FluentValidation.AspNetCore;
-using Hangfire;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Internal;
@@ -7,7 +6,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Performance.DtoModels;
-using Performance.EntityModels;
 using Performance.Infrastructure;
 using Performance.Services;
 using Performance.Services.AllotCompute;
@@ -16,7 +14,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Linq.Expressions;
 using System.Threading.Tasks;
 
 // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
@@ -27,19 +24,17 @@ namespace Performance.Api.Controllers
     public class AllotController : Controller
     {
         private AllotService _allotService;
-        private readonly ResultComputeService resultComputeService;
-        private HospitalService _hospitalService;
+        private ResultComputeService _resultComputeService;
         private ConfigService _configService;
         private IHostingEnvironment _evn;
         private ILogger<AllotController> _logger;
         private ClaimService _claim;
-        private readonly LogManageService logManageService;
+        private LogManageService _logManageService;
         private IBackgroundTaskQueue _backgroundTaskQueue;
         private IServiceScopeFactory _serviceScopeFactory;
 
         public AllotController(AllotService allotService,
             ResultComputeService resultComputeService,
-            HospitalService hospitalService,
             ConfigService configService,
             ILogger<AllotController> logger,
             IHostingEnvironment evn,
@@ -49,12 +44,11 @@ public class AllotController : Controller
             LogManageService logManageService)
         {
             _allotService = allotService;
-            this.resultComputeService = resultComputeService;
-            _hospitalService = hospitalService;
+            _resultComputeService = resultComputeService;
             _logger = logger;
             _evn = evn;
             _claim = claim;
-            this.logManageService = logManageService;
+            _logManageService = logManageService;
             _configService = configService;
             _backgroundTaskQueue = backgroundTaskQueue;
             _serviceScopeFactory = serviceScopeFactory;
@@ -190,7 +184,7 @@ public ApiResponse Generate([CustomizeValidator(RuleSet = "Delete"), FromBody] A
             if (allot.States == (int)AllotStates.Wait)
                 return new ApiResponse(ResponseType.OK, "当前绩效正在等待生成");
 
-            logManageService.WriteMsg("生成绩效准备中", $"准备生成{allot.Year}-{allot.Month.ToString().PadLeft(2, '0')}月份绩效，请稍等!", 1, allot.ID, "ReceiveMessage", true);
+            _logManageService.WriteMsg("生成绩效准备中", $"准备生成{allot.Year}-{allot.Month.ToString().PadLeft(2, '0')}月份绩效，请稍等!", 1, allot.ID, "ReceiveMessage", true);
             _allotService.UpdateAllotStates(allot.ID, (int)AllotStates.Wait, EnumHelper.GetDescription(AllotStates.Wait), allot.Generate);
             if (_evn.IsEnvironment("Localhost"))
             {
@@ -211,13 +205,27 @@ public ApiResponse Generate([CustomizeValidator(RuleSet = "Delete"), FromBody] A
                 });
             }
 
-            logManageService.WriteMsg("等待绩效生成", $"等待绩效生成{allot.Year}-{allot.Month.ToString().PadLeft(2, '0')}月份绩效!", 1, allot.ID, "ReceiveMessage");
+            _logManageService.WriteMsg("等待绩效生成", $"等待绩效生成{allot.Year}-{allot.Month.ToString().PadLeft(2, '0')}月份绩效!", 1, allot.ID, "ReceiveMessage");
             //_allotService.Generate(allot, email);
             ////BackgroundJob.Enqueue(() => _allotService.Generate(allot, email));
             return new ApiResponse(ResponseType.OK);
         }
 
         /// <summary>
+        /// 重新计算院领导绩效
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("recalculation")]
+        [HttpPost]
+        public ApiResponse Recalculation([FromBody] RecalculationRequest request)
+        {
+            if (request.Money.HasValue && request.Money.Value > 0)
+                _allotService.Recalculation(request.AllotId, request.Money.Value);
+            return new ApiResponse(ResponseType.OK);
+        }
+
+        /// <summary>
         /// 归档绩效记录
         /// </summary>
         /// <param name="request"></param>
@@ -296,7 +304,7 @@ public ApiResponse Issued([FromBody] AllotRequest request)
                 throw new PerformanceException("当前绩效记录不存在");
             _allotService.UpdateAllotStates(allot.ID, (int)AllotStates.GenerateSucceed, EnumHelper.GetDescription(AllotStates.GenerateSucceed));
             // 科室下发
-            resultComputeService.GenerateSecondAllot(allot);
+            _resultComputeService.GenerateSecondAllot(allot);
             return new ApiResponse(ResponseType.OK);
         }
 

performance/Performance.Api/wwwroot/Performance.Api.xml

@@ -184,6 +184,13 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.AllotController.Recalculation(Performance.DtoModels.RecalculationRequest)">
+            <summary>
+            重新计算院领导绩效
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.AllotController.Pigeonhole(Performance.DtoModels.AllotRequest)">
             <summary>
             归档绩效记录

performance/Performance.DtoModels/Request/RecalculationRequest.cs

+namespace Performance.DtoModels
+{
+    public class RecalculationRequest
+    {
+        public int AllotId { get; set; }
+        public decimal? Money { get; set; }
+    }
+}

performance/Performance.Services/AllotService.cs

@@ -32,6 +32,9 @@ public class AllotService : IAutoInjection
         private PerforPerallotRepository _allotRepository;
         private IEmailService emailService;
         private readonly IOptions<Application> options;
+        private readonly ComputeDirector _computeDirector;
+        private readonly PerforRescomputeRepository _perforRescomputeRepository;
+        private readonly PerforImemployeeRepository _perforImEmployeeRepository;
         private PerforPeragainallotRepository _againallotRepository;
         private PerforLogcheckRepository perforLogcheckRepository;
         private readonly PerforHospitalRepository perforHospitalRepository;
@@ -59,6 +62,9 @@ public class AllotService : IAutoInjection
              IHostingEnvironment evn, ILogger<AllotService> logger,
              IEmailService emailService,
              IOptions<Application> options,
+             ComputeDirector computeDirector,
+             PerforRescomputeRepository perforRescomputeRepository,
+             PerforImemployeeRepository perforImEmployeeRepository,
              PerforPeragainallotRepository againallotRepository,
              PerforLogcheckRepository perforLogcheckRepository,
              PerforHospitalRepository perforHospitalRepository,
@@ -83,6 +89,9 @@ public class AllotService : IAutoInjection
             this.resultComputeService = resultComputeService;
             this.emailService = emailService;
             this.options = options;
+            _computeDirector = computeDirector;
+            _perforRescomputeRepository = perforRescomputeRepository;
+            _perforImEmployeeRepository = perforImEmployeeRepository;
             this.configService = configService;
             this.logdbug = logdbug;
             this.perforresreservedRepository = perforresreservedRepository;
@@ -451,6 +460,44 @@ public void Generate(per_allot allot, string mail)
         }
 
         /// <summary>
+        /// 重新计算院领导绩效
+        /// </summary>
+        /// <param name="allotId"></param>
+        /// <param name="money"></param>
+        public void Recalculation(int allotId, decimal money)
+        {
+            var allot = _allotRepository.GetEntity(w => w.ID == allotId);
+
+            var empolyeeList = _perforImEmployeeRepository.GetEntities(t => t.AllotID == allotId && t.AccountType == AccountUnitType.行政高层.ToString());
+
+            if (empolyeeList == null) return;
+
+            var computeEmployees = Mapper.Map<List<ComputeEmployee>>(empolyeeList);
+            computeEmployees.ForEach(w => w.FitPeopleValue = money);
+
+            List<res_baiscnorm> baiscnormList = new List<res_baiscnorm>();
+            var computResult = _computeDirector.Compute(computeEmployees, allot, baiscnormList);
+
+            if (computResult == null) return;
+
+            baiscnormList = baiscNormService.ComputeOtherAvg(baiscnormList, computResult, empolyeeList);
+
+            var historyRescompute = _perforRescomputeRepository.GetEntities(w => w.AllotID == allotId && w.AccountType == AccountUnitType.行政高层.ToString());
+            if (historyRescompute != null && historyRescompute.Any())
+                _perforRescomputeRepository.RemoveRange(historyRescompute.ToArray());
+
+            var computes = Mapper.Map<List<res_compute>>(computResult);
+            computes.ForEach(t => t.AllotID = allot.ID);
+            _perforRescomputeRepository.AddRange(computes.ToArray());
+
+            var names = baiscnormList.Select(b => b.PositionName).ToList();
+            var historyResbaiscnorm = perforResbaiscnormRepository.GetEntities(w => w.AllotID == allotId && names.Contains(w.PositionName));
+            if (historyResbaiscnorm != null && historyResbaiscnorm.Any())
+                perforResbaiscnormRepository.RemoveRange(historyResbaiscnorm.ToArray());
+            perforResbaiscnormRepository.AddRange(Mapper.Map<res_baiscnorm[]>(baiscnormList));
+        }
+
+        /// <summary>
         /// 发送邮件
         /// </summary>
         /// <param name="allot"></param>

performance/Performance.Services/ExtractExcelService/ExtractService.cs

@@ -8,7 +8,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 
 namespace Performance.Services.ExtractExcelService
 {
@@ -21,7 +20,7 @@ public class ExtractService : IAutoInjection
         private readonly PerSheetService perSheetService;
         private readonly PerforHospitalRepository hospitalRepository;
         private readonly PerforPerallotRepository perallotRepository;
-        private readonly PerforCollectdataRepository collectdataRepository;
+        private readonly PerforcollectdataRepository collectdataRepository;
         private readonly PerforPeremployeeRepository peremployeeRepository;
 
         public ExtractService(
@@ -32,7 +31,7 @@ public class ExtractService : IAutoInjection
             PerSheetService perSheetService,
             PerforHospitalRepository hospitalRepository,
             PerforPerallotRepository perallotRepository,
-            PerforCollectdataRepository collectdataRepository,
+            PerforcollectdataRepository collectdataRepository,
             PerforPeremployeeRepository peremployeeRepository
             )
         {