Commit d5cc6d40 by wyc

‘考勤下发’ 状态判断更改

parent e109d957
...@@ -408,7 +408,7 @@ public ApiResponse<List<AttendanceAuditDetail>> AuditDetail(int allotId, string ...@@ -408,7 +408,7 @@ public ApiResponse<List<AttendanceAuditDetail>> AuditDetail(int allotId, string
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[Route("issue/check")] [Route("issue/check")]
public ApiResponse<List<PerAttendanceIssueDto>> PreConfirmationDisplay(int allotId, string unitType, string accountingUnit, Attendance.State state) public ApiResponse<List<PerAttendanceIssueDto>> PreConfirmationDisplay(int allotId, string unitType, string accountingUnit, Attendance.OperationType state)
{ {
var userid = claim.GetUserId(); var userid = claim.GetUserId();
return _attendanceService.PreConfirmationDisplay(allotId, userid, unitType, accountingUnit,state); return _attendanceService.PreConfirmationDisplay(allotId, userid, unitType, accountingUnit,state);
......
...@@ -854,7 +854,7 @@ public ApiResponse<List<AttendanceAuditDetail>> AuditDetail(int allotId, string ...@@ -854,7 +854,7 @@ public ApiResponse<List<AttendanceAuditDetail>> AuditDetail(int allotId, string
return new ApiResponse<List<AttendanceAuditDetail>>(ResponseType.OK, items); return new ApiResponse<List<AttendanceAuditDetail>>(ResponseType.OK, items);
} }
public ApiResponse<List<PerAttendanceIssueDto>> PreConfirmationDisplay(int allotId, int userid, string unitType, string accountingUnit, Attendance.State state) public ApiResponse<List<PerAttendanceIssueDto>> PreConfirmationDisplay(int allotId, int userid, string unitType, string accountingUnit, Attendance.OperationType state)
{ {
var statistics = GetAttendanceStatistics(allotId, userid).Data; var statistics = GetAttendanceStatistics(allotId, userid).Data;
var issues = perforPerAttendanceIssueRepository.GetEntities(w => w.AllotId == allotId); var issues = perforPerAttendanceIssueRepository.GetEntities(w => w.AllotId == allotId);
...@@ -914,14 +914,14 @@ public ApiResponse<List<PerAttendanceIssueDto>> PreConfirmationDisplay(int allot ...@@ -914,14 +914,14 @@ public ApiResponse<List<PerAttendanceIssueDto>> PreConfirmationDisplay(int allot
issuedates = issuedates.Where(w => w.UnitType == unitType).ToList(); issuedates = issuedates.Where(w => w.UnitType == unitType).ToList();
if (!string.IsNullOrEmpty(accountingUnit)) if (!string.IsNullOrEmpty(accountingUnit))
issuedates = issuedates.Where(w => w.AccountingUnit == accountingUnit).ToList(); issuedates = issuedates.Where(w => w.AccountingUnit == accountingUnit).ToList();
if (state!=0) if ((int)state==(int)Attendance.OperationType.新增|| (int)state == (int)Attendance.OperationType.修改|| (int)state == (int)Attendance.OperationType.删除)
issuedates = issuedates.Where(w => w.OperationType == (int)state).ToList(); issuedates = issuedates.Where(w => w.OperationType == (int)state).ToList();
return new ApiResponse<List<PerAttendanceIssueDto>>(ResponseType.OK, issuedates); return new ApiResponse<List<PerAttendanceIssueDto>>(ResponseType.OK, issuedates);
} }
//下发 //下发
public ApiResponse IssueStatistics(int allotId, int userid, string realName, string unitType="", string accountingUnit="", Attendance.State state = 0) public ApiResponse IssueStatistics(int allotId, int userid, string realName, string unitType="", string accountingUnit="", Attendance.OperationType state = 0)
{ {
var allot = perforPerallotRepository.GetEntity(w => w.ID == allotId); var allot = perforPerallotRepository.GetEntity(w => w.ID == allotId);
if (allot == null) if (allot == null)
......
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