|
|
@@ -15,8 +15,8 @@ namespace molilian.api.Controllers
|
|
|
{
|
|
|
_accessor = accessor;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
[HttpPost]
|
|
|
public ActionResult list([FromBody] JsonElement form)
|
|
|
{
|
|
|
@@ -26,6 +26,7 @@ namespace molilian.api.Controllers
|
|
|
string sort = form.Read<string>("sort");
|
|
|
string order = form.Read<string>("order");
|
|
|
string name = form.Read<string>("keyword");
|
|
|
+ int tkStatus = form.Read("tkStatus", 0);
|
|
|
|
|
|
var time = form.PathReadArray<string>("query_date[]");
|
|
|
|
|
|
@@ -34,6 +35,11 @@ namespace molilian.api.Controllers
|
|
|
{
|
|
|
filter += $" AND accountId IN (SELECT ID FROM tk_pool WHERE company=@name)";
|
|
|
}
|
|
|
+ if (tkStatus > 0)
|
|
|
+ {
|
|
|
+ filter += $" AND tkStatus=@tkStatus";
|
|
|
+ }
|
|
|
+
|
|
|
DateTime stime = DateTime.MinValue, etime = DateTime.MinValue;
|
|
|
if (time.Count == 2)
|
|
|
{
|
|
|
@@ -57,7 +63,7 @@ namespace molilian.api.Controllers
|
|
|
}
|
|
|
|
|
|
var result = new DBContext.Table("tk_order_details")
|
|
|
- .Where(filter, new { name, stime, etime })
|
|
|
+ .Where(filter, new { name, stime, etime, tkStatus })
|
|
|
.Page(size, page)
|
|
|
.Order(orderBy)
|
|
|
.PageList<TkOrderDetailDTO>(getTotal);
|