Browse Source

修改为以发布日期为准筛选

master
feng 3 years ago
parent
commit
50cd7806a0
  1. 8
      src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs
  2. 2
      src/Coldairarrow.Entity/DTO/TaskInfoDto.cs
  3. 4
      客户端/齐越慧眼/齐越慧眼/ApiHelper.cs
  4. 2
      客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js
  5. 2
      客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js.map

8
src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs

@ -365,7 +365,8 @@ namespace Coldairarrow.Business.HuiYan
TeamDate = b.CreateTime,
TeamOverDate = b.UpdateDate,
PriceTaskUserId = b.PriceTaskUserId,
TeamItemState = (TeamItemState?)b.State
TeamItemState = (TeamItemState?)b.State,
PriceTaskCreateDate=b.PriceTaskCreateDate
};
select = select.BuildExtendSelectExpre();
@ -377,7 +378,10 @@ namespace Coldairarrow.Business.HuiYan
select @select.Invoke(b, a);
var where = LinqHelper.True<TaskInfoDto>();
where = where.And(c => c.CreateTime >= start && c.CreateTime <= end);
start=new DateTime(start.Year, start.Month, start.Day);
end = new DateTime(end.Year, end.Month, end.Day, 23, 59, 59);
where = where.And(c => c.PriceTaskCreateDate >= start && c.PriceTaskCreateDate <= end);
var list = q.Where(where).ToList();

2
src/Coldairarrow.Entity/DTO/TaskInfoDto.cs

@ -29,6 +29,8 @@ namespace Coldairarrow.Entity.DTO
public string TeamName { get; set; }
public string UserName { get; set; }
public DateTime? PriceTaskCreateDate { get; set; }
}

4
客户端/齐越慧眼/齐越慧眼/ApiHelper.cs

@ -12,8 +12,8 @@ namespace 齐越慧眼
{
public class ApiHelper
{
public static string ApiBase { get; set; } = "http://111.230.132.27:8033";
// public static string ApiBase { get; set; } = "http://hyapi.qiyue666.com";
//public static string ApiBase { get; set; } = "http://111.230.132.27:8033";
public static string ApiBase { get; set; } = "http://hyapi.qiyue666.com";
public static UserInfo LoginSystemUser { get; set; }

2
客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js

File diff suppressed because one or more lines are too long

2
客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js.map

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save