ams修改

ams/djy.Model/AmsDto/AMSQuery.cs

@@ -1,5 +1,6 @@
 
 using Common.Entity;
+using System;
 
 namespace djy.Model.AmsDto
 {
@@ -14,8 +15,17 @@ namespace djy.Model.AmsDto
 		/// 申报状态
 		/// </summary>
 		public string ReportState { get; set; }
+		/// <summary>
+		/// 卸货港code
+		/// </summary>
+		public string PORTDISCHARGECode { get; set; }
 
+		/// <summary>
+		/// 操作人
+		/// </summary>
+		public string UserName { get; set; }
 
-	 
+		public DateTime? BDate { get; set; }
+		public DateTime? EDate { get; set; }
 	}
 }

ams/djy.Service/Ams/AmsService.cs

@@ -42,8 +42,14 @@ namespace djy.Service.Ams
 
                   ReportStates = req.ReportState.Split(',');
             }
-            var dto = DbBus.Get(DbList.AMSCenter).Select<AMS_Master>().Where(x => (x.IsDel == false || x.IsDel == null) && x.CompID == user.CompId)
+            var dto = DbBus.Get(DbList.AMSCenter).Select<AMS_Master>()
-                .WhereIf(req.MBLNO != null, x => x.MBLNO == req.MBLNO).WhereIf(req.ReportState != null, x =>ReportStates.Contains(x.ReportState));
+                .Where(x => (x.IsDel == false || x.IsDel == null) && x.CompID == user.CompId)
+                .WhereIf(req.MBLNO != null, x => x.MBLNO == req.MBLNO)
+                .WhereIf(req.ReportState != null, x =>ReportStates.Contains(x.ReportState))
+                .WhereIf(req.PORTDISCHARGECode!=null,x=>x.PORTDISCHARGECode==req.PORTDISCHARGECode)
+                .WhereIf(req.UserName!=null,x=>x.UserName==req.UserName)
+                .WhereIf(req.BDate!=null,x=>x.CreateTime>=req.BDate)
+                .WhereIf(req.EDate!=null,x=>x.CreateTime<=req.EDate);
             result.count = dto.ToList().Count();
             var list = dto.Page(req.Page, req.Limit).ToList<AMSDto>();
             if (list != null)
@@ -632,7 +638,7 @@ namespace djy.Service.Ams
                 var List = DbBus.Get(DbList.Common).Select<CodeCountry>().ToList().Select(x => new CommonCodeValue
                 {
                     Code = x.Code,
-                    Value = x.EnName,
+                    Value = x.EnName+"-"+x.Code,
                 }).Distinct().ToList();
                 return List;
             }