8
This commit is contained in:
parent
fcb54dfb5a
commit
d419bae3cb
@ -114,18 +114,18 @@ using(TestDbContext db=new TestDbContext()){
|
|||||||
}
|
}
|
||||||
using (TestDbContext db = new TestDbContext())
|
using (TestDbContext db = new TestDbContext())
|
||||||
{
|
{
|
||||||
var query = db.T_config.AsQueryable().Where(n => msg=="null" || n.msg.Contains(msg) || n.Title.Contains(msg) || n.Substance.Contains(msg));
|
var query = db.T_config.AsQueryable().Where(n => msg=="null" || n.msg==null || n.msg.Contains(msg) || n.Title.Contains(msg) || n.Substance.Contains(msg));
|
||||||
var TotalRecords = await query.CountAsync();
|
var TotalRecords = await query.CountAsync();
|
||||||
var config =await query
|
var config =await query
|
||||||
.Skip((page - 1) * limit)
|
.Skip((page - 1) * limit)
|
||||||
.Take(limit)
|
.Take(limit)
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
var result = new
|
var data = new
|
||||||
{
|
{
|
||||||
rows = config,
|
rows = config,
|
||||||
total = TotalRecords,
|
total = TotalRecords,
|
||||||
};
|
};
|
||||||
return Ok(new { code = 200, message = "", result });
|
return Ok(new { code = 200, message = "", data });
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
|
|
||||||
|
using AngleSharp.Dom;
|
||||||
using Manganese.Array;
|
using Manganese.Array;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
@ -54,5 +55,20 @@ namespace asg_form.Controllers
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
[Route("api/v2/repeatName/")]
|
||||||
|
[HttpGet]
|
||||||
|
public async Task<ActionResult<string>> rpName(string teamName, int eventId)
|
||||||
|
{
|
||||||
|
TestDbContext ctx = new TestDbContext();
|
||||||
|
bool isRepeat = ctx.Forms.Include(a => a.events).Any(a => a.team_name == teamName && a.events.Id == eventId);
|
||||||
|
if (isRepeat)
|
||||||
|
{
|
||||||
|
return Ok(new { code = 200, message = "不重复" ,data = true});
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return Ok(new { code = 200, message = "重复" ,data = false});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
@ -351,7 +351,7 @@ namespace asg_form.Controllers
|
|||||||
{
|
{
|
||||||
var query = db.team_Games.AsQueryable();
|
var query = db.team_Games.AsQueryable();
|
||||||
var total = query.Where(n => (belong == "null" || n.belong == belong) && (teamName1 == "null" || n.team1_name.Contains(teamName1)) && (teamName2 == "null" || n.team2_name.Contains(teamName2))).Count();
|
var total = query.Where(n => (belong == "null" || n.belong == belong) && (teamName1 == "null" || n.team1_name.Contains(teamName1)) && (teamName2 == "null" || n.team2_name.Contains(teamName2))).Count();
|
||||||
var row = await query
|
var rows = await query
|
||||||
.OrderByDescending(a => a.opentime)
|
.OrderByDescending(a => a.opentime)
|
||||||
.Where(n => (belong=="null" || n.belong==belong) && (teamName1=="null"||n.team1_name.Contains(teamName1)) && (teamName2 == "null" || n.team2_name.Contains(teamName2)))
|
.Where(n => (belong=="null" || n.belong==belong) && (teamName1=="null"||n.team1_name.Contains(teamName1)) && (teamName2 == "null" || n.team2_name.Contains(teamName2)))
|
||||||
.Skip((page - 1) * limit)
|
.Skip((page - 1) * limit)
|
||||||
@ -359,7 +359,7 @@ namespace asg_form.Controllers
|
|||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
var data = new
|
var data = new
|
||||||
{
|
{
|
||||||
row,
|
rows,
|
||||||
total,
|
total,
|
||||||
};
|
};
|
||||||
return Ok(new { code = 200, message = "", data });
|
return Ok(new { code = 200, message = "", data });
|
||||||
|
Loading…
x
Reference in New Issue
Block a user