发放表视图、下载（error）

performance/Performance.Api/Controllers/ComputeController.cs

@@ -449,7 +449,7 @@ public IActionResult AllComputeDownload(int allotId)
 
             var list = _computeService.AllCompute(allotId, allot.HospitalId, isShowManage);
 
-            var filepath = downloadService.AllComputerReport(allotId, list, true,"全院绩效发放");
+            var filepath = downloadService.AllComputerReport(allotId, list, true, "全院绩效发放");
 
             var memoryStream = new MemoryStream();
             using (var stream = new FileStream(filepath, FileMode.Open))
@@ -481,7 +481,7 @@ public IActionResult AllComputeByPMDownLoad(int allotId)
 
 
             var result = _computeService.ComputerGroupBy(list);
-            var filepath = downloadService.AllComputerReport(allotId, result, false,"财务全院绩效");
+            var filepath = downloadService.AllComputerReport(allotId, result, false, "财务全院绩效");
 
             var memoryStream = new MemoryStream();
             using (var stream = new FileStream(filepath, FileMode.Open))
@@ -495,5 +495,103 @@ public IActionResult AllComputeByPMDownLoad(int allotId)
             return File(memoryStream, memi, Path.GetFileName(fileInfo.Name));
         }
         #endregion
+
+        #region 发放表视图、下载
+
+        /// <summary>
+        /// 获取全院绩效列表（视图）
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("allcomputeView")]
+        [HttpPost]
+        public ApiResponse AllComputeView([FromBody] ComputerRequest request)
+        {
+            var allot = _allotService.GetAllot(request.AllotId);
+            if (null == allot)
+                throw new PerformanceException("当前绩效记录不存在");
+
+            var list = _computeService.GetAllComputeView(allot.HospitalId, request.AllotId, true);
+            return new ApiResponse(ResponseType.OK, "ok", list);
+        }
+
+        /// <summary>
+        /// 获取全院绩效列表（人事科）
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("allcomputeView/personnel")]
+        [HttpPost]
+        public ApiResponse AllComputeViewByPM([FromBody] ComputerRequest request)
+        {
+            var allot = _allotService.GetAllot(request.AllotId);
+            if (null == allot)
+                throw new PerformanceException("当前绩效记录不存在");
+
+            var result = _computeService.GetAllComputeView(allot.HospitalId, request.AllotId, false);
+            
+            //var result = _computeService.ComputerGroupBy(list);
+            return new ApiResponse(ResponseType.OK, "ok", result);
+        }
+
+
+
+        /// <summary>
+        /// 下载全院绩效列表
+        /// </summary>
+        /// <param name="allotId"></param>
+        /// <returns></returns>
+        [Route("allcomputeView/download/{allotId}")]
+        [HttpPost]
+        public IActionResult AllComputeViewDownload(int allotId)
+        {
+            var allot = _allotService.GetAllot(allotId);
+            if (null == allot)
+                throw new PerformanceException("当前绩效记录不存在");
+
+            var list = _computeService.GetAllComputeView(allot.HospitalId, allotId, true);
+            var filepath = downloadService.AllComputerViewReport(allotId, list, true, "全院绩效发放");
+
+            var memoryStream = new MemoryStream();
+            using (var stream = new FileStream(filepath, FileMode.Open))
+            {
+                stream.CopyToAsync(memoryStream).Wait();
+            }
+            memoryStream.Seek(0, SeekOrigin.Begin);
+            var provider = new FileExtensionContentTypeProvider();
+            FileInfo fileInfo = new FileInfo(filepath);
+            var memi = provider.Mappings[".xlsx"];
+            return File(memoryStream, memi, Path.GetFileName(fileInfo.Name));
+        }
+
+        /// <summary>
+        /// 下载全院绩效列表（人事科/视图）
+        /// </summary>
+        /// <param name="allotId"></param>
+        /// <returns></returns>
+        [Route("allcomputeView/personnel/download/{allotId}")]
+        [HttpPost]
+        public IActionResult AllComputeByPMViewDownLoad(int allotId)
+        {
+            var allot = _allotService.GetAllot(allotId);
+            if (null == allot)
+                throw new PerformanceException("当前绩效记录不存在");
+            
+            var result =_computeService.GetAllComputeView(allot.HospitalId, allotId, false);
+            var filepath = downloadService.AllComputerViewReport(allotId, result, false, "财务全院绩效");
+
+            var memoryStream = new MemoryStream();
+            using (var stream = new FileStream(filepath, FileMode.Open))
+            {
+                stream.CopyToAsync(memoryStream).Wait();
+            }
+            memoryStream.Seek(0, SeekOrigin.Begin);
+            var provider = new FileExtensionContentTypeProvider();
+            FileInfo fileInfo = new FileInfo(filepath);
+            var memi = provider.Mappings[".xlsx"];
+            return File(memoryStream, memi, Path.GetFileName(fileInfo.Name));
+            #endregion
+
+        }
     }
 }
\ No newline at end of file

performance/Performance.Api/appsettings.Localhost.json

@@ -8,7 +8,7 @@
   },
   "AppConnection": {
     //"PerformanceConnectionString": "server=112.124.13.17;database=db_performance;uid=suvalue;pwd=suvalue2016;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
-    "PerformanceConnectionString": "server=192.168.18.166;database=db_performance_screen;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
+    "PerformanceConnectionString": "server=192.168.18.166;database=db_test_zhangye;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
     "HangfireConnectionString": "server=192.168.18.166;database=db_hangfire;uid=root;pwd=1234qwer;port=3306;allow user variables=true;",
     "RedisConnectionString": "116.62.245.55:6379,defaultDatabase=2"
   },

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

@@ -575,6 +575,34 @@
             <param name="allotId"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.ComputeController.AllComputeView(Performance.DtoModels.ComputerRequest)">
+            <summary>
+            获取全院绩效列表（视图）
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.ComputeController.AllManageComputeView(Performance.DtoModels.ComputerRequest)">
+            <summary>
+            获取全院管理绩效列表(视图)
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.ComputeController.AllComputeViewDownload(System.Int32)">
+            <summary>
+            下载全院绩效列表
+            </summary>
+            <param name="allotId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.ComputeController.AllComputeByPMViewDownLoad(System.Int32)">
+            <summary>
+            下载全院绩效列表（人事科/视图）
+            </summary>
+            <param name="allotId"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.ConfigController.GetDrugtypeList(Performance.DtoModels.DrugpropRequest)">
             <summary>
             获取 药占比类型信息列表

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

@@ -7620,5 +7620,20 @@
             不公示其他绩效
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.view_allot_result.RealPerformance">
+            <summary>
+            实发绩效
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.view_allot_result.ShouldGiveFee">
+            <summary>
+            应发小计
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.view_allot_result.ReservedRatioFee">
+            <summary>
+            预留金额
+            </summary>
+        </member>
     </members>
 </doc>

performance/Performance.EntityModels/Other/view_allot_result.cs

@@ -42,6 +42,25 @@ public class view_allot_result
         /// 不公示其他绩效
         /// </summary>
         public decimal? HideOtherPerfor { get; set; }
+        /// <summary>
+        /// 实发绩效
+        /// </summary>
         public decimal? RealPerformance { get; set; }
+        /// <summary>
+        /// 应发小计
+        /// </summary>
+        public decimal? ShouldGiveFee { get; set; }
+        /// <summary>
+        /// 预留金额
+        /// </summary>
+        public decimal? ReservedRatioFee { get; set; }
+        public string Emp_UnitType { get; set; }
+
+        public string Emp_AccountingUnit { get; set; }
+        public string BankCard { get; set; }
+        public string JobCategory { get; set; }
+        public string Duty { get; set; }
+        public string TitlePosition { get; set; }
+        				
     }
 }

performance/Performance.Repository/PerforReportRepository .cs

@@ -388,5 +388,19 @@ public List<view_allot_result> GetOwnerPerformance(List<int> hospitalId, string
             string sql = "SELECT * FROM view_allot_result WHERE HospitalID IN @HospitalID AND JobNumber=@JobNumber";
             return DapperQuery<view_allot_result>(sql, new { HospitalID = hospitalId, JobNumber = jobNumber })?.ToList();
         }
+
+        public List<dynamic> QueryAllCompute(int hospitalId,int allotId)
+        {
+            var sql = $@"SELECT * FROM view_allot_result WHERE hospitalId = @hospitalId AND AllotId = @AllotId ORDER BY UnitType,AccountingUnit; ";
+
+            return DapperQuery<dynamic>(sql, new { hospitalId, allotId })?.ToList();
+        }
+
+        public List<dynamic> QueryAdminCompute(int hospitalId, int allotId)
+        {
+            var sql = $@"SELECT * FROM view_allot_result_finance WHERE hospitalId=@hospitalId AND allotId=@allotId ORDER BY UnitType,AccountingUnit;";
+
+            return DapperQuery<dynamic>(sql, new { hospitalId, allotId })?.ToList();
+        }
     }
 }

performance/Performance.Services/ComputeService.cs

@@ -36,6 +36,7 @@ public class ComputeService : IAutoInjection
         private readonly PerforPerapramounthideRepository _hideRepository;
         private readonly PerforCofworkitemRepository cofworkitemRepository;
         private readonly PerforCofaliasRepository cofaliasRepository;
+        private readonly PerforReportRepository reportRepository;
 
         public ComputeService(
             PerforResaccountRepository perforResaccountRepository,
@@ -56,7 +57,8 @@ public class ComputeService : IAutoInjection
             PerforPeremployeeRepository perforPeremployeeRepository,
             PerforPerapramounthideRepository hideRepository,
             PerforCofworkitemRepository cofworkitemRepository,
-            PerforCofaliasRepository cofaliasRepository)
+            PerforCofaliasRepository cofaliasRepository,
+            PerforReportRepository reportRepository)
         {
             this.perforResaccountRepository = perforResaccountRepository;
             this._perforPerSheetRepository = perforPerSheetRepository;
@@ -77,6 +79,7 @@ public class ComputeService : IAutoInjection
             _hideRepository = hideRepository;
             this.cofworkitemRepository = cofworkitemRepository;
             this.cofaliasRepository = cofaliasRepository;
+            this.reportRepository = reportRepository;
         }
 
         public int IsShowManage(int allotId)
@@ -1990,6 +1993,11 @@ private decimal GetDecimal(decimal? value, decimal _ = 0)
             return Math.Round(value.Value, decimals, MidpointRounding.AwayFromZero);
         }
 
+        /// <summary>
+        /// 发放表自定义列头
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
         public List<cof_alias> CustomColumnHeaders(ComputerAliasRequest request)
         {
             var result = cofaliasRepository.GetEntities(t => t.HospitalId == request.HospitalId && t.Route == request.Route && t.States == 1);
@@ -2020,5 +2028,27 @@ public bool Batch(BatchRequest request)
             });
             return perforPerbatchRepository.AddRange(data.ToArray());
         }
+
+        public List<dynamic> GetAllComputeView(int hospitalId,int AllotId,bool isAllCompte)
+        {
+            var viewResult = new List<dynamic>();
+            if (isAllCompte)
+                viewResult = reportRepository.QueryAllCompute(hospitalId, AllotId);
+            else
+                viewResult = reportRepository.QueryAdminCompute(hospitalId, AllotId);
+
+            // 人员字典
+            var employees = perforPeremployeeRepository.GetEntities(w => w.AllotId == AllotId);
+
+            viewResult.ForEach(t => 
+            {
+                var employee=employees?.FirstOrDefault(w => w.PersonnelNumber == t.JobNumber);
+                var real = Math.Round((t.PerforSumFee ?? 0) + (t.PerforManagementFee ?? 0) + (t.AdjustLaterOtherFee ?? 0), 2, MidpointRounding.AwayFromZero);
+                t.ReservedRatioFee = Math.Round(real * (employee?.ReservedRatio ?? 0), 2, MidpointRounding.AwayFromZero);
+                t.RealPerformance = Math.Round(t.ShouldGiveFee - (t.ReservedRatioFee ?? 0) ?? 0, 2, MidpointRounding.AwayFromZero);
+            });
+
+            return viewResult;
+        }
     }
 }