‘考勤下发’ 科室列表排序，搜索调整

performance/Performance.DtoModels/PerAttendanceIssueDto.cs

@@ -41,7 +41,7 @@ public PerAttendanceIssueDto(per_attendance_issue item)
             DeductionDays = item.DeductionDays;
             NoDeductionDays = item.NoDeductionDays;
             AttendanceDays = item.AttendanceDays;
-            WorkFullDays = item.AttendanceDays + item.DeductionDays;
+            WorkFullDays = item.WorkFullDays;
             OperationType = (int)Attendance.OperationType.删除;
             Remarks = "删除数据";
         }

performance/Performance.Services/AttendanceService.cs

@@ -780,8 +780,7 @@ public ApiResponse<List<AttendanceAuditList>> AuditList(int allotId, string unit
                 issues = issues.Where(w => w.UnitType.Contains(unitType)).ToList();
             if (!string.IsNullOrEmpty(accountingUnit))
                 issues = issues.Where(w => w.AccountingUnit.Contains(accountingUnit)).ToList();
-            if ((int)state == (int)Attendance.State.确认 || (int)state == (int)Attendance.State.未确认 || (int)state == (int)Attendance.State.驳回)
-                issues = issues.Where(w => w.State == (int)state).ToList();
+            var stateOrders = new int[] { (int)Attendance.State.未确认, (int)Attendance.State.驳回, (int)Attendance.State.确认 };
             var items = issues.GroupBy(w => new { w.Code, w.UnitType, w.AccountingUnit })
                 .Select(w => new AttendanceAuditList
                 {
@@ -793,10 +792,9 @@ public ApiResponse<List<AttendanceAuditList>> AuditList(int allotId, string unit
                     RejectCount = w.Count(p => p.State == (int)Attendance.State.驳回),
                     OperationUser = w.OrderByDescending(o => o.ConfirmTime).Select(s => s.ConfirmUser).FirstOrDefault(),
                     OperationTime = w.OrderByDescending(o => o.ConfirmTime).Select(s => s.ConfirmTime).FirstOrDefault(),
-                    Remarks = string.Join('…', w.Select(p => p.Remarks).Distinct()),
+                    Remarks = string.Join("；", w.Select(p => p.Remarks).Where(s => !string.IsNullOrEmpty(s)).Distinct()),
                 }).ToList();
 
-
             foreach (var item in items)
             {
                 item.State = (int)Attendance.State.未确认;
@@ -805,7 +803,10 @@ public ApiResponse<List<AttendanceAuditList>> AuditList(int allotId, string unit
                 else if (item.ConfirmCount == item.Count)
                     item.State = (int)Attendance.State.确认;
             }
+            items = items.OrderBy(w => Array.IndexOf(stateOrders, w.State)).ToList();
 
+            if ((int)state == (int)Attendance.State.确认 || (int)state == (int)Attendance.State.未确认 || (int)state == (int)Attendance.State.驳回)
+                items = items.Where(w => w.State == (int)state).ToList();
             return new ApiResponse<List<AttendanceAuditList>>(ResponseType.OK, items);
         }
         // 科室确认详情(已下发结果展示列表)
@@ -813,7 +814,7 @@ public ApiResponse<List<AttendanceAuditDetail>> AuditDetail(int allotId, string
         {
             var types = perfoPperAttendanceTypeRepository.GetEntities(t => t.AllotId == allotId) ?? new List<per_attendance_type>();
             var vacationeData = perfoPperAttendanceVacationeRepository.GetEntities(t => t.AllotId == allotId) ?? new List<per_attendance_vacation>();
-            var issues = perforPerAttendanceIssueRepository.GetEntities(w => w.AllotId == allotId).OrderBy(w=>w.PersonnelNumber).ToList();
+            var issues = perforPerAttendanceIssueRepository.GetEntities(w => w.AllotId == allotId).OrderBy(w => w.PersonnelNumber).ToList();
             if (!string.IsNullOrEmpty(unitType))
                 issues = issues.Where(w => w.UnitType.Contains(unitType)).ToList();
             if (!string.IsNullOrEmpty(accountingUnit))
@@ -993,7 +994,7 @@ public ApiResponse IssueStatistics(int allotId, int userid, string realName, str
                 List<per_attendance_issue> updateIssuedates = new List<per_attendance_issue>();
                 foreach (var item in updateIssues)
                 {
-                    var issuePersonnel = issues.FirstOrDefault(w => w.PersonnelNumber == item.PersonnelNumber&&w.Code==item.Code);
+                    var issuePersonnel = issues.FirstOrDefault(w => w.PersonnelNumber == item.PersonnelNumber && w.Code == item.Code);
                     issuePersonnel.UnitType = item.UnitType;
                     issuePersonnel.AccountingUnit = item.AccountingUnit;
                     issuePersonnel.Code = item.Code;