Merge branch 'feature/手工录入审核' into develop

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;
@@ -854,16 +853,16 @@ public ApiResponse GetDeptComparisonTotal([FromRoute] int allotId)
         /// <summary>
         /// 手工录入 - 下拉列表
         /// </summary>
-        /// <param name="allotId"></param>
+        /// <param name="gather"></param>
         /// <returns></returns>
-        [Route("getgatherdrop/{allotId}")]
+        [Route("getgatherdrop")]
         [HttpPost]
-        public ApiResponse GetGatherDrop([FromRoute] int allotId)
+        public ApiResponse GetGatherDrop([FromBody] Gather gather)
         {
-            if (allotId <= 0)
+            if (gather.AllotId <= 0)
                 return new ApiResponse(ResponseType.Fail, "参数错误", "allotid无效");
 
-            var relust = employeeService.GetGatherDrop(allotId);
+            var relust = employeeService.GetGatherDrop(gather);
             return new ApiResponse(ResponseType.OK, relust);
         }
 
@@ -896,34 +895,27 @@ public ApiResponse SaveGatherHands([FromRoute] int allotId, [FromBody] SaveGathe
         {
             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, "用户提交数据为空");
 
-            employeeService.CheckGatherData(allotId, request);
-            employeeService.SaveGatherHands(allotId, request);
-            employeeService.AddCategoryToConfig(allotId);
-            return new ApiResponse(ResponseType.OK);
+            ;
+            return employeeService.SaveGatherHands(allotId, request);
         }
 
         /// <summary>
         /// 手工录入列表 - 明细
         /// </summary>
-        /// <param name="allotId"></param>
-        /// <param name="department">科室</param>
-        /// <param name="source">来源</param>
-        /// <param name="request">分页</param>
+        /// <param name="gather"></param>
         /// <returns></returns>
-        [Route("getgather/{allotId},{department},{source}")]
+        [Route("getgather")]
         [HttpPost]
-        public ApiResponse GetGather([FromRoute] int allotId, string department, string source, [FromBody] PersonParamsRequest request)
+        public ApiResponse GetGather([FromBody] Gather gather)
         {
-            if (allotId <= 0 || string.IsNullOrEmpty(department) || string.IsNullOrEmpty(source))
-                return new ApiResponse(ResponseType.Fail, "参数错误", "请检查allotId，department，source是否正确");
+            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.GetGather(allotId, department, source, request);
+            var result = employeeService.GetGather(gather);
 
             return new ApiResponse(ResponseType.OK, result);
 
@@ -932,20 +924,50 @@ public ApiResponse GetGather([FromRoute] int allotId, string department, string
         /// <summary>
         /// 手工录入列表 - 汇总 
         /// </summary>
-        /// <param name="allotId"></param>
-        /// <param name="request">分页</param>
+        /// <param name="gather"></param>
         /// <returns></returns>
-        [Route("getgathertotal/{allotId}")]
+        [Route("getgathertotal")]
         [HttpPost]
-        public ApiResponse GetGatherTotal([FromRoute] int allotId, [FromBody] PersonParamsRequest request)
+        public ApiResponse GetGatherTotal([FromBody] Gather gather)
         {
-            if (allotId <= 0)
+            if (gather.AllotId <= 0)
                 return new ApiResponse(ResponseType.Fail, "参数错误", "allotid无效");
 
-            var result = employeeService.GetGatherTotal(allotId, request);
+            var result = employeeService.GetGatherTotal(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

@@ -1355,11 +1355,11 @@
             <param name="allotId"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.EmployeeController.GetGatherDrop(System.Int32)">
+        <member name="M:Performance.Api.Controllers.EmployeeController.GetGatherDrop(Performance.DtoModels.Gather)">
             <summary>
             手工录入 - 下拉列表
             </summary>
-            <param name="allotId"></param>
+            <param name="gather"></param>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.EmployeeController.GetGatherHands(System.Int32,Performance.DtoModels.GatherRequest)">
@@ -1378,22 +1378,32 @@
             <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.EmployeeController.GetGather(System.Int32,System.String,System.String,Performance.DtoModels.PersonParamsRequest)">
+        <member name="M:Performance.Api.Controllers.EmployeeController.GetGather(Performance.DtoModels.Gather)">
             <summary>
             手工录入列表 - 明细
             </summary>
-            <param name="allotId"></param>
-            <param name="department">科室</param>
-            <param name="source">来源</param>
-            <param name="request">分页</param>
+            <param name="gather"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.EmployeeController.GetGatherTotal(System.Int32,Performance.DtoModels.PersonParamsRequest)">
+        <member name="M:Performance.Api.Controllers.EmployeeController.GetGatherTotal(Performance.DtoModels.Gather)">
             <summary>
             手工录入列表 - 汇总 
             </summary>
-            <param name="allotId"></param>
-            <param name="request">分页</param>
+            <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)">

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,14 +3624,29 @@
             来源
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.ex_result_gather.Submitter">
+            <summary>
+            提交人
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.ex_result_gather.CreateTime">
             <summary>
             创建时间
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.ex_result_gather.AuditTime">
+            <summary>
+            审核时间
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.ex_result_gather.States">
+            <summary>
+            审核状态 0未审核 1 未通过 2 通过 3审核中
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.ex_result_gather.Remark">
             <summary>
-            备注
+            失败理由
             </summary>
         </member>
         <member name="T:Performance.EntityModels.ex_script">
@@ -6590,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/AutoMapper/AutoMapperConfigs.cs

@@ -78,6 +78,7 @@ public AutoMapperConfigs()
             CreateMap<PerDataEmployee, im_employee>();
             CreateMap<im_employee, PerDataEmployee>();
             CreateMap<res_baiscnorm, ComputerAvgRequest>().ReverseMap();
+            CreateMap<ex_result_gather, GatherTotalRequest>();
 
             //CreateMap<PerDataAccountBaisc, PerDataAccount>()
             //    .ForMember(dest => dest.AccountingUnit, opt => opt.MapFrom(src => src.AccountingUnit))

performance/Performance.DtoModels/Enum.cs

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

performance/Performance.DtoModels/PerExcel/PerSheetHeader.cs

@@ -95,18 +95,23 @@ 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>
         {
-            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.Fee)}
+            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)},
+            new Heads{Column="失败理由",Name=nameof(GatherTotalRequest.Remark)},
         };
     }
     

performance/Performance.DtoModels/Response/GatherResponse.cs

 using Performance.DtoModels.Request;
 using Performance.EntityModels;
 using Performance.Infrastructure.Models;
+using System;
 using System.Collections.Generic;
 
 namespace Performance.DtoModels
@@ -8,7 +9,7 @@ namespace Performance.DtoModels
     public class GatherResponse
     {
         public List<Heads> Heads { get; set; }
-        public List<GatherTotalRequest> Datas { get; set; }
+        public List<Dictionary<string, object>> Datas { get; set; }
         public int CurrentPage { get; set; }
         public int TotalPages { get; set; }
         public int PageSize { get; set; }
@@ -26,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; }
@@ -41,18 +40,52 @@ public class GatherRequest
 
     public class GatherTotalRequest
     {
-        public int ID { get; set; }
         public string Department { get; set; }
         public string Source { get; set; }
-        public decimal Fee { get; set; }
+        public string Category { get; set; }
+        public string CreateTime { get; set; }
+        public string AuditTime { get; set; }
+        public string States { get; set; }
+        public string Remark { get; set; }
+    }
+    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 List<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,16 +39,24 @@ 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; }
         /// <summary>
-        /// 备注
+        /// 审核时间
+        /// </summary>
+        public DateTime? AuditTime { get; set; }
+        /// <summary>
+        /// 审核状态 0未审核 1 未通过 2 通过 3审核中
+        /// </summary>
+        public int States { get; set; }
+        /// <summary>
+        /// 失败理由
         /// </summary>
         public string Remark { get; set; }
-        // /// <summary>
-        // /// 1 未通过 2 通过 
-        // /// </summary>
-        // public int States { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/per_attendance_vacation.cs

@@ -18,8 +18,8 @@ public class per_attendance_vacation
         public string PersonnelNumber { get; set; } //工号
         public string PersonnelName { get; set; } //姓名
         public int TypeId { get; set; } //per_attendance_type表中ID
-        public DateTime BegDate { get; set; } //开始时间
-        public DateTime EndDate { get; set; } //结束时间
+        public DateTime? BegDate { get; set; } //开始时间
+        public DateTime? EndDate { 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系统科室名称