Merge branch 'hotfix/数据提取异常停止'

performance/Performance.Api/Controllers/EmployeeController.cs.rej

-diff a/performance/Performance.Api/Controllers/EmployeeController.cs b/performance/Performance.Api/Controllers/EmployeeController.cs	(rejected hunks)
-@@ -824,6 +824,7 @@
-             if (allotId <= 0)
-                 return new ApiResponse(ResponseType.Fail, "参数错误", "allotid无效");
- 
-+            var result = employeeService.GetGatherTotal(allotId, request);
- 
-             return new ApiResponse(ResponseType.OK, result);
-         }

performance/Performance.Services/ExtractExcelService/QueryService.cs

@@ -231,7 +231,8 @@ private List<ex_result> ExtractModuleData(per_allot allot, string groupName, boo
                         }
                         catch (Exception ex)
                         {
-                            logger.LogError($"typeId: {typeId}提取数据异常{ex}， {Infrastructure.JsonHelper.Serialize(script)}");
+                            logger.LogError($"typeId: {typeId}提取数据异常{ex}， {JsonHelper.Serialize(script)}");
+                            throw;
                         }
                     }
                 }
@@ -301,7 +302,8 @@ private List<ex_result> ExtractItemData(per_allot allot, string groupName, bool
                         }
                         catch (Exception ex)
                         {
-                            logger.LogError($"typeId: {typeId}提取数据异常{ex}， {Infrastructure.JsonHelper.Serialize(script)}");
+                            logger.LogError($"typeId: {typeId}提取数据异常{ex}， {JsonHelper.Serialize(script)}");
+                            throw;
                         }
                     }
                     logService.ReturnTheLog(allot.ID, groupName, 2, "提取数据", $"项目“{string.Join("、", thisItems.Select(t => t.ItemName))}”的数据已完成提取", 1, isSingle);
@@ -369,7 +371,8 @@ private List<ex_result> ExtractSpecialData(per_allot allot, string groupName, bo
                         }
                         catch (Exception ex)
                         {
-                            logger.LogError($"typeId: {typeId}提取数据异常{ex}， {Infrastructure.JsonHelper.Serialize(script)}");
+                            logger.LogError($"typeId: {typeId}提取数据异常{ex}， {JsonHelper.Serialize(script)}");
+                            throw;
                         }
                     }