‘考勤下发’ 最终考勤结果下发(预确认显示)添加搜索

performance/Performance.Api/Controllers/AttendanceController.cs

@@ -384,9 +384,9 @@ public ApiResponse<List<AttendanceAuditList>> AuditList(int allotId)
         /// <summary>
         /// 科室确认详情(已下发结果展示列表)
         /// </summary>
-        /// <param name="allotId"></param>
-        /// <param name="unitType"></param>
-        /// <param name="accountingUnit"></param>
+        /// <param name="allotId">绩效Id</param>
+        /// <param name="unitType"> 人员类别</param>
+        /// <param name="accountingUnit">核算单元</param>
         /// <returns></returns>
         [HttpPost]
         [Route("issue/audit/detail")]
@@ -401,14 +401,17 @@ public ApiResponse<List<AttendanceAuditDetail>> AuditDetail(int allotId, string
          /// <summary>
          /// 最终考勤结果下发(预确认显示)
          /// </summary>
-        /// <param name="allotId"></param>
+         /// <param name="allotId">绩效Id</param>
+         /// <param name="unitType">人员类别</param>
+         /// <param name="accountingUnit">核算单元</param>
+         /// <param name="state"> 操作类型 新增 = 1, 修改 = 2, 删除 = 3,</param>
          /// <returns></returns>
         [HttpPost]
         [Route("issue/check")]
-        public ApiResponse<List<PerAttendanceIssueDto>> PreConfirmationDisplay(int allotId)
+        public ApiResponse<List<PerAttendanceIssueDto>> PreConfirmationDisplay(int allotId, string unitType, string accountingUnit, Attendance.State state)
         {
             var userid = claim.GetUserId();
-            return _attendanceService.PreConfirmationDisplay(allotId, userid);
+            return _attendanceService.PreConfirmationDisplay(allotId, userid, unitType, accountingUnit,state);
         }
 
         /// <summary>
@@ -429,12 +432,12 @@ public ApiResponse IssueStatistics(int allotId)
         /// 最终考勤结果驳回或确认无误((批量操作)
         /// </summary>
         /// <param name="allotId"></param>
-        /// <param name="issueid"></param>
+        /// <param name="issueid">选择id</param>
         /// <param name="state">操作类型 确认 = 2,驳回 = 3,</param>
         /// <returns></returns>
         [HttpPost]
         [Route("issue/choose")]
-        public ApiResponse ChooseStatistics(int allotId, int[] issueid, Attendance.State state,string remarks)
+        public ApiResponse ChooseStatistics(int allotId, int[] issueid, Attendance.State state, string remarks)
         {
             var realName = claim.GetUserClaim(JwtClaimTypes.RealName);
             return _attendanceService.ChooseStatistics(allotId, issueid, state, realName, remarks);

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

@@ -424,16 +424,18 @@
             <summary>
             科室确认详情(已下发结果展示列表)
             </summary>
-            <param name="allotId"></param>
-            <param name="unitType"></param>
-            <param name="accountingUnit"></param>
+            <param name="allotId">绩效Id</param>
+            <param name="unitType"> 人员类别</param>
+            <param name="accountingUnit">核算单元</param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.AttendanceController.PreConfirmationDisplay(System.Int32)">
+        <member name="M:Performance.Api.Controllers.AttendanceController.PreConfirmationDisplay(System.Int32,System.String,System.String,Performance.DtoModels.Attendance.State)">
             <summary>
             最终考勤结果下发(预确认显示)
             </summary>
-            <param name="allotId"></param>
+            <param name="allotId">绩效Id</param>
+            <param name="unitType"> 人员类别</param>
+            <param name="accountingUnit">核算单元</param>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.AttendanceController.IssueStatistics(System.Int32)">
@@ -448,7 +450,7 @@
             最终考勤结果驳回或确认无误((批量操作)
             </summary>
             <param name="allotId"></param>
-            <param name="issueid"></param>
+            <param name="issueid">选择id</param>
             <param name="state">操作类型 确认 = 2,驳回 = 3,</param>
             <returns></returns>
         </member>

performance/Performance.Services/AttendanceService.cs

@@ -793,7 +793,7 @@ 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,string aaa = "")
         {
             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>();
@@ -854,7 +854,7 @@ public ApiResponse<List<AttendanceAuditDetail>> AuditDetail(int allotId, string
             return new ApiResponse<List<AttendanceAuditDetail>>(ResponseType.OK, items);
         }
 
-        public ApiResponse<List<PerAttendanceIssueDto>> PreConfirmationDisplay(int allotId, int userid)
+        public ApiResponse<List<PerAttendanceIssueDto>> PreConfirmationDisplay(int allotId, int userid, string unitType, string accountingUnit, Attendance.State state)
         {
             var statistics = GetAttendanceStatistics(allotId, userid).Data;
             var issues = perforPerAttendanceIssueRepository.GetEntities(w => w.AllotId == allotId);
@@ -909,18 +909,25 @@ public ApiResponse<List<PerAttendanceIssueDto>> PreConfirmationDisplay(int allot
                 foreach (var report in scStatistics)
                     issuedates.Add(new PerAttendanceIssueDto(report));
             }
+
+            if (!string.IsNullOrEmpty(unitType))
+                issuedates = issuedates.Where(w => w.UnitType == unitType).ToList();
+            if (!string.IsNullOrEmpty(accountingUnit))
+                issuedates = issuedates.Where(w => w.AccountingUnit == accountingUnit).ToList();
+            if (state!=0)
+                issuedates = issuedates.Where(w => w.OperationType == (int)state).ToList();
             return new ApiResponse<List<PerAttendanceIssueDto>>(ResponseType.OK, issuedates);
         }
 
 
         //下发
-        public ApiResponse IssueStatistics(int allotId, int userid, string realName)
+        public ApiResponse IssueStatistics(int allotId, int userid, string realName, string unitType="", string accountingUnit="", Attendance.State state = 0)
         {
             var allot = perforPerallotRepository.GetEntity(w => w.ID == allotId);
             if (allot == null)
                 throw new PerformanceException("当前绩效记录不存在");
 
-            var preConfirmationDisplay = PreConfirmationDisplay(allotId, userid).Data;
+            var preConfirmationDisplay = PreConfirmationDisplay(allotId, userid, unitType, accountingUnit, state).Data;
             var issues = perforPerAttendanceIssueRepository.GetEntities(w => w.AllotId == allotId);
             var cofaccounting = cofaccountingRepository.GetEntities(g => g.AllotId == allotId);
             var insertIssues = preConfirmationDisplay.Where(w => w.OperationType == (int)Attendance.OperationType.新增).ToList();