Commit 7e8d8d22 by ruyun.zhang

科室确认不用勾选也可以全部确认

parent 5787d30b
...@@ -579,8 +579,9 @@ public ApiResponse IssueStatistics(int allotId) ...@@ -579,8 +579,9 @@ public ApiResponse IssueStatistics(int allotId)
[Route("issue/choose")] [Route("issue/choose")]
public ApiResponse ChooseStatistics(AttendanceIssueChoose attendanceIssueChoose) public ApiResponse ChooseStatistics(AttendanceIssueChoose attendanceIssueChoose)
{ {
var userid = claim.GetUserId();
var realName = claim.GetUserClaim(JwtClaimTypes.RealName); var realName = claim.GetUserClaim(JwtClaimTypes.RealName);
return _attendanceService.ChooseStatistics(attendanceIssueChoose, realName); return _attendanceService.ChooseStatistics(attendanceIssueChoose, userid, realName);
} }
#endregion #endregion
} }
......
...@@ -1195,9 +1195,21 @@ public ApiResponse IssueStatistics(int allotId, int userid, string realName, str ...@@ -1195,9 +1195,21 @@ public ApiResponse IssueStatistics(int allotId, int userid, string realName, str
return new ApiResponse(ResponseType.OK, "下发成功"); return new ApiResponse(ResponseType.OK, "下发成功");
} }
// 最终考勤结果驳回或确认无误((批量操作) // 最终考勤结果驳回或确认无误((批量操作)
public ApiResponse ChooseStatistics(AttendanceIssueChoose attendanceIssueChoose, string realName) public ApiResponse ChooseStatistics(AttendanceIssueChoose attendanceIssueChoose, int userid, string realName)
{ {
var issuedates = perforPerAttendanceIssueRepository.GetEntities(w => w.AllotId == attendanceIssueChoose.AllotId && attendanceIssueChoose.Issueid.Contains(w.Id)).ToList(); var issuedates = perforPerAttendanceIssueRepository.GetEntities(w => w.AllotId == attendanceIssueChoose.AllotId).ToList();
if (attendanceIssueChoose.Issueid?.Any() == true)
issuedates = issuedates.Where(w => attendanceIssueChoose.Issueid.Contains(w.Id)).ToList();
//当角色对应时过滤
var userInfo = _userRepository.GetUser(userid);
if (userInfo?.User == null) throw new NotImplementedException("当前用户不存在");
if (userInfo?.URole == null) throw new NotImplementedException("当前用户暂未分配角色");
var unitTypes = UnitTypeUtil.GetMaps(userInfo?.URole.Type ?? 0);
if (unitTypes?.Any() == true)
issuedates = issuedates.Where(w => w.AccountingUnit == userInfo.User.Department && UnitTypeUtil.Is(w.UnitType, unitTypes)).ToList();
foreach (var item in issuedates) foreach (var item in issuedates)
{ {
item.State = (int)attendanceIssueChoose.state; item.State = (int)attendanceIssueChoose.state;
......
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