|
|
@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
/// 根据条件查询盟主兑换机具券列表
|
|
|
/// </summary>
|
|
|
/// <returns></returns>
|
|
|
- public JsonResult IndexData(LeaderReserveRecord data, string UserIdMakerCode, string SourceMakerCode, string CreateDateData, int page = 1, int limit = 30)
|
|
|
+ public JsonResult IndexData(LeaderReserveRecord data, string UserIdMakerCode, string SourceMakerCode, string RemarkSelect, string CreateDateData, int page = 1, int limit = 30)
|
|
|
{
|
|
|
|
|
|
Dictionary<string, string> Fields = new Dictionary<string, string>();
|
|
|
@@ -70,6 +70,11 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
condition += " and SourceUserId in (select UserId from UserForMakerCode where MakerCode='" + SourceMakerCode + "')";
|
|
|
}
|
|
|
+ //变动类型
|
|
|
+ if (!string.IsNullOrEmpty(RemarkSelect))
|
|
|
+ {
|
|
|
+ condition += " and Remark='" + RemarkSelect + "'";
|
|
|
+ }
|
|
|
//创建时间
|
|
|
if (!string.IsNullOrEmpty(CreateDateData))
|
|
|
{
|
DuGuYang