Commit c23e0d4e by wyc

‘考勤管理’删除多余的参数

parent 47d6f28a
...@@ -101,19 +101,17 @@ public ApiResponse BatchCallIn(int allotId, int hospitalId, SaveCollectData requ ...@@ -101,19 +101,17 @@ public ApiResponse BatchCallIn(int allotId, int hospitalId, SaveCollectData requ
/// 考勤-调动记录表(添加) /// 考勤-调动记录表(添加)
/// </summary> /// </summary>
/// <param name="allotId"></param> /// <param name="allotId"></param>
/// <param name="hospitalId"></param>
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("CallIn/Add")] [HttpPost("CallIn/Add")]
public ApiResponse AttendanceAdd(int allotId, int hospitalId, AttendanceData request) public ApiResponse AttendanceAdd(int allotId, AttendanceData request)
{ {
return _attendanceService.AttendanceAdd(allotId, hospitalId, request); return _attendanceService.AttendanceAdd(allotId, request);
} }
/// <summary> /// <summary>
/// 考勤-调动记录表(修改) /// 考勤-调动记录表(修改)
/// </summary> /// </summary>
/// <param name="allotId"></param> /// <param name="allotId"></param>
/// <param name="hospitalId"></param>
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("CallIn/Update")] [HttpPost("CallIn/Update")]
...@@ -124,8 +122,6 @@ public ApiResponse AttendanceUpdate(int allotId, AttendanceUpdateData request) ...@@ -124,8 +122,6 @@ public ApiResponse AttendanceUpdate(int allotId, AttendanceUpdateData request)
/// <summary> /// <summary>
/// 考勤-调动记录表(删除) /// 考勤-调动记录表(删除)
/// </summary> /// </summary>
/// <param name="allotId"></param>
/// <param name="hospitalId"></param>
/// <param name="attendanceId"></param> /// <param name="attendanceId"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("CallIn/Delete")] [HttpPost("CallIn/Delete")]
...@@ -139,7 +135,6 @@ public ApiResponse AttendanceDelete(int attendanceId) ...@@ -139,7 +135,6 @@ public ApiResponse AttendanceDelete(int attendanceId)
/// 考勤-调动记录表(全部删除) /// 考勤-调动记录表(全部删除)
/// </summary> /// </summary>
/// <param name="allotId"></param> /// <param name="allotId"></param>
/// <param name="hospitalId"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("CallIn/ClearAll")] [HttpPost("CallIn/ClearAll")]
public ApiResponse AttendanceClearAll(int allotId) public ApiResponse AttendanceClearAll(int allotId)
...@@ -240,19 +235,17 @@ public ApiResponse AttendanceBatch(int allotId, int hospitalId, SaveCollectData ...@@ -240,19 +235,17 @@ public ApiResponse AttendanceBatch(int allotId, int hospitalId, SaveCollectData
/// 考勤-调动记录表(添加) /// 考勤-调动记录表(添加)
/// </summary> /// </summary>
/// <param name="allotId"></param> /// <param name="allotId"></param>
/// <param name="hospitalId"></param>
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("Vacation/Add")] [HttpPost("Vacation/Add")]
public ApiResponse AttendanceVacationAdd(int allotId, int hospitalId, AttendanceVacationData request) public ApiResponse AttendanceVacationAdd(int allotId, AttendanceVacationData request)
{ {
return _attendanceService.AttendanceVacationAdd(allotId, hospitalId, request); return _attendanceService.AttendanceVacationAdd(allotId, request);
} }
/// <summary> /// <summary>
/// 考勤-考勤记录表(修改) /// 考勤-考勤记录表(修改)
/// </summary> /// </summary>
/// <param name="allotId"></param> /// <param name="allotId"></param>
/// <param name="hospitalId"></param>
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("Vacation/Update")] [HttpPost("Vacation/Update")]
...@@ -263,8 +256,6 @@ public ApiResponse AttendanceVacationUpdate(int allotId, AttendanceVacationUpdat ...@@ -263,8 +256,6 @@ public ApiResponse AttendanceVacationUpdate(int allotId, AttendanceVacationUpdat
/// <summary> /// <summary>
/// 考勤-考勤记录表(删除) /// 考勤-考勤记录表(删除)
/// </summary> /// </summary>
/// <param name="allotId"></param>
/// <param name="hospitalId"></param>
/// <param name="attendanceId"></param> /// <param name="attendanceId"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("Vacation/Delete")] [HttpPost("Vacation/Delete")]
...@@ -278,7 +269,6 @@ public ApiResponse AttendanceVacationDelete(int attendanceId) ...@@ -278,7 +269,6 @@ public ApiResponse AttendanceVacationDelete(int attendanceId)
/// 考勤-考勤记录表(全部删除) /// 考勤-考勤记录表(全部删除)
/// </summary> /// </summary>
/// <param name="allotId"></param> /// <param name="allotId"></param>
/// <param name="hospitalId"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("Vacation/ClearAll")] [HttpPost("Vacation/ClearAll")]
public ApiResponse AttendanceVacationClearAll(int allotId) public ApiResponse AttendanceVacationClearAll(int allotId)
......
...@@ -345,11 +345,15 @@ public ApiResponse BatchCallIn(int allotId, int hospitalId, SaveCollectData requ ...@@ -345,11 +345,15 @@ public ApiResponse BatchCallIn(int allotId, int hospitalId, SaveCollectData requ
} }
public ApiResponse AttendanceAdd(int allotId, int hospitalId, AttendanceData request) public ApiResponse AttendanceAdd(int allotId, AttendanceData request)
{ {
var allot = perforPerallotRepository.GetEntity(w => w.ID == allotId);
if (allot == null)
throw new PerformanceException("当前绩效记录不存在");
var data = mapper.Map<per_attendance>(request); var data = mapper.Map<per_attendance>(request);
data.AllotId = allotId; data.AllotId = allotId;
data.HospitalId = hospitalId; data.HospitalId = allot.HospitalId;
perforPerAttendanceRepository.Add(data); perforPerAttendanceRepository.Add(data);
return new ApiResponse(ResponseType.OK); return new ApiResponse(ResponseType.OK);
} }
...@@ -710,11 +714,14 @@ public ApiResponse AttendanceBatch(int allotId, int hospitalId, SaveCollectData ...@@ -710,11 +714,14 @@ public ApiResponse AttendanceBatch(int allotId, int hospitalId, SaveCollectData
} }
public ApiResponse AttendanceVacationAdd(int allotId, int hospitalId, AttendanceVacationData request) public ApiResponse AttendanceVacationAdd(int allotId, AttendanceVacationData request)
{ {
var allot = perforPerallotRepository.GetEntity(w => w.ID == allotId);
if (allot == null)
throw new PerformanceException("当前绩效记录不存在");
var data = mapper.Map<per_attendance_vacation>(request); var data = mapper.Map<per_attendance_vacation>(request);
data.AllotId = allotId; data.AllotId = allotId;
data.HospitalId = hospitalId; data.HospitalId = allot.HospitalId;
perfoPperAttendanceVacationeRepository.Add(data); perfoPperAttendanceVacationeRepository.Add(data);
return new ApiResponse(ResponseType.OK); return new ApiResponse(ResponseType.OK);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment