抽取新增字段configid,决定script的抽取配置

performance/Performance.EntityModels/Entity/ex_script.cs

@@ -37,6 +37,11 @@ public class ex_script
         public int TypeId { get; set; }
 
         /// <summary>
+        /// 配置Id
+        /// </summary>
+        public int ConfigId { get; set; }
+
+        /// <summary>
         /// 是否可用 1 可用 2 不可用
         /// </summary>
         public int IsEnable { get; set; }

performance/Performance.Services/DFExtractService.cs

@@ -203,10 +203,14 @@ private List<ex_result> ExtractIncome<TEntity>(List<TEntity> entities, List<ex_s
                 ratio += 15m / incomemodules.Count();
                 logManage.ReturnTheLog(Allot.ID, GroupName, 3, "", ratio > 20 ? 20 : ratio);
                 logManage.ReturnTheLog(Allot.ID, GroupName, 2, "提取数据", $"开始提取模块“{module.ModuleName}”的数据");
-                foreach (var config in configs)
+                var items = scripts.Where(t => t.TypeId == module.TypeId);
+                if (items != null && items.Any())
                 {
-                    var item = scripts.FirstOrDefault(t => t.TypeId == module.TypeId && t.DatabaseType == config.DataBaseType);
-                    if (item == null) continue;
+                    foreach (var item in items)
+                    {
+                        var config = configs.FirstOrDefault(t => t.Id == item.ConfigId);
+                        if (config == null) continue;
+
                         var querydata = QueryData(config, allot, item.ExecScript, module.ModuleName);
                         if (querydata != null && querydata.Any())
                         {
@@ -214,6 +218,7 @@ private List<ex_result> ExtractIncome<TEntity>(List<TEntity> entities, List<ex_s
                             data.AddRange(querydata);
                         }
                     }
+                }
                 logManage.ReturnTheLog(Allot.ID, GroupName, 2, "提取数据", $"模块“{module.ModuleName}”的数据已完成提取");
             }
 
@@ -249,10 +254,13 @@ private List<ex_result> ExtractItems<TEntity>(List<TEntity> entities, List<ex_sc
                 logManage.ReturnTheLog(Allot.ID, GroupName, 3, "", ratio > 50 ? 50 : ratio);
                 logManage.ReturnTheLog(Allot.ID, GroupName, 2, "提取数据", $"开始提取项目“{exitem.ItemName}”的数据");
                 var module = modules.FirstOrDefault(t => t.Id == exitem.ModuleId);
-                foreach (var config in configs)
+                var scritems = scripts.Where(t => t.TypeId == exitem.TypeId);
+                if (scritems != null && scritems.Any())
+                {
+                    foreach (var item in scritems)
                     {
-                    var item = scripts.FirstOrDefault(t => t.TypeId == exitem.TypeId && t.DatabaseType == config.DataBaseType);
-                    if (item == null) continue;
+                        var config = configs.FirstOrDefault(t => t.Id == item.ConfigId);
+                        if (config == null) continue;
 
                         var result = QueryData(config, allot, item.ExecScript, module.ModuleName);
                         if (result != null && result.Any())
@@ -266,6 +274,7 @@ private List<ex_result> ExtractItems<TEntity>(List<TEntity> entities, List<ex_sc
                             data.AddRange(result);
                         }
                     }
+                }
                 logManage.ReturnTheLog(Allot.ID, GroupName, 2, "提取数据", $"项目“{exitem.ItemName}”的数据已完成提取");
             }
 
@@ -299,10 +308,13 @@ private List<ex_result> ExtractSpcial<TEntity>(List<TEntity> entities, List<ex_s
                 ratio += 10m / specials.Where(t => t.TypeId > 0).Count();
                 logManage.ReturnTheLog(Allot.ID, GroupName, 3, "", ratio > 60 ? 60 : ratio);
                 logManage.ReturnTheLog(Allot.ID, GroupName, 2, "提取数据", $"开始提取特殊核算项“{special.Target}”的数据");
-                foreach (var config in configs)
+                var scritems = scripts.Where(t => t.TypeId == special.TypeId);
+                if (scritems != null && scritems.Any())
+                {
+                    foreach (var item in scritems)
                     {
-                    var item = scripts.FirstOrDefault(t => t.TypeId == special.TypeId && t.DatabaseType == config.DataBaseType);
-                    if (item == null) continue;
+                        var config = configs.FirstOrDefault(t => t.Id == item.ConfigId);
+                        if (config == null) continue;
 
                         var result = QueryData(config, allot, item.ExecScript, specialname);
                         result.ForEach(t =>
@@ -312,6 +324,7 @@ private List<ex_result> ExtractSpcial<TEntity>(List<TEntity> entities, List<ex_s
                         });
                         data.AddRange(result);
                     }
+                }
                 logManage.ReturnTheLog(Allot.ID, GroupName, 2, "提取数据", $"特殊核算项“{special.Target}”的数据已完成提取");
             }
             if (data != null && data.Any())