‘考勤类型’ 删除多余参数

performance/Performance.Api/Controllers/AttendanceController.cs

@@ -151,7 +151,7 @@ public ApiResponse AttendanceClearAll(int allotId)
         /// <param name="hospitalId"></param>
         /// <returns></returns>
         [HttpGet("Type/{allotId},{hospitalId}")]
-        public ApiResponse<List<per_attendance_type>> GetAttendanceType(int allotId, int hospitalId)
+        public ApiResponse<List<per_attendance_type>> GetAttendanceType(int allotId)
         {
             return _attendanceService.GetAttendanceType(allotId);
         }
@@ -163,10 +163,10 @@ public ApiResponse<List<per_attendance_type>> GetAttendanceType(int allotId, int
         /// <param name="attendanceType"></param>
         /// <returns></returns>
         [HttpPost("Type/Edit/{allotId},{hospitalId}")]
-        public ApiResponse<AttendanceType> InsertAttendanceType(int allotId, int hospitalId, AttendanceType attendanceType)
+        public ApiResponse<AttendanceType> InsertAttendanceType(int allotId, AttendanceType attendanceType)
         {
             // obj自己定义结构
-            return _attendanceService.InsertAttendanceType(allotId, hospitalId, attendanceType);
+            return _attendanceService.InsertAttendanceType(allotId, attendanceType);
         }
         /// <summary>
         /// 删除考勤类型

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

@@ -324,12 +324,11 @@
             <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.AttendanceController.AttendanceAdd(System.Int32,System.Int32,Performance.DtoModels.Response.AttendanceData)">
+        <member name="M:Performance.Api.Controllers.AttendanceController.AttendanceAdd(System.Int32,Performance.DtoModels.Response.AttendanceData)">
             <summary>
             考勤-调动记录表（添加）
             </summary>
             <param name="allotId"></param>
-            <param name="hospitalId"></param>
             <param name="request"></param>
             <returns></returns>
         </member>
@@ -338,7 +337,6 @@
             考勤-调动记录表（修改）
             </summary>
             <param name="allotId"></param>
-            <param name="hospitalId"></param>
             <param name="request"></param>
             <returns></returns>
         </member>
@@ -346,8 +344,6 @@
             <summary>
             考勤-调动记录表（删除）
             </summary>
-            <param name="allotId"></param>
-            <param name="hospitalId"></param>
             <param name="attendanceId"></param>
             <returns></returns>
         </member>
@@ -356,10 +352,9 @@
             考勤-调动记录表（全部删除）
             </summary>
             <param name="allotId"></param>
-            <param name="hospitalId"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.AttendanceController.GetAttendanceType(System.Int32,System.Int32)">
+        <member name="M:Performance.Api.Controllers.AttendanceController.GetAttendanceType(System.Int32)">
             <summary>
             查询绩效考勤类型
             </summary>
@@ -367,7 +362,7 @@
             <param name="hospitalId"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.AttendanceController.InsertAttendanceType(System.Int32,System.Int32,Performance.EntityModels.Other.AttendanceType)">
+        <member name="M:Performance.Api.Controllers.AttendanceController.InsertAttendanceType(System.Int32,Performance.EntityModels.Other.AttendanceType)">
             <summary>
             新增或修改考勤类型
             </summary>
@@ -406,12 +401,11 @@
             <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.AttendanceController.AttendanceVacationAdd(System.Int32,System.Int32,Performance.DtoModels.Response.AttendanceVacationData)">
+        <member name="M:Performance.Api.Controllers.AttendanceController.AttendanceVacationAdd(System.Int32,Performance.DtoModels.Response.AttendanceVacationData)">
             <summary>
             考勤-调动记录表（添加）
             </summary>
             <param name="allotId"></param>
-            <param name="hospitalId"></param>
             <param name="request"></param>
             <returns></returns>
         </member>
@@ -420,7 +414,6 @@
             考勤-考勤记录表（修改）
             </summary>
             <param name="allotId"></param>
-            <param name="hospitalId"></param>
             <param name="request"></param>
             <returns></returns>
         </member>
@@ -428,8 +421,6 @@
             <summary>
             考勤-考勤记录表（删除）
             </summary>
-            <param name="allotId"></param>
-            <param name="hospitalId"></param>
             <param name="attendanceId"></param>
             <returns></returns>
         </member>
@@ -438,7 +429,6 @@
             考勤-考勤记录表（全部删除）
             </summary>
             <param name="allotId"></param>
-            <param name="hospitalId"></param>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.AttendanceController.GetAttendanceStatistics(System.Int32)">

performance/Performance.Services/AttendanceService.cs

@@ -399,8 +399,12 @@ public ApiResponse<List<per_attendance_type>> GetAttendanceType(int allotId)
 
             }
         }
-        public ApiResponse<AttendanceType> InsertAttendanceType(int allotId, int hospitalId, AttendanceType attendanceType)
+        public ApiResponse<AttendanceType> InsertAttendanceType(int allotId, AttendanceType attendanceType)
         {
+            var allot = perforPerallotRepository.GetEntity(w => w.ID == allotId);
+            if (allot == null)
+                throw new PerformanceException("当前绩效记录不存在");
+
             var any = perfoPperAttendanceTypeRepository.GetEntities().FirstOrDefault(t => t.Id == attendanceType.Id);
             if (any != null)
             {
@@ -415,7 +419,7 @@ public ApiResponse<AttendanceType> InsertAttendanceType(int allotId, int hospita
                 per_attendance_type per_Attendance_Type = new per_attendance_type()
                 {
                     AllotId = allotId,
-                    HospitalId = hospitalId,
+                    HospitalId = allot.HospitalId,
                     AttendanceName = attendanceType.AttendanceName,
                     IsDeduction = Convert.ToInt32(attendanceType.IsDeduction)
                 };