Commit 751c37db authored by 黄奎's avatar 黄奎

页面修改

parent c01fe8c6
...@@ -138,6 +138,7 @@ namespace Edu.Repository.Sell ...@@ -138,6 +138,7 @@ namespace Edu.Repository.Sell
where += $@" and r.{nameof(RB_Order_ReturnComission_ViewModel.Status)} in(1,2)"; where += $@" and r.{nameof(RB_Order_ReturnComission_ViewModel.Status)} in(1,2)";
} }
string sql = $@" select r.*,b.BatchName,o.ClassId,c.ClassName,c.ClassNo,s.StuName from RB_Order_ReturnComission r string sql = $@" select r.*,b.BatchName,o.ClassId,c.ClassName,c.ClassNo,s.StuName from RB_Order_ReturnComission r
left join rb_returnmoney_batch b on r.BatchId = b.Id left join rb_returnmoney_batch b on r.BatchId = b.Id
left join rb_order o on r.OrderId = o.OrderId left join rb_order o on r.OrderId = o.OrderId
......
...@@ -541,6 +541,7 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -541,6 +541,7 @@ namespace Edu.WebApi.Controllers.Customer
QCustomerState = base.ParmJObj.GetInt("QCustomerState"), QCustomerState = base.ParmJObj.GetInt("QCustomerState"),
CreateBy = base.ParmJObj.GetInt("CreateBy"), CreateBy = base.ParmJObj.GetInt("CreateBy"),
CategoryName=base.ParmJObj.GetStringValue("CategoryName"), CategoryName=base.ParmJObj.GetStringValue("CategoryName"),
CategoryId=base.ParmJObj.GetInt("CategoryId"),
}; };
var list = customerModule.GetCustomerPageModule_V2(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query); var list = customerModule.GetCustomerPageModule_V2(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
foreach (var item in list) foreach (var item in list)
......
...@@ -271,7 +271,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -271,7 +271,7 @@ namespace Edu.WebApi.Controllers.Course
int OrderSourceId = parms.GetInt("OrderSourceId", 0);//来源对应ID (内部 同行联系人 学生) int OrderSourceId = parms.GetInt("OrderSourceId", 0);//来源对应ID (内部 同行联系人 学生)
int CategoryId = parms.GetInt("CategoryId",0);//同行编号 int CategoryId = parms.GetInt("CategoryId",0);//同行编号
int CommissionType = parms.GetInt("CommissionType", 0);//类型 int CommissionType = parms.GetInt("CommissionType", 0);//类型
if (OrderSourceType <= 0 || OrderSourceId <= 0 || CommissionType <= 0) if (OrderSourceType <= 0 || (OrderSourceId <= 0&& CategoryId<=0) || CommissionType <= 0)
{ {
return ApiResult.ParamIsNull(); return ApiResult.ParamIsNull();
} }
......
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