绩效发放表 改为视图

performance/Performance.Api/Controllers/ComputeController.cs

@@ -386,7 +386,7 @@ public ApiResponse<res_baiscnorm> EditHospitalAvg([FromBody] ComputerAvgRequest
         [HttpPost]
         public ApiResponse CustomColumnHeaders([FromBody] ComputerAliasRequest request)
         {
-            var result = _computeService.CustomColumnHeaders(request);
+            var result = _computeService.CustomColumnHeaders(request.HospitalId, request.Route);
             return new ApiResponse(ResponseType.OK, result);
         }
 
@@ -498,43 +498,68 @@ public IActionResult AllComputeByPMDownLoad(int allotId)
 
         #region 发放表视图、下载
 
+
         /// <summary>
-        /// 获取全院绩效列表（视图）
+        /// 全院核算绩效发放（视图）
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        [Route("allcomputeView")]
+        [Route("gethosdataView")]
         [HttpPost]
-        public ApiResponse AllComputeView([FromBody] ComputerRequest request)
+        public ApiResponse GethosdataView([FromBody] ComputerRequest request)
         {
             var allot = _allotService.GetAllot(request.AllotId);
             if (null == allot)
                 throw new PerformanceException("当前绩效记录不存在");
 
-            var list = _computeService.GetAllComputeView(allot.HospitalId, request.AllotId, true);
+            var list = _computeService.GetAllComputeView(allot.HospitalId, request.AllotId, "view_allot_sign_dept");
             return new ApiResponse(ResponseType.OK, "ok", list);
         }
 
         /// <summary>
-        /// 获取全院绩效列表（人事科）
+        /// 全院核算绩效发放（视图） 下载
         /// </summary>
-        /// <param name="request"></param>
+        /// <param name="allotId"></param>
         /// <returns></returns>
-        [Route("allcomputeView/personnel")]
+        [Route("gethosdataView/download/{allotId}")]
         [HttpPost]
-        public ApiResponse AllComputeViewByPM([FromBody] ComputerRequest request)
+        public IActionResult GethosdataView(int allotId)
         {
-            var allot = _allotService.GetAllot(request.AllotId);
+            var allot = _allotService.GetAllot(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);
+            var list = _computeService.GetAllComputeView(allot.HospitalId, allotId, "view_allot_sign_dept");
+            var filepath = downloadService.AllComputerViewReport(allotId, list, "/result/print/compute", "全院核算绩效发放");
+
+            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="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, "view_allot_sign_emp");
+            return new ApiResponse(ResponseType.OK, "ok", list);
+        }
 
         /// <summary>
         /// 下载全院绩效列表
@@ -549,8 +574,8 @@ public IActionResult AllComputeViewDownload(int allotId)
             if (null == allot)
                 throw new PerformanceException("当前绩效记录不存在");
 
-            var list = _computeService.GetAllComputeView(allot.HospitalId, allotId, true);
-            var filepath = downloadService.AllComputerViewReport(allotId, list, true, "全院绩效发放");
+            var list = _computeService.GetAllComputeView(allot.HospitalId, allotId, "view_allot_sign_emp");
+            var filepath = downloadService.AllComputerViewReport(allotId, list, "/result/compute", "全院绩效发放");
 
             var memoryStream = new MemoryStream();
             using (var stream = new FileStream(filepath, FileMode.Open))
@@ -564,8 +589,28 @@ public IActionResult AllComputeViewDownload(int allotId)
             return File(memoryStream, memi, Path.GetFileName(fileInfo.Name));
         }
 
+
         /// <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, "view_allot_sign_emp_finance");
+
+            //var result = _computeService.ComputerGroupBy(list);
+            return new ApiResponse(ResponseType.OK, "ok", result);
+        }
+
+        /// <summary>
+        /// 下载全院绩效列表（人事科）
         /// </summary>
         /// <param name="allotId"></param>
         /// <returns></returns>
@@ -576,9 +621,9 @@ 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 result = _computeService.GetAllComputeView(allot.HospitalId, allotId, "view_allot_sign_emp_finance");
+            var filepath = downloadService.AllComputerViewReport(allotId, result, "/result/wholehospital", "财务全院绩效发放");
 
             var memoryStream = new MemoryStream();
             using (var stream = new FileStream(filepath, FileMode.Open))

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

@@ -575,16 +575,23 @@
             <param name="allotId"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.ComputeController.AllComputeView(Performance.DtoModels.ComputerRequest)">
+        <member name="M:Performance.Api.Controllers.ComputeController.GethosdataView(Performance.DtoModels.ComputerRequest)">
             <summary>
-            获取全院绩效列表（视图）
+            全院核算绩效发放（视图）
             </summary>
             <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.ComputeController.AllManageComputeView(Performance.DtoModels.ComputerRequest)">
+        <member name="M:Performance.Api.Controllers.ComputeController.GethosdataView(System.Int32)">
+            <summary>
+            全院核算绩效发放（视图） 下载
+            </summary>
+            <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>
@@ -596,9 +603,16 @@
             <param name="allotId"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.ComputeController.AllComputeViewByPM(Performance.DtoModels.ComputerRequest)">
+            <summary>
+            获取全院绩效列表（人事科）
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.ComputeController.AllComputeByPMViewDownLoad(System.Int32)">
             <summary>
-            下载全院绩效列表（人事科/视图）
+            下载全院绩效列表（人事科）
             </summary>
             <param name="allotId"></param>
             <returns></returns>

performance/Performance.EntityModels/Other/view_allot_result.cs

@@ -61,6 +61,6 @@ public class view_allot_result
         public string JobCategory { get; set; }
         public string Duty { get; set; }
         public string TitlePosition { get; set; }
-        				
+
     }
 }

performance/Performance.EntityModels/Other/view_allot_sign_dept.cs

+namespace Performance.DtoModels
+{
+    public class view_allot_sign_dept
+    {
+        public int HospitalId { get; set; }
+        public int AllotID { get; set; }
+        public int Year { get; set; }
+        public int Month { get; set; }
+        public int UnitName { get; set; }
+        public int AccountingUnit { get; set; }
+        public int PerforFee { get; set; }
+        public int WorkloadFee { get; set; }
+        public int AssessBeforeOtherFee { get; set; }
+        public int PerforTotal { get; set; }
+        public int ScoringAverage { get; set; }
+        public int Extra { get; set; }
+        public int MedicineExtra { get; set; }
+        public int MaterialsExtra { get; set; }
+        public int AssessLaterOtherFee { get; set; }
+        public int AssessLaterPerforTotal { get; set; }
+        public int AdjustFactor { get; set; }
+        public int AdjustLaterOtherFee { get; set; }
+        public int AprPerforAmount { get; set; }
+        public int HideAprOtherPerforAmount { get; set; }
+        public int AssessLaterManagementFee { get; set; }
+        public int RealGiveFee { get; set; }
+    }
+}

performance/Performance.EntityModels/Other/view_allot_sign_emp.cs

+namespace Performance.DtoModels
+{
+    public class view_allot_sign_emp
+    {
+        public int HospitalID { get; set; }
+        public int Year { get; set; }
+        public int Month { get; set; }
+        public int Source { get; set; }
+        public int AllotId { get; set; }
+        public int SecondId { get; set; }
+        public int States { get; set; }
+        public string UnitType { get; set; }
+        public string AccountingUnit { get; set; }
+        public string IsShowManage { get; set; }
+        public string EmployeeName { get; set; }
+        public string JobNumber { get; set; }
+        public string JobTitle { get; set; }
+        public string Emp_UnitType { get; set; }
+        public string Emp_AccountingUnit { get; set; }
+        public string BankCard { get; set; }
+        public string Batch { get; set; }
+        public string JobCategory { get; set; }
+        public string Duty { get; set; }
+        public string TitlePosition { get; set; }
+        public string PerforSumFee { get; set; }
+        public decimal PerforManagementFee { get; set; }
+        public decimal NightWorkPerfor { get; set; }
+        public decimal AdjustLaterOtherFee { get; set; }
+        public decimal OtherPerfor { get; set; }
+        public decimal HideOtherPerfor { get; set; }
+        public decimal ShouldGiveFee { get; set; }
+        public decimal ReservedRatioFee { get; set; }
+        public decimal RealGiveFee { get; set; }
+    }
+}

performance/Performance.Repository/PerforReportRepository .cs

@@ -389,18 +389,11 @@ public List<view_allot_result> GetOwnerPerformance(List<int> hospitalId, string
             return DapperQuery<view_allot_result>(sql, new { HospitalID = hospitalId, JobNumber = jobNumber })?.ToList();
         }
 
-        public List<dynamic> QueryAllCompute(int hospitalId,int allotId)
+        public List<dynamic> QueryCompute(int allotId, string viewName)
         {
-            var sql = $@"SELECT * FROM view_allot_result WHERE hospitalId = @hospitalId AND AllotId = @AllotId ORDER BY UnitType,AccountingUnit; ";
+            var sql = $@"SELECT * FROM {viewName} WHERE   AllotId = @AllotId; ";
 
-            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();
+            return DapperQuery<dynamic>(sql, new { allotId })?.ToList();
         }
     }
 }