|
|
@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
/// 机具券列表
|
|
|
/// </summary>
|
|
|
/// <returns></returns>
|
|
|
- public JsonResult IndexData(PosCoupons data, string CreateDateData, string UseDateData, string UserIdMakerCode, string LeaderIdMakerCode, string ExchangeCode, string IsUseSelect, string IsLockSelect, int page = 1, int limit = 30)
|
|
|
+ public JsonResult IndexData(PosCoupons data, string UseDateData, string UserIdMakerCode, string LeaderIdMakerCode, string ExchangeCode, string IsUseSelect, string IsLockSelect, int page = 1, int limit = 30)
|
|
|
{
|
|
|
|
|
|
Dictionary<string, string> Fields = new Dictionary<string, string>();
|
|
|
@@ -85,13 +85,6 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
condition += " and IsLock=" + IsLockSelect;
|
|
|
}
|
|
|
- if (!string.IsNullOrEmpty(CreateDateData))
|
|
|
- {
|
|
|
- string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
|
|
|
- string start = datelist[0];
|
|
|
- string end = datelist[1];
|
|
|
- condition += " and CreateDate >='" + start + " 00:00:00' and CreateDate <='" + end + " 23:59:59'";
|
|
|
- }
|
|
|
|
|
|
if (!string.IsNullOrEmpty(UseDateData))
|
|
|
{
|