‘考勤下发’修改注释\修改筛选方法初始值

performance/Performance.Api/Controllers/AttendanceController.cs

@@ -148,9 +148,8 @@ public ApiResponse AttendanceClearAll(int allotId)
         /// 查询绩效考勤类型
         /// </summary>
         /// <param name="allotId"></param>
-        /// <param name="hospitalId"></param>
         /// <returns></returns>
-        [HttpGet("Type/{allotId},{hospitalId}")]
+        [HttpGet("Type/{allotId}")]
         public ApiResponse<List<per_attendance_type>> GetAttendanceType(int allotId)
         {
             return _attendanceService.GetAttendanceType(allotId);
@@ -159,10 +158,9 @@ public ApiResponse<List<per_attendance_type>> GetAttendanceType(int allotId)
         /// 新增或修改考勤类型
         /// </summary>
         /// <param name="allotId"></param>
-        /// <param name="hospitalId"></param>
         /// <param name="attendanceType"></param>
         /// <returns></returns>
-        [HttpPost("Type/Edit/{allotId},{hospitalId}")]
+        [HttpPost("Type/Edit/{allotId}")]
         public ApiResponse<AttendanceType> InsertAttendanceType(int allotId, AttendanceType attendanceType)
         {
             // obj自己定义结构
@@ -510,7 +508,6 @@ public IActionResult DownloadAuditDetail(int allotId, string unitType, string ac
         #endregion
 
         #region 最终考勤结果
-
         /// <summary>
         /// 科室确认列表
         /// </summary>
@@ -527,14 +524,13 @@ public ApiResponse<List<AttendanceAuditList>> AuditList(int allotId, string unit
             return _attendanceService.AuditList(allotId, unitType, accountingUnit, state);
         }
 
-
-
         /// <summary>
         /// 科室确认详情(已下发结果展示列表)
         /// </summary>
         /// <param name="allotId">绩效Id</param>
         /// <param name="unitType"> 人员类别</param>
         /// <param name="accountingUnit">核算单元</param>
+        /// <param name="searchTxet">搜索文本框（姓名\工号）</param>
         /// <returns></returns>
         [HttpPost]
         [Route("issue/audit/detail")]
@@ -574,7 +570,6 @@ public ApiResponse IssueStatistics(int allotId)
             return _attendanceService.IssueStatistics(allotId, userid, realName);
         }
 
-
         /// <summary>
         /// 最终考勤结果驳回或确认无误((批量操作)
         /// </summary>
@@ -587,23 +582,6 @@ public ApiResponse ChooseStatistics(AttendanceIssueChoose attendanceIssueChoose)
             var realName = claim.GetUserClaim(JwtClaimTypes.RealName);
             return _attendanceService.ChooseStatistics(attendanceIssueChoose, realName);
         }
-
-
-
-        ///// <summary>
-        ///// 最终考勤结果驳回或确认无误((批量操作)
-        ///// </summary>
-        ///// <param name="allotId"></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)
-        //{
-        //    var realName = claim.GetUserClaim(JwtClaimTypes.RealName);
-        //    return _attendanceService.ChooseStatistics(allotId, issueid, state, realName, remarks);
-        //}
         #endregion
     }
 }
\ No newline at end of file

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

@@ -359,7 +359,6 @@
             查询绩效考勤类型
             </summary>
             <param name="allotId"></param>
-            <param name="hospitalId"></param>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.AttendanceController.InsertAttendanceType(System.Int32,Performance.EntityModels.Other.AttendanceType)">
@@ -367,7 +366,6 @@
             新增或修改考勤类型
             </summary>
             <param name="allotId"></param>
-            <param name="hospitalId"></param>
             <param name="attendanceType"></param>
             <returns></returns>
         </member>
@@ -485,6 +483,7 @@
             <param name="allotId">绩效Id</param>
             <param name="unitType"> 人员类别</param>
             <param name="accountingUnit">核算单元</param>
+            <param name="searchTxet">搜索文本框（姓名\工号）</param>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.AttendanceController.PreConfirmationDisplay(System.Int32,System.String,System.String,Performance.DtoModels.Attendance.OperationType)">

performance/Performance.Services/AttendanceService.cs

@@ -757,8 +757,12 @@ public ApiResponse AttendanceBatch(int allotId, int hospitalId, SaveCollectData
         public ApiResponse AttendanceVacationAdd(int allotId, AttendanceVacationData request)
         {
             var allot = perforPerallotRepository.GetEntity(w => w.ID == allotId);
+            //DateTime dt = new DateTime(allot.Year, allot.Month, 1);
             if (allot == null)
                 throw new PerformanceException("当前绩效记录不存在");
+            //if (request.EndDate < request.BegDate)
+            //    throw new PerformanceException("开始时间不能大于结束时间");
+
             var data = mapper.Map<per_attendance_vacation>(request);
             data.AllotId = allotId;
             data.HospitalId = allot.HospitalId;
@@ -950,7 +954,7 @@ public ApiResponse<List<AttendanceAuditDetail>> AuditDetail(int allotId, string
             var permissionUnitTypes = UnitTypeUtil.GetMaps(userInfo?.URole.Type ?? 0);
             if (permissionUnitTypes?.Any() == true)
             {
-                accountingUnit = userInfo.User.Department;
+                queryAccountingUnit = userInfo.User.Department;
                 queryUnitTypes.AddRange(permissionUnitTypes);
             }
             else if (!string.IsNullOrEmpty(unitType))
@@ -969,6 +973,9 @@ public ApiResponse<List<AttendanceAuditDetail>> AuditDetail(int allotId, string
                 items.Add(item);
 
                 var dic = new RouteValueDictionary(isu);
+                dic.TryGetValue(nameof(per_attendance_issue.Id), out object attendanceIsueId);
+                item.AttendanceIsueId = ConvertHelper.To(attendanceIsueId, 0);
+
                 foreach (var dicItem in dic.Where(w => !names.Any(name => name.Equals(w.Key, StringComparison.OrdinalIgnoreCase))))
                 {
                     item.Detial.Add(new AttendanceAuditDetails { Title = dicItem.Key, Remark = dicItem.Key, Value = dicItem.Value });