22

schangxiang@126.com

2024-12-17 2905c63ec884f531152a4e97a4d67034e8149d6d

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs

@@ -128,7 +128,6 @@
            .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u =>
                u.PackageCode.Contains(input.SearchKey.Trim())
                || u.ApiMessage.Contains(input.SearchKey.Trim())
                || u.CreateOrgName.Contains(input.SearchKey.Trim())
                || u.CreateUserName.Contains(input.SearchKey.Trim())
                || u.UpdateUserName.Contains(input.SearchKey.Trim())
            )
@@ -136,7 +135,6 @@
            .WhereIF(input.PushStatus.HasValue, u => u.PushStatus == input.PushStatus)
            .WhereIF(input.PushNum>0, u => u.PushNum == input.PushNum)
            .WhereIF(!string.IsNullOrWhiteSpace(input.ApiMessage), u => u.ApiMessage.Contains(input.ApiMessage.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.CreateOrgName), u => u.CreateOrgName.Contains(input.CreateOrgName.Trim()))
            .Select<MesPushPackageCodeOutput>();
        if(input.PushTimeRange != null && input.PushTimeRange.Count >0)
        {
@@ -148,6 +146,36 @@
                query = query.Where(u => u.PushTime < end);
            }
        } 
        if(input.RetTimeRange != null && input.RetTimeRange.Count >0)
        {
            DateTime? start= input.RetTimeRange[0].Value.AddDays(-1);
            query = query.WhereIF(start.HasValue, u => u.RetTime > start);
            if (input.RetTimeRange.Count >1 && input.RetTimeRange[1].HasValue)
            {
                var end = input.RetTimeRange[1].Value.AddDays(1);
                query = query.Where(u => u.RetTime < end);
            }
        } 
        if(input.CreateTimeRange != null && input.CreateTimeRange.Count >0)
        {
            DateTime? start= input.CreateTimeRange[0].Value;
            query = query.WhereIF(start.HasValue, u => u.CreateTime >= start);
            if (input.CreateTimeRange.Count >1 && input.CreateTimeRange[1].HasValue)
            {
                var end = input.CreateTimeRange[1].Value;
                query = query.Where(u => u.CreateTime <= end);
            }
        } 
        if(input.UpdateTimeRange != null && input.UpdateTimeRange.Count >0)
        {
            DateTime? start= input.UpdateTimeRange[0].Value;
            query = query.WhereIF(start.HasValue, u => u.UpdateTime >= start);
            if (input.UpdateTimeRange.Count >1 && input.UpdateTimeRange[1].HasValue)
            {
                var end = input.UpdateTimeRange[1].Value;
                query = query.Where(u => u.UpdateTime <= end);
            }
        } 
        return query;
       }