Commit b6e20129 authored by 黄奎's avatar 黄奎

新增查询条件

parent 601527c5
......@@ -196,5 +196,10 @@ namespace Mall.Model.Extend.Education
/// 教育erp学生id
/// </summary>
public int EduStudentId { get; set; }
/// <summary>
/// 是否查询有封面图的活动
/// </summary>
public string IsQueryCoverImage { get; set; }
}
}
......@@ -55,7 +55,10 @@ WHERE 1=1
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Activity_Extend.ActivityType), query.ActivityType);
}
if (!string.IsNullOrEmpty(query.IsQueryCoverImage) && query.IsQueryCoverImage == "1")
{
builder.AppendFormat(" AND IFNULL(A.{0},'')<>'' ", nameof(RB_Education_Activity_Extend.CoverImg));
}
if (query.SelectIsEnd == 1)
{
builder.AppendFormat($" and DATE_FORMAT(a.{nameof(RB_Education_Activity_Extend.EndTime)},'%Y-%m-%d' )< DATE_FORMAT(NOW(),'%Y-%m-%d' ) ");
......@@ -75,7 +78,8 @@ WHERE 1=1
{
builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Education_Activity_Extend.StartTime));
}
else {
else
{
if (!string.IsNullOrWhiteSpace(query.OrderByStr))
{
builder.AppendFormat($" ORDER BY A.{query.OrderByStr} asc");
......@@ -85,6 +89,7 @@ WHERE 1=1
builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Education_Activity_Extend.Id));
}
}
}
return GetPage<RB_Education_Activity_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
}
......
......@@ -2474,6 +2474,7 @@ namespace Mall.WebApi.Controllers.Education
ActivityName = jObj.GetStringValue("ActivityName"),
ActivityType = jObj.GetInt("ActivityType", 0),
};
query.IsQueryCoverImage = "1";
query.SelectStartTimeStr = System.DateTime.Now.ToString("yyyy-MM-dd");
query.SelectEndTimeStr = System.DateTime.Now.AddDays(60).ToString("yyyy-MM-dd");
query.OrderByStr = "StartTime";
......
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