手工录入：汇总，查看详情，下拉框，录入判断，审核；

考勤：增加超出考勤时间多少天，修改返回时间为短时间

performance/Performance.Api/Controllers/EmployeeController.cs

@@ -3,7 +3,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Performance.DtoModels;
-using Performance.DtoModels.Request;
 using Performance.DtoModels.Response;
 using Performance.EntityModels;
 using Performance.Infrastructure;
@@ -892,12 +891,10 @@ public ApiResponse GetGatherHands([FromRoute] int allotId, [FromBody] GatherRequ
         /// <returns></returns>
         [Route("savegatherhands/{allotId}")]
         [HttpPost]
-        public ApiResponse SaveGatherHands([FromBody] int allotId, [FromBody] SaveGatherData request)
+        public ApiResponse SaveGatherHands([FromRoute] int allotId, [FromBody] SaveGatherData request)
         {
             if (allotId <= 0)
                 return new ApiResponse(ResponseType.Fail, "参数错误", "allotid无效");
-            if (string.IsNullOrEmpty(request.Source) || string.IsNullOrEmpty(request.Category))
-                return new ApiResponse(ResponseType.Fail);
 
             if (request.Data == null || !request.Data.Any())
                 return new ApiResponse(ResponseType.Fail, "用户提交数据为空");
@@ -942,6 +939,37 @@ public ApiResponse GetGatherTotal([FromBody] Gather gather)
 
             return new ApiResponse(ResponseType.OK, result);
         }
+
+        /// <summary>
+        /// 手工录入列表 - 删除
+        /// </summary>
+        /// <param name="gather"></param>
+        /// <returns></returns>
+        [Route("deleteGather")]
+        [HttpPost]
+        public ApiResponse DeleteGather([FromBody] Gather gather)
+        {
+            if (gather.AllotId <= 0 || string.IsNullOrEmpty(gather.Source) || string.IsNullOrEmpty(gather.Category) || string.IsNullOrEmpty(gather.Department))
+                return new ApiResponse(ResponseType.Fail, "参数错误", "请检查allotId,source,category,department是否正确");
+
+            var result = employeeService.DeleteGather(gather);
+            if(result) return new ApiResponse(ResponseType.OK, "删除成功");
+            else return new ApiResponse(ResponseType.Fail, "删除失败");
+
+        }
+
+        /// <summary>
+        /// 批量审核
+        /// </summary>
+        /// <param name="gather"></param>
+        /// <returns></returns>
+        [Route("auditGather")]
+        [HttpPost]
+        public ApiResponse auditGather([FromBody] List<Gather> gather)
+        {
+            employeeService.auditGather(gather);
+            return new ApiResponse(ResponseType.OK,"");
+        }
         #endregion
     }
 }

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

@@ -1393,6 +1393,20 @@
             <param name="gather"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.EmployeeController.DeleteGather(Performance.DtoModels.Gather)">
+            <summary>
+            手工录入列表 - 删除
+            </summary>
+            <param name="gather"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.EmployeeController.auditGather(System.Collections.Generic.List{Performance.DtoModels.Gather})">
+            <summary>
+            批量审核
+            </summary>
+            <param name="gather"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.ExConfigController.Extract(Performance.DtoModels.ModModuleRequest)">
             <summary>
             绩效数据抽取模板

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

@@ -3489,6 +3489,36 @@
             汇总
             </summary>   
         </member>
+        <member name="P:Performance.DtoModels.Gather.UserId">
+            <summary>
+            用户Id
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Gather.Department">
+            <summary>
+            科室
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Gather.Source">
+            <summary>
+            来源
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Gather.Category">
+            <summary>
+            核算项目
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Gather.Status">
+            <summary>
+            状态
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.Gather.Remark">
+            <summary>
+            失败理由
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.GuaranteeResponse.AllotId">
             <summary>
             

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

@@ -3624,6 +3624,11 @@
             来源
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.ex_result_gather.Submitter">
+            <summary>
+            提交人
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.ex_result_gather.CreateTime">
             <summary>
             创建时间

performance/Performance.DtoModels/Enum.cs

@@ -171,4 +171,11 @@ public enum Deduction
         }
 
     }
+
+    public enum AuditGather
+    {
+        未审核 = 0,
+        未通过 = 1,
+        已通过 = 2,
+    }
 }

performance/Performance.DtoModels/PerExcel/PerSheetHeader.cs

@@ -95,11 +95,11 @@ public class ColumnHeadsConfig
         public static List<Heads> GatherHeads { get; } = new List<Heads>
         {
             new Heads{Column="来源",Name=nameof(GatherInfoRequest.Source)},
-            new Heads{Column="科室",Name=nameof(GatherInfoRequest.Department)},
+            new Heads{Column="His科室",Name=nameof(GatherInfoRequest.Department)},
             new Heads{Column="医生姓名",Name=nameof(GatherInfoRequest.DoctorName)},
             new Heads{Column="人员工号",Name=nameof(GatherInfoRequest.PersonnelNumber)},
-            new Heads{Column="费用类型",Name=nameof(GatherInfoFee.Category)},
-            new Heads{Column="费用",Name=nameof(GatherInfoFee.Fee)},
+            new Heads{Column="数值类型",Name=nameof(GatherInfoFee.Category)},
+            new Heads{Column="数值",Name=nameof(GatherInfoFee.Fee)},
         };
 
         public static List<Heads> GatherTotal { get; } = new List<Heads>
@@ -107,6 +107,7 @@ public class ColumnHeadsConfig
             new Heads{Column="核算组别",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)},
             new Heads{Column="提交日期",Name=nameof(GatherTotalRequest.CreateTime)},
             new Heads{Column="审核日期",Name=nameof(GatherTotalRequest.AuditTime)},
             new Heads{Column="审核状态",Name=nameof(GatherTotalRequest.States)},

performance/Performance.DtoModels/Response/GatherResponse.cs

@@ -52,20 +52,42 @@ public class GatherTotalRequest
     }
     public class Gather: PersonParamsRequest
     {
+
         public int AllotId { get; set; }
+        /// <summary>
+        /// 用户Id
+        /// </summary>
         public int UserId { get; set; }
+        /// <summary>
+        /// 科室
+        /// </summary>
         public string Department { get; set; }
+        /// <summary>
+        /// 来源
+        /// </summary>
         public string Source { get; set; }
+        /// <summary>
+        /// 核算项目
+        /// </summary>
         public string Category { get; set; }
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public string Status { get; set; }
+        /// <summary>
+        /// 失败理由
+        /// </summary>
+        public string Remark { get; set; }
     }
     public class GatherInfoRequest
     {
+        public int UserId { get; set; }
         public string Source { get; set; }
         public string CreateTime { get; set; }
         public string Department { get; set; }
         public string DoctorName { get; set; }
         public string PersonnelNumber { get; set; }
-        public GatherInfoFee Detail { get; set; }
+        public GatherInfoFee[] Detail { get; set; }
 
     }
     public class GatherInfoFee

performance/Performance.DtoModels/SaveCollectData.cs

@@ -32,6 +32,7 @@ public class SaveCustomData
 
     public class SaveGatherData
     {
+        public int UserId { get; set; }
         public string Source { get; set; }
         public string Category { get; set; }
         public string[] ColHeaders { get; set; }

performance/Performance.EntityModels/Entity/ex_result_gather.cs

@@ -39,6 +39,10 @@ public class ex_result_gather
         /// </summary>
         public string Source { get; set; }
         /// <summary>
+        /// 提交人
+        /// </summary>
+        public int Submitter { get; set; }
+        /// <summary>
         /// 创建时间
         /// </summary>
         public DateTime CreateTime { get; set; }