RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

计算排班工时

Browse Source
This commit is contained in:
chenlin 2026-01-30 10:50:16 +08:00
parent 195db55209
commit b40be1c7f9
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
DOAN.Service/MES/group/GroupScheduleService.cs
View File

@ -97,13 +97,17 @@ namespace DOAN.Service.Business
public PagedInfo<GroupScheduleDto> ListGroupByDate(GroupScheduleQueryDto2 query)
{
query.ScheduleDate = query.ScheduleDate.Date;
var result= Queryable().LeftJoin<GroupShift>((it, sh) => it.FkShift == sh.Id).Where((it, sh) => it.ScheduleDate == query.ScheduleDate)
.Select((it, sh) => new GroupScheduleDto { ShiftName = sh.Name }, true)
.ToPage<GroupScheduleDto, GroupScheduleDto>(query);
//var result= Queryable().LeftJoin<GroupShift>((it, sh) => it.FkShift == sh.Id).Where((it, sh) => it.ScheduleDate == query.ScheduleDate)
// .Select((it, sh) => new GroupScheduleDto { ShiftName = sh.Name }, true)
// .ToPage<GroupScheduleDto, GroupScheduleDto>(query);
var result = Queryable().Where((it) => it.ScheduleDate == query.ScheduleDate)
.Select((it) => new GroupScheduleDto { ShiftName = "" }, true)
.ToPage<GroupScheduleDto, GroupScheduleDto>(query);
result.Result.ForEach(t =>
{
t.WorkHours = Math.Round((decimal)(((t.EndTime.Value - t.StartTime.Value).TotalMinutes - t.PlanRestTime) / 60.0), 2);
t.WorkHours = Math.Round((decimal)(((t.EndTime - t.StartTime)?.TotalMinutes ?? 0 - t.PlanRestTime) / 60.0), 2);
});
return result;
}