修复手工录入bug

performance/Performance.Api/Controllers/AttendanceController.cs

@@ -148,7 +148,6 @@ public ApiResponse GetAttendanceVacationHandsonTable(int allotId)
         /// 查询考勤记录
         /// </summary>
         /// <param name="allotId"></param>
-        /// <param name="hospitalId"></param>
         /// <returns></returns>
         [HttpGet("Vacation/{allotId},{hospitalId}")]
         public ApiResponse<List<RecordAttendcance>> GetAttendanceVacation(int allotId)

performance/Performance.Api/Controllers/EmployeeController.cs

@@ -899,10 +899,8 @@ public ApiResponse SaveGatherHands([FromRoute] int allotId, [FromBody] SaveGathe
             if (request.Data == null || !request.Data.Any())
                 return new ApiResponse(ResponseType.Fail, "用户提交数据为空");
 
-            employeeService.CheckGatherData(allotId, request);
-            employeeService.SaveGatherHands(allotId, request);
-            employeeService.AddCategoryToConfig(allotId);
-            return new ApiResponse(ResponseType.OK);
+            ;
+            return employeeService.SaveGatherHands(allotId, request);
         }
 
         /// <summary>
@@ -965,9 +963,9 @@ public ApiResponse DeleteGather([FromBody] Gather gather)
         /// <returns></returns>
         [Route("auditGather")]
         [HttpPost]
-        public ApiResponse auditGather([FromBody] List<Gather> gather)
+        public ApiResponse AuditGather([FromBody] List<Gather> gather)
         {
-            employeeService.auditGather(gather);
+            employeeService.AuditGather(gather);
             return new ApiResponse(ResponseType.OK,"");
         }
         #endregion

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

@@ -384,7 +384,6 @@
             查询考勤记录
             </summary>
             <param name="allotId"></param>
-            <param name="hospitalId"></param>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.AttendanceController.AttendanceBatch(System.Int32,System.Int32,Performance.DtoModels.SaveCollectData)">
@@ -1400,7 +1399,7 @@
             <param name="gather"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.EmployeeController.auditGather(System.Collections.Generic.List{Performance.DtoModels.Gather})">
+        <member name="M:Performance.Api.Controllers.EmployeeController.AuditGather(System.Collections.Generic.List{Performance.DtoModels.Gather})">
             <summary>
             批量审核
             </summary>

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

@@ -6605,6 +6605,11 @@
             
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.per_dept_dic.AllotId">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.per_dept_dic.HISDeptName">
             <summary>
             his系统科室名称

performance/Performance.DtoModels/Enum.cs

@@ -172,7 +172,7 @@ public enum Deduction
 
     }
 
-    public enum AuditGather
+    public enum AuditGatherEnum
     {
         未审核 = 0,
         未通过 = 1,

performance/Performance.DtoModels/PerExcel/PerSheetHeader.cs

@@ -104,7 +104,7 @@ public class ColumnHeadsConfig
 
         public static List<Heads> GatherTotal { get; } = new List<Heads>
         {
-            new Heads{Column="核算组别",Name=nameof(GatherTotalRequest.Department)},
+            new Heads{Column="His科室",Name=nameof(GatherTotalRequest.Department)},
             new Heads{Column="来源",Name=nameof(GatherTotalRequest.Source)},
             new Heads{Column="核算项目",Name=nameof(GatherTotalRequest.Category)},
             new Heads{Column="提交人",Name=nameof(UserRequest.Login)},

performance/Performance.DtoModels/Response/GatherResponse.cs

@@ -27,8 +27,6 @@ public class GatherInfo
 
     public class GatherDropResponse
     {
-        public string Label { get; set; }
-
         public string Value { get; set; }
 
         public List<GatherDropResponse> Children { get; set; }

performance/Performance.EntityModels/Entity/per_dept_dic.cs

@@ -20,6 +20,10 @@ public class per_dept_dic
         /// </summary>
         [Key]
         public int Id { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int AllotId { get; set; }
 
         /// <summary>
         /// his系统科室名称