下载及个人绩效查询状态限制

performance/Performance.Repository/PerforReportRepository .cs

@@ -385,7 +385,7 @@ public List<EmployeeReservedDto> GetEmployeeReserved(int hospitalId, int year)
 
         public List<view_allot_result> GetOwnerPerformance(List<int> hospitalId, string jobNumber)
         {
-            string sql = "SELECT * FROM view_allot_result WHERE HospitalID IN @HospitalID AND JobNumber=@JobNumber";
+            string sql = "SELECT * FROM view_allot_result WHERE States = 8 AND HospitalID IN @HospitalID AND JobNumber=@JobNumber";
             return DapperQuery<view_allot_result>(sql, new { HospitalID = hospitalId, JobNumber = jobNumber })?.ToList();
         }
 

performance/Performance.Services/DownloadService.cs

@@ -194,17 +194,13 @@ public string AllComputerViewReport(int allotId, List<dynamic> dynamics, string
             using (ExcelPackage package = new ExcelPackage(fs))
             {
                 var worksheet = package.Workbook.Worksheets.Add(name);
-                worksheet.View.FreezePanes(2, 1);
+
                 if (dynamics != null && dynamics.Count() > 0)
                 {
                     var headers = ((IDictionary<string, object>)dynamics.ElementAt(0)).Keys;
                     for (int col = 0; col < headList.Count; col++)
                     {
                         worksheet.SetValue(1, col + 1, headList[col].Alias);
-                        worksheet.Cells[1, col + 1].Style.Border.Bottom.Style = ExcelBorderStyle.Thin;
-                        worksheet.Cells[1, col + 1].Style.Border.Top.Style = ExcelBorderStyle.Thin;
-                        worksheet.Cells[1, col + 1].Style.Border.Right.Style = ExcelBorderStyle.Thin;
-                        worksheet.Cells[1, col + 1].Style.Border.Left.Style = ExcelBorderStyle.Thin;
 
                     }
                     for (int col = 0; col < headList.Count; col++)
@@ -216,33 +212,23 @@ public string AllComputerViewReport(int allotId, List<dynamic> dynamics, string
                             var value = temp[headList[col].Name];
 
                             worksheet.Cells[row + 2, col + 1].Value = value;
-                            worksheet.Cells[row + 2, col + 1].Style.Numberformat.Format = "#,##0.00";//这是保留两位小数
-                            worksheet.Cells[row + 2, col + 1].Style.Border.Bottom.Style = ExcelBorderStyle.Thin;
-                            worksheet.Cells[row + 2, col + 1].Style.Border.Top.Style = ExcelBorderStyle.Thin;
-                            worksheet.Cells[row + 2, col + 1].Style.Border.Right.Style = ExcelBorderStyle.Thin;
-                            worksheet.Cells[row + 2, col + 1].Style.Border.Left.Style = ExcelBorderStyle.Thin;
                         }
                         if (col == 0)
-                        {
                             worksheet.SetValue(dynamics.Count() + 2, col + 1, "合计");
-                            worksheet.Cells[dynamics.Count() + 2, col + 1].Style.Border.Bottom.Style = ExcelBorderStyle.Thin;
-                            worksheet.Cells[dynamics.Count() + 2, col + 1].Style.Border.Top.Style = ExcelBorderStyle.Thin;
-                            worksheet.Cells[dynamics.Count() + 2, col + 1].Style.Border.Right.Style = ExcelBorderStyle.Thin;
-                            worksheet.Cells[dynamics.Count() + 2, col + 1].Style.Border.Left.Style = ExcelBorderStyle.Thin;
-                        }
                         else
-                        {
-                            string address = new ExcelAddress(2, col + 1, dynamics.Count() + 1, col + 1).Address;
-                            worksheet.Cells[dynamics.Count() + 2, col + 1].Formula = string.Format("SUM({0})", address);
-                            worksheet.Cells[dynamics.Count() + 2, col + 1].Style.Numberformat.Format = "#,##0.00";//这是保留两位小数
-                            worksheet.Cells[dynamics.Count() + 2, col + 1].Style.Border.Bottom.Style = ExcelBorderStyle.Thin;
-                            worksheet.Cells[dynamics.Count() + 2, col + 1].Style.Border.Top.Style = ExcelBorderStyle.Thin;
-                            worksheet.Cells[dynamics.Count() + 2, col + 1].Style.Border.Right.Style = ExcelBorderStyle.Thin;
-                            worksheet.Cells[dynamics.Count() + 2, col + 1].Style.Border.Left.Style = ExcelBorderStyle.Thin;
-                        }
+                            worksheet.Cells[dynamics.Count() + 2, col + 1].Formula = string.Format("SUM({0})", new ExcelAddress(2, col + 1, dynamics.Count() + 1, col + 1).Address);
                     }
                 }
 
+                worksheet.View.FreezePanes(2, 1);
+                for (int row = worksheet.Dimension.Start.Row; row <= worksheet.Dimension.End.Row; row++)
+                {
+                    for (int col = worksheet.Dimension.Start.Column; col <= worksheet.Dimension.End.Column; col++)
+                    {
+                        worksheet.Cells[row, col].Style.Border.BorderAround(ExcelBorderStyle.Thin);
+                        worksheet.Cells[row, col].Style.Numberformat.Format = "#,##0.00";
+                    }
+                }
                 package.Save();
             }
             return filepath;