Skip to content

P
performance
Commit 4882c1d5 by wyc
Options

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

parent b130668a
Showing with 34 additions and 34 deletions
performance/Performance.Api/Controllers/AttendanceController.cs
......@@ -117,9 +117,9 @@ public ApiResponse AttendanceAdd(int allotId, int hospitalId, AttendanceData req
/// <param name="request"></param>
/// <returns></returns>
[HttpPost("CallIn/Update")]
public ApiResponse AttendanceUpdate(int allotId, int hospitalId, AttendanceUpdateData request)
public ApiResponse AttendanceUpdate(int allotId, AttendanceUpdateData request)
{
return _attendanceService.AttendanceUpdate(allotId, hospitalId, request);
return _attendanceService.AttendanceUpdate(allotId, request);
}
/// <summary>
/// 考勤-调动记录表（删除）
......@@ -129,9 +129,9 @@ public ApiResponse AttendanceUpdate(int allotId, int hospitalId, AttendanceUpdat
/// <param name="attendanceId"></param>
/// <returns></returns>
[HttpPost("CallIn/Delete")]
public ApiResponse AttendanceDelete(int allotId, int hospitalId, int attendanceId)
public ApiResponse AttendanceDelete(int attendanceId)
{
return _attendanceService.AttendanceDelete(allotId, hospitalId, attendanceId);
return _attendanceService.AttendanceDelete(attendanceId);
}
......@@ -142,9 +142,9 @@ public ApiResponse AttendanceDelete(int allotId, int hospitalId, int attendanceI
/// <param name="hospitalId"></param>
/// <returns></returns>
[HttpPost("CallIn/ClearAll")]
public ApiResponse AttendanceClearAll(int allotId, int hospitalId)
public ApiResponse AttendanceClearAll(int allotId)
{
return _attendanceService.AttendanceClearAll(allotId, hospitalId);
return _attendanceService.AttendanceClearAll(allotId);
}
#endregion
......@@ -256,9 +256,9 @@ public ApiResponse AttendanceVacationAdd(int allotId, int hospitalId, Attendance
/// <param name="request"></param>
/// <returns></returns>
[HttpPost("Vacation/Update")]
public ApiResponse AttendanceVacationUpdate(int allotId, int hospitalId, AttendanceVacationUpdateData request)
public ApiResponse AttendanceVacationUpdate(int allotId, AttendanceVacationUpdateData request)
{
return _attendanceService.AttendanceVacationUpdate(allotId, hospitalId, request);
return _attendanceService.AttendanceVacationUpdate(allotId, request);
}
/// <summary>
/// 考勤-考勤记录表（删除）
......@@ -268,9 +268,9 @@ public ApiResponse AttendanceVacationUpdate(int allotId, int hospitalId, Attenda
/// <param name="attendanceId"></param>
/// <returns></returns>
[HttpPost("Vacation/Delete")]
public ApiResponse AttendanceVacationDelete(int allotId, int hospitalId, int attendanceId)
public ApiResponse AttendanceVacationDelete(int attendanceId)
{
return _attendanceService.AttendanceVacationDelete(allotId, hospitalId, attendanceId);
return _attendanceService.AttendanceVacationDelete(attendanceId);
}
......@@ -281,9 +281,9 @@ public ApiResponse AttendanceVacationDelete(int allotId, int hospitalId, int att
/// <param name="hospitalId"></param>
/// <returns></returns>
[HttpPost("Vacation/ClearAll")]
public ApiResponse AttendanceVacationClearAll(int allotId, int hospitalId)
public ApiResponse AttendanceVacationClearAll(int allotId)
{
return _attendanceService.AttendanceVacationClearAll(allotId, hospitalId);
return _attendanceService.AttendanceVacationClearAll(allotId);
}
#endregion
......
performance/Performance.Api/wwwroot/Performance.Api.xml
......@@ -333,7 +333,7 @@
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.AttendanceController.AttendanceUpdate(System.Int32,System.Int32,Performance.DtoModels.Response.AttendanceUpdateData)">
<member name="M:Performance.Api.Controllers.AttendanceController.AttendanceUpdate(System.Int32,Performance.DtoModels.Response.AttendanceUpdateData)">
<summary>
考勤-调动记录表（修改）
</summary>
......@@ -342,7 +342,7 @@
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.AttendanceController.AttendanceDelete(System.Int32,System.Int32,System.Int32)">
<member name="M:Performance.Api.Controllers.AttendanceController.AttendanceDelete(System.Int32)">
<summary>
考勤-调动记录表（删除）
</summary>
......@@ -351,7 +351,7 @@
<param name="attendanceId"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.AttendanceController.AttendanceClearAll(System.Int32,System.Int32)">
<member name="M:Performance.Api.Controllers.AttendanceController.AttendanceClearAll(System.Int32)">
<summary>
考勤-调动记录表（全部删除）
</summary>
......@@ -415,7 +415,7 @@
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.AttendanceController.AttendanceVacationUpdate(System.Int32,System.Int32,Performance.DtoModels.Response.AttendanceVacationUpdateData)">
<member name="M:Performance.Api.Controllers.AttendanceController.AttendanceVacationUpdate(System.Int32,Performance.DtoModels.Response.AttendanceVacationUpdateData)">
<summary>
考勤-考勤记录表（修改）
</summary>
......@@ -424,7 +424,7 @@
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.AttendanceController.AttendanceVacationDelete(System.Int32,System.Int32,System.Int32)">
<member name="M:Performance.Api.Controllers.AttendanceController.AttendanceVacationDelete(System.Int32)">
<summary>
考勤-考勤记录表（删除）
</summary>
......@@ -433,7 +433,7 @@
<param name="attendanceId"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.AttendanceController.AttendanceVacationClearAll(System.Int32,System.Int32)">
<member name="M:Performance.Api.Controllers.AttendanceController.AttendanceVacationClearAll(System.Int32)">
<summary>
考勤-考勤记录表（全部删除）
</summary>
......
performance/Performance.Services/AttendanceService.cs
......@@ -347,29 +347,29 @@ public ApiResponse AttendanceAdd(int allotId, int hospitalId, AttendanceData req
return new ApiResponse(ResponseType.OK);
}
public ApiResponse AttendanceUpdate(int allotId, int hospitalId, AttendanceUpdateData request)
public ApiResponse AttendanceUpdate(int allotId, AttendanceUpdateData request)
{
var data = perforPerAttendanceRepository.GetEntity(w => w.Id == request.AttendanceId && w.AllotId == allotId && w.HospitalId == hospitalId);
if (data==null) throw new PerformanceException("当前调动记录不存在");
var data = perforPerAttendanceRepository.GetEntity(w => w.Id == request.AttendanceId && w.AllotId == allotId);
if (data == null) throw new PerformanceException("当前调动记录不存在");
data.PermanentStaff = request.PermanentStaff;
data.CallInUnitType = request.CallInUnitType;
data.CallInAccountingUnit=request.CallInAccountingUnit;
data.CallInAccountingUnit = request.CallInAccountingUnit;
data.CallInDate = request.CallInDate;
perforPerAttendanceRepository.Update(data);
return new ApiResponse(ResponseType.OK);
}
public ApiResponse AttendanceDelete(int allotId, int hospitalId, int attendanceId)
public ApiResponse AttendanceDelete(int attendanceId)
{
var data = perforPerAttendanceRepository.GetEntity(w => w.Id == attendanceId && w.AllotId == allotId && w.HospitalId == hospitalId);
var data = perforPerAttendanceRepository.GetEntity(w => w.Id == attendanceId);
perforPerAttendanceRepository.Remove(data);
return new ApiResponse(ResponseType.OK);
}
public ApiResponse AttendanceClearAll(int allotId, int hospitalId)
public ApiResponse AttendanceClearAll(int allotId)
{
var data = perforPerAttendanceRepository.GetEntities(w => w.AllotId == allotId && w.HospitalId == hospitalId);
var data = perforPerAttendanceRepository.GetEntities(w => w.AllotId == allotId);
perforPerAttendanceRepository.RemoveRange(data.ToArray());
return new ApiResponse(ResponseType.OK);
}
......@@ -712,28 +712,28 @@ public ApiResponse AttendanceVacationAdd(int allotId, int hospitalId, Attendance
return new ApiResponse(ResponseType.OK);
}
public ApiResponse AttendanceVacationUpdate(int allotId, int hospitalId, AttendanceVacationUpdateData request)
public ApiResponse AttendanceVacationUpdate(int allotId, AttendanceVacationUpdateData request)
{
var data = perfoPperAttendanceVacationeRepository.GetEntity(w => w.Id == request.AttendanceVacationId && w.AllotId == allotId && w.HospitalId == hospitalId);
var data = perfoPperAttendanceVacationeRepository.GetEntity(w => w.Id == request.AttendanceVacationId && w.AllotId == allotId);
if (data == null) throw new PerformanceException("当前调动记录不存在");
data.TypeId = request.TypeId;
data.BegDate=request.BegDate;
data.EndDate=request.EndDate;
data.BegDate = request.BegDate;
data.EndDate = request.EndDate;
perfoPperAttendanceVacationeRepository.Update(data);
return new ApiResponse(ResponseType.OK);
}
public ApiResponse AttendanceVacationDelete(int allotId, int hospitalId, int AttendanceVacationId)
public ApiResponse AttendanceVacationDelete(int AttendanceVacationId)
{
var data = perfoPperAttendanceVacationeRepository.GetEntity(w => w.Id == AttendanceVacationId && w.AllotId == allotId && w.HospitalId == hospitalId);
var data = perfoPperAttendanceVacationeRepository.GetEntity(w => w.Id == AttendanceVacationId);
perfoPperAttendanceVacationeRepository.Remove(data);
return new ApiResponse(ResponseType.OK);
}
public ApiResponse AttendanceVacationClearAll(int allotId, int hospitalId)
public ApiResponse AttendanceVacationClearAll(int allotId)
{
var data = perfoPperAttendanceVacationeRepository.GetEntities(w => w.AllotId == allotId && w.HospitalId == hospitalId);
var data = perfoPperAttendanceVacationeRepository.GetEntities(w => w.AllotId == allotId);
perfoPperAttendanceVacationeRepository.RemoveRange(data.ToArray());
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