‘考勤下发’ 下载调整，下发添加搜索框，确认详情添加排序，预下发接口调整

performance/Performance.Api/Controllers/AttendanceController.cs

@@ -323,20 +323,19 @@ public IActionResult DownloadStatistics(int allotId)
         {
             List<ExcelDownloadHeads> excelDownloadHeads = new List<ExcelDownloadHeads>()
             {
-                new ExcelDownloadHeads { Alias = "科室名称", Name = nameof(AttendanceStatistics.Department) },
+               new ExcelDownloadHeads { Alias = "核算组别", Name = nameof(AttendanceStatistics.UnitType) },
+               new ExcelDownloadHeads { Alias = "核算单元名称", Name = nameof(AttendanceStatistics.AccountingUnit) },
                new ExcelDownloadHeads { Alias = "姓名", Name = nameof(AttendanceStatistics.PersonnelName) },
                new ExcelDownloadHeads { Alias = "员工号", Name = nameof(AttendanceStatistics.PersonnelNumber) },
-                new ExcelDownloadHeads { Alias = "人员类别", Name = nameof(AttendanceStatistics.UnitType) },
-                new ExcelDownloadHeads { Alias = "核算单元", Name = nameof(AttendanceStatistics.AccountingUnit) },
-                new ExcelDownloadHeads { Alias = "开始时问", Name = nameof(AttendanceStatistics.BeginDate) },
-                new ExcelDownloadHeads { Alias = "结束时间", Name = nameof(AttendanceStatistics.EndDate) },
+               new ExcelDownloadHeads { Alias = "在科开始时问", Name = nameof(AttendanceStatistics.BeginDate) },
+               new ExcelDownloadHeads { Alias = "在科结束时间", Name = nameof(AttendanceStatistics.EndDate) },
             };
             var type = _attendanceService.GetAttendanceType(allotId);
             foreach (var item in type.Data)
             {
                 excelDownloadHeads.Add(new ExcelDownloadHeads() { Alias = item.AttendanceName, Name = item.AttendanceName });
             }
-            excelDownloadHeads.Add(new ExcelDownloadHeads() { Alias = "考勤天数", Name = "AttendanceDays" });
+            excelDownloadHeads.Add(new ExcelDownloadHeads() { Alias = "出勤天数", Name = "AttendanceDays" });
             var userid = claim.GetUserId();
             var result = _attendanceService.GetAttendanceStatistics(allotId, userid).Data;
 
@@ -377,26 +376,25 @@ public IActionResult DownloadStatistics(int allotId)
         /// <returns></returns>
         [HttpPost]
         [Route("download/auditDetail")]
-        public IActionResult DownloadAuditDetail(int allotId,string unitType,string accountingUnit)
+        public IActionResult DownloadAuditDetail(int allotId, string unitType, string accountingUnit, string searchTxet)
         {
             List<ExcelDownloadHeads> excelDownloadHeads = new List<ExcelDownloadHeads>()
             {
-                new ExcelDownloadHeads { Alias = "科室名称", Name = nameof(AttendanceStatistics.Department) },
+               new ExcelDownloadHeads { Alias = "核算组别", Name = nameof(AttendanceStatistics.UnitType) },
+               new ExcelDownloadHeads { Alias = "核算单元名称", Name = nameof(AttendanceStatistics.AccountingUnit) },
                new ExcelDownloadHeads { Alias = "姓名", Name = nameof(AttendanceStatistics.PersonnelName) },
                new ExcelDownloadHeads { Alias = "员工号", Name = nameof(AttendanceStatistics.PersonnelNumber) },
-                new ExcelDownloadHeads { Alias = "人员类别", Name = nameof(AttendanceStatistics.UnitType) },
-                new ExcelDownloadHeads { Alias = "核算单元", Name = nameof(AttendanceStatistics.AccountingUnit) },
-                new ExcelDownloadHeads { Alias = "开始时问", Name = nameof(AttendanceStatistics.BeginDate) },
-                new ExcelDownloadHeads { Alias = "结束时间", Name = nameof(AttendanceStatistics.EndDate) },
+               new ExcelDownloadHeads { Alias = "在科开始时问", Name = nameof(AttendanceStatistics.BeginDate) },
+               new ExcelDownloadHeads { Alias = "在科结束时间", Name = nameof(AttendanceStatistics.EndDate) },
             };
             var type = _attendanceService.GetAttendanceType(allotId);
             foreach (var item in type.Data)
             {
                 excelDownloadHeads.Add(new ExcelDownloadHeads() { Alias = item.AttendanceName, Name = item.AttendanceName });
             }
-            excelDownloadHeads.Add(new ExcelDownloadHeads() { Alias = "考勤天数", Name = "AttendanceDays" });
+            excelDownloadHeads.Add(new ExcelDownloadHeads() { Alias = "出勤天数", Name = "AttendanceDays" });
             var userid = claim.GetUserId();
-            var result = _attendanceService.AuditDetail(allotId, unitType, accountingUnit, userid).Data;
+            var result = _attendanceService.AuditDetail(allotId, unitType, accountingUnit, searchTxet, userid).Data;
 
             var ser = JsonConvert.SerializeObject(result);
             var rows = JsonConvert.DeserializeObject<List<Dictionary<string, object>>>(ser);
@@ -445,10 +443,10 @@ public ApiResponse<List<AttendanceAuditList>> AuditList(int allotId, string unit
         /// <returns></returns>
         [HttpPost]
         [Route("issue/audit/detail")]
-        public ApiResponse<List<AttendanceAuditDetail>> AuditDetail(int allotId, string unitType, string accountingUnit)
+        public ApiResponse<List<AttendanceAuditDetail>> AuditDetail(int allotId, string unitType, string accountingUnit, string searchTxet)
         {
             var userid = claim.GetUserId();
-            return _attendanceService.AuditDetail(allotId, unitType, accountingUnit, userid);
+            return _attendanceService.AuditDetail(allotId, unitType, accountingUnit, searchTxet, userid);
         }
 
         /// <summary>

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

@@ -399,13 +399,13 @@
             <param name="allotId"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.AttendanceController.DownloadAuditDetail(System.Int32,System.String,System.String)">
+        <member name="M:Performance.Api.Controllers.AttendanceController.DownloadAuditDetail(System.Int32,System.String,System.String,System.String)">
             <summary>
             科室确认详情(已下发结果展示列表)下载
             </summary>
             <param name="allotId"></param>
-            <param name="unitType"></param>
-            <param name="accountingUnit"></param>
+            <param name="unitType">人员类别</param>
+            <param name="accountingUnit">核算单元</param>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.AttendanceController.AuditList(System.Int32,System.String,System.String,Performance.DtoModels.Attendance.State)">
@@ -418,7 +418,7 @@
             <param name="state"> 操作类型  全部=0，未确认 = 1,确认 = 2,驳回 = 3,</param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.AttendanceController.AuditDetail(System.Int32,System.String,System.String)">
+        <member name="M:Performance.Api.Controllers.AttendanceController.AuditDetail(System.Int32,System.String,System.String,System.String)">
             <summary>
             科室确认详情(已下发结果展示列表)
             </summary>

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

@@ -262,11 +262,6 @@
             核算单元
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.PerAttendanceIssueDto.Department">
-            <summary>
-            科室名称
-            </summary>
-        </member>
         <member name="P:Performance.DtoModels.PerAttendanceIssueDto.PersonnelNumber">
             <summary>
             工号
@@ -2928,11 +2923,6 @@
             核算单元
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.Department">
-            <summary>
-            科室名称
-            </summary>
-        </member>
         <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.PersonnelNumber">
             <summary>
             工号
@@ -3108,6 +3098,16 @@
             是否附带上次绩效 0 不附带  1 附带
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.AttendanceStatistics.Code">
+            <summary>
+            核算单元编码
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.AttendanceStatistics.AllotID">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.AttendanceStatistics.UnitType">
             <summary>
             核算组别

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

@@ -6138,11 +6138,6 @@
             人员类别
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.Entity.per_attendance_issue.Department">
-            <summary>
-            科室名称
-            </summary>
-        </member>
         <member name="P:Performance.EntityModels.Entity.per_attendance_issue.AccountingUnit">
             <summary>
             核算单元

performance/Performance.DtoModels/PerAttendanceIssueDto.cs

@@ -14,9 +14,9 @@ public PerAttendanceIssueDto()
         { }
         public PerAttendanceIssueDto(AttendanceStatistics item)
         {
+            Code = item.Code;
             UnitType = item.UnitType;
             AccountingUnit = item.AccountingUnit;
-            Department = item.Department;
             PersonnelNumber = item.PersonnelNumber;
             PersonnelName = item.PersonnelName;
             BeginDate = item.BeginDate;
@@ -31,9 +31,9 @@ public PerAttendanceIssueDto(AttendanceStatistics item)
 
         public PerAttendanceIssueDto(per_attendance_issue item)
         {
+            Code = item.Code;
             UnitType = item.UnitType;
             AccountingUnit = item.AccountingUnit;
-            Department = item.Department;
             PersonnelNumber = item.PersonnelNumber;
             PersonnelName = item.PersonnelName;
             BeginDate = item.BeginDate;
@@ -48,7 +48,7 @@ public PerAttendanceIssueDto(per_attendance_issue item)
 
         //public int HospitalId { get; set; } //医院Id
         //public int AllotId { get; set; } //绩效Id
-        //public string Code { get; set; } //核算单元编码
+        public string Code { get; set; } //核算单元编码
         /// <summary>
         /// 人员类别
         /// </summary>
@@ -58,10 +58,6 @@ public PerAttendanceIssueDto(per_attendance_issue item)
         /// </summary>
         public string AccountingUnit { get; set; }
         /// <summary>
-        /// 科室名称
-        /// </summary>
-        public string Department { get; set; }
-        /// <summary>
         /// 工号
         /// </summary>
         public string PersonnelNumber { get; set; }

performance/Performance.DtoModels/Response/AttendanceAuditDetail.cs

@@ -30,10 +30,6 @@ public class AttendanceAuditDetail
         /// </summary>
         public string AccountingUnit { get; set; }
         /// <summary>
-        /// 科室名称
-        /// </summary>
-        public string Department { get; set; }
-        /// <summary>
         /// 工号
         /// </summary>
         public string PersonnelNumber { get; set; }

performance/Performance.DtoModels/Response/AttendanceStatistics.cs

@@ -5,6 +5,13 @@ namespace Performance.DtoModels
 {
     public class AttendanceStatistics
     {
+        /// <summary>
+        /// 核算单元编码
+        /// </summary>
+        public string Code { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
         public int AllotID { get; set; }
         /// <summary>
         /// 核算组别

performance/Performance.EntityModels/Entity/per_attendance_issue.cs

@@ -29,10 +29,10 @@ public class per_attendance_issue
         /// 人员类别
         /// </summary>
         public string UnitType { get; set; }
-        /// <summary>
-        /// 科室名称
-        /// </summary>
-        public string Department { get; set; }
+        ///// <summary>
+        ///// 科室名称
+        ///// </summary>
+        //public string Department { get; set; }
         /// <summary>
         /// 核算单元
         /// </summary>