修复接口,增加参数
This commit is contained in:
parent
4f79c39f31
commit
07aa1370e2
|
|
@ -1111,8 +1111,9 @@ namespace BLL
|
|||
{
|
||||
var query = from x in db.SitePerson_PersonInOut
|
||||
join y in db.SitePerson_Person on x.PersonId equals y.PersonId
|
||||
where x.ChangeTime >= filter.StartTime && x.ChangeTime <= filter.EndTime
|
||||
select new Model.PersonInOutItem
|
||||
join z in db.Base_Project on x.ProjectId equals z.ProjectId
|
||||
where x.ChangeTime >= filter.StartTime && x.ChangeTime <= filter.EndTime && z.ProjectName.Contains(filter.ProjectName)
|
||||
select new Model.PersonInOutItem
|
||||
{
|
||||
PersonId = x.PersonId,
|
||||
PersonName = y.PersonName,
|
||||
|
|
|
|||
|
|
@ -11,6 +11,10 @@ namespace Model
|
|||
/// </summary>
|
||||
public class PersonInOutRecordInput
|
||||
{
|
||||
/// <summary>
|
||||
/// 项目名称
|
||||
/// </summary>
|
||||
public string ProjectName { get; set; }
|
||||
/// <summary>
|
||||
/// 单位名称
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ namespace WebAPI.Controllers
|
|||
// 验证必填参数 ProjectName
|
||||
if (filter == null || string.IsNullOrEmpty(filter.ProjectName))
|
||||
{
|
||||
responeData.code = 2;
|
||||
responeData.code = 0;
|
||||
responeData.message = "ProjectName为必填参数!";
|
||||
return responeData;
|
||||
}
|
||||
|
|
@ -1061,18 +1061,23 @@ namespace WebAPI.Controllers
|
|||
// 验证必填参数
|
||||
if (filter == null || filter.StartTime == default(DateTime) || filter.EndTime == default(DateTime))
|
||||
{
|
||||
responeData.code = 2;
|
||||
responeData.code = 0;
|
||||
responeData.message = "StartTime和EndTime为必填参数!";
|
||||
return responeData;
|
||||
}
|
||||
|
||||
}
|
||||
// 验证时间范围
|
||||
if (filter.StartTime > filter.EndTime)
|
||||
{
|
||||
responeData.code = 2;
|
||||
responeData.code = 0;
|
||||
responeData.message = "StartTime不能大于EndTime!";
|
||||
return responeData;
|
||||
}
|
||||
if (filter == null || string.IsNullOrEmpty(filter.ProjectName))
|
||||
{
|
||||
responeData.code = 0;
|
||||
responeData.message = "ProjectName为必填参数!";
|
||||
return responeData;
|
||||
}
|
||||
|
||||
// 处理可空参数的默认值
|
||||
int actualPagesize = pagesize ?? 15;
|
||||
|
|
|
|||
Loading…
Reference in New Issue