Teams/kunshan-bzfm-mes-backend
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

增加分页

Browse Source
This commit is contained in:
qianhao.xu
2024-12-23 18:34:58 +08:00
parent 80cbe486fd
commit 9d22ec83eb
4 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
DOAN.Service/Mobile/ReportFlowService.cs
View File

@@ -1,9 +1,11 @@
using DOAN.Model;
using DOAN.Model.MES.base_;
using DOAN.Model.MES.base_.Dto;
using DOAN.Model.MES.product;
using DOAN.Model.Mobile.ReportFlow.Dto;
using DOAN.Model.Public;
using DOAN.Model.System;
using DOAN.Repository;
using DOAN.Service.Mobile.IService;
using DOAN.Service.Public.IPublicService;
using Infrastructure.Attribute;
@@ -195,21 +197,21 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
.ToList();
}
public List<ProReportWorkDetialDto> GetReportInfoByName(string Name)
public PagedInfo<ProReportWorkDetialDto> GetReportInfoByName(ProReportWorkDto2 query)
{
string NickName = Context.Queryable<SysUser>().Where(it => it.UserName == Name).Select(it => it.NickName).First();
Name = string.IsNullOrEmpty(NickName) ? Name + "|异常人员|" : NickName;
string NickName = Context.Queryable<SysUser>().Where(it => it.UserName == query.name).Select(it => it.NickName).First();
query.name = string.IsNullOrEmpty(NickName) ? query.name + "|异常人员|" : NickName;
return Context.Queryable<ProReportwork01>()
.LeftJoin<BaseWorkProcesses>((rw, wp) => rw.ProcessId == wp.Id)
.Where((rw, wp) => rw.Worker == Name && rw.JobDateTime >= DateTime.Today && rw.JobDateTime < DateTime.Today.AddDays(1))
.OrderBy(rw => rw.ProcessId)
.Select((rw, wp) => new ProReportWorkDetialDto()
{
ProcessName = wp.Name,
}, true)
.ToList();
.LeftJoin<BaseWorkProcesses>((rw, wp) => rw.ProcessId == wp.Id)
.Where((rw, wp) => rw.Worker == query.name && rw.JobDateTime >= DateTime.Today && rw.JobDateTime < DateTime.Today.AddDays(1))
.OrderBy(rw => rw.ProcessId)
.Select((rw, wp) => new ProReportWorkDetialDto()
{
ProcessName = wp.Name,
}, true)
.ToPage_NO_Convert(query);
}
@@ -225,17 +227,17 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
}
public List<ProReportWorkDetialDto> GetReportByProcessId(int processId)
public PagedInfo<ProReportWorkDetialDto> GetReportByProcessId(ProReportWorkDto3 query)
{
return Context.Queryable<ProReportwork01>()
.LeftJoin<BaseWorkProcesses>((rw, wp) => rw.ProcessId == wp.Id)
.Where((rw, wp) => rw.ProcessId == processId && rw.JobDateTime >= DateTime.Today && rw.JobDateTime < DateTime.Today.AddDays(1))
.Where((rw, wp) => rw.ProcessId == query.processId && rw.JobDateTime >= DateTime.Today && rw.JobDateTime < DateTime.Today.AddDays(1))
.OrderBy(rw => rw.ProcessId)
.Select((rw, wp) => new ProReportWorkDetialDto()
{
ProcessName = wp.Name,
}, true)
.ToList();
.ToPage_NO_Convert(query);
}
}