同步手工录入数据并导出

performance/Performance.EntityModels/Entity/ex_result.cs

@@ -79,6 +79,6 @@ public class ex_result
         /// <summary>
         /// 1 删除 0 未删除
         /// </summary>
-        public int IsDelete { get; set; }
+        // public int IsDelete { get; set; }
     }
 }

performance/Performance.Services/ExtractExcelService/DictionaryService.cs

@@ -120,6 +120,7 @@ private void Employee(per_allot allot, List<sys_hospitalconfig> configs, IEnumer
                     if (limitData == null || !limitData.Any()) return;
 
                     var columns = ((IDictionary<string, object>)limitData.ElementAt(0)).Select(t => t.Key.ToLower()).ToList();
+                    if (columns == null || !columns.Any()) return;
 
                     var data = queryService.QueryData<per_employee>(config, sql, allot, isSingle).ToList();
                     data.ForEach(t =>
@@ -191,6 +192,9 @@ private void JudgeDataEqual(List<string> columns, List<per_employee> emps, List<
                 { nameof(per_employee.BankCard), (t) => t.BankCard },
             };
 
+            columns = columns.Intersect(dict.Keys.Select(t => t.ToLower())).ToList();
+            if (columns == null || !columns.Any()) return;
+
             if (columns.Contains(nameof(per_employee.PersonnelNumber).ToLower())) columns.Remove(nameof(per_employee.PersonnelNumber).ToLower());
             if (!columns.Contains(nameof(per_employee.AccountingUnit).ToLower())) columns.Add(nameof(per_employee.AccountingUnit).ToLower());
 

performance/Performance.Services/ExtractExcelService/ExtractService.cs

@@ -102,9 +102,9 @@ public string Main(int allotId, int hospitalId, string email, string groupName,
 
                 queryService.ClearHistoryData(allot.ID, groupName, isSingle);
 
-                //employeeService.SyncDataToResult(allotId);
+                employeeService.SyncDataToResult(allotId);
 
-                var data = exresultRepository.GetEntities(t => t.AllotId == allotId && t.IsDelete == 0);
+                var data = exresultRepository.GetEntities(t => t.AllotId == allotId);
                 data.AddRange(queryService.Handler(hospitalId, allot, groupName, isSingle, ref dict));
                 var standData = StandDataFormat(hospitalId, data);