‘考勤下发’科室确认列表修改

performance/Performance.DtoModels/Enum.cs

@@ -119,7 +119,7 @@ public enum Deduction
         }
         public enum State
         {
-            已下发未确认 = 1,
+            未确认 = 1,
             确认 = 2,
             驳回 = 3,
         }

performance/Performance.Services/AttendanceService.cs

@@ -776,14 +776,14 @@ public ApiResponse<List<AttendanceAuditList>> AuditList(int allotId)
                     Count = w.Count(),
                     ConfirmCount = w.Count(p => p.State == (int)Attendance.State.确认),
                     RejectCount = w.Count(p => p.State == (int)Attendance.State.驳回),
+                    OperationUser = w.OrderByDescending(o => o.UpdateTime).Select(s => s.UpdateUser).FirstOrDefault(),
+                    OperationTime = w.OrderByDescending(o => o.UpdateTime).Select(s => s.UpdateTime).FirstOrDefault(),
                 }).ToList();
 
 
             foreach (var item in items)
             {
-                item.OperationUser = issues.OrderByDescending(o => o.UpdateTime).Select(s => s.UpdateUser).FirstOrDefault();
-                item.OperationTime = issues.OrderByDescending(o => o.UpdateTime).Select(s => s.UpdateTime).FirstOrDefault();
-                item.StateRemark = "未全部确认";
+                item.StateRemark = "未确认";
                 if (item.RejectCount > 0)
                     item.StateRemark = "驳回";
                 else if (item.ConfirmCount == item.Count)
@@ -793,13 +793,13 @@ public ApiResponse<List<AttendanceAuditList>> AuditList(int allotId)
             return new ApiResponse<List<AttendanceAuditList>>(ResponseType.OK, items);
         }
 
-        public ApiResponse<List<AttendanceAuditDetail>> AuditDetail(int allotId, string unitType, string accountingUnit,int userid)
+        public ApiResponse<List<AttendanceAuditDetail>> AuditDetail(int allotId, string unitType, string accountingUnit, int userid)
         {
             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).ToList();
             if (!string.IsNullOrEmpty(unitType))
-                issues = issues.Where(w=>w.UnitType==unitType).ToList();
+                issues = issues.Where(w => w.UnitType == unitType).ToList();
             if (!string.IsNullOrEmpty(accountingUnit))
                 issues = issues.Where(w => w.AccountingUnit == accountingUnit).ToList();
             var items = issues.Select(w => new AttendanceAuditDetail
@@ -950,7 +950,7 @@ public ApiResponse IssueStatistics(int allotId, int userid, string realName)
                         CreateTime = DateTime.Now,
                         UpdateUser = realName,
                         UpdateTime = DateTime.Now,
-                        State = (int)Attendance.State.已下发未确认,
+                        State = (int)Attendance.State.未确认,
                     };
                 });
                 perforPerAttendanceIssueRepository.AddRange(inserts.ToArray());
@@ -971,7 +971,7 @@ public ApiResponse IssueStatistics(int allotId, int userid, string realName)
                     issuePersonnel.NoDeductionDays = item.NoDeductionDays;
                     issuePersonnel.AttendanceDays = item.AttendanceDays;
                     issuePersonnel.WorkFullDays = item.AttendanceDays + item.DeductionDays;
-                    issuePersonnel.State = (int)Attendance.State.已下发未确认;
+                    issuePersonnel.State = (int)Attendance.State.未确认;
                     issuePersonnel.UpdateUser = realName;
                     issuePersonnel.UpdateTime = DateTime.Now;
                     issuePersonnel.Remarks = "";
@@ -989,7 +989,7 @@ public ApiResponse IssueStatistics(int allotId, int userid, string realName)
             return new ApiResponse(ResponseType.OK, "下发成功");
         }
 
-        public ApiResponse ChooseStatistics(int allotId, int[] issueid, Attendance.State state, string realName,string remarks)
+        public ApiResponse ChooseStatistics(int allotId, int[] issueid, Attendance.State state, string realName, string remarks)
         {
             var issuedates = perforPerAttendanceIssueRepository.GetEntities(w => w.AllotId == allotId && issueid.Contains(w.Id)).ToList();
             foreach (var item in issuedates)