Merge branch 'sdzq' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

Mall.Model/Entity/GuideCar/RB_GuideCar_CarSearch.cs

@@ -33,5 +33,114 @@ namespace Mall.Model.Entity.GuideCar
         /// 背景
         /// </summary>
         public string Background { get; set; }
+        /// <summary>
+        /// 搜索背景
+        /// </summary>
+        public string SearchBackground { get; set; }
+
+
+        /// <summary>
+        /// 搜索框文字
+        /// </summary>
+        public string SearchTips { get; set; }
+
+
+        /// <summary>
+        /// 是否显示时间筛选0-否，1-是
+        /// </summary>
+        public int IsShowDate { get; set; }
+
+        /// <summary>
+        /// 是否显示城市筛选0-否，1-是
+        /// </summary>
+        public int IsShowCity { get; set; }
+
+        /// <summary>
+        /// 是否显示地址筛选0-否，1-是
+        /// </summary>
+        public int IsShowAddress { get; set; }
+
+        /// <summary>
+        /// 是否显示拼车筛选0-否，1-是
+        /// </summary>
+        public int IsShowCarpooling { get; set; }
+
+        /// <summary>
+        /// 是否显示出行类型筛选0-否，1-是
+        /// </summary>
+        public int IsShowGuideCarGoodsType { get; set; }
+
+
+        /// <summary>
+        /// 是否显示车辆类型筛选0-否，1-是
+        /// </summary>
+        public int IsShowCarClass { get; set; }
+
+
+        /// <summary>
+        /// 是否显示出行人数筛选0-否，1-是
+        /// </summary>
+        public int IsShowTravelGuestNum { get; set; }
+
+
+        /// <summary>
+        /// 按钮上面的文字提示
+        /// </summary>
+        public string Tips { get; set; }
+
+        /// <summary>
+        /// 按钮上面的文字图标提示
+        /// </summary>
+        public string TipsIco { get; set; }
+
+        /// <summary>
+        /// 搜索框图标
+        /// </summary>
+        public string SearchIco { get; set; }
+        /// <summary>
+        /// 搜索圆角像素
+        /// </summary>        
+        public int? SearchFilletPX
+        {
+            get;
+            set;
+        }
+
+
+
+
+        /// <summary>
+        /// 按钮圆角像素
+        /// </summary>        
+        public int? ButtonFilletPX
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 按钮文本
+        /// </summary>        
+        public string ButtonText
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 按钮颜色
+        /// </summary>        
+        public string ButtonColor
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 按钮文字颜色
+        /// </summary>        
+        public string ButtonTextColor
+        {
+            get;
+            set;
+        }
+
     }
 }

Mall.Model/Extend/GuideCar/RB_GuideCar_Guide_Extend.cs

@@ -52,20 +52,20 @@ namespace Mall.Model.Extend.GuideCar
         /// <summary>
         /// 开始年限
         /// </summary>
-        public int StartWorkYears { get; set; }
+        public decimal? StartWorkYears { get; set; }
         /// <summary>
         /// 结束年限
         /// </summary>
-        public int EndWorkYears { get; set; }
+        public decimal? EndWorkYears { get; set; }
 
 
         /// <summary>
         /// 开始评分
         /// </summary>
-        public decimal StartScore { get; set; }
+        public decimal? StartScore { get; set; }
         /// <summary>
         /// 结束评分
         /// </summary>
-        public decimal EndScore { get; set; }
+        public decimal? EndScore { get; set; }
     }
 }

Mall.Repository/GuideCar/RB_GuideCar_GuideRepository.cs

@@ -54,20 +54,20 @@ namespace Mall.Repository.GuideCar
                 {
                     builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.IsEnable)}={query.IsEnable}");
                 }
-                if (query.StartWorkYears > 0)
+                if (query.StartWorkYears.HasValue&& query.StartWorkYears > 0)
                 {
                     builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.WorkYears)}>={query.StartWorkYears}");
                 }
-                if (query.EndWorkYears > 0)
+                if (query.EndWorkYears.HasValue && query.EndWorkYears > 0)
                 {
                     builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.WorkYears)}<={query.EndWorkYears}");
                 }
 
-                if (query.StartScore > 0)
+                if (query.StartScore.HasValue && query.StartScore > 0)
                 {
                     builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.Score)}>={query.StartScore}");
                 }
-                if (query.EndScore > 0)
+                if (query.EndScore.HasValue && query.EndScore > 0)
                 {
                     builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.Score)}<={query.EndScore}");
                 }
@@ -127,14 +127,23 @@ namespace Mall.Repository.GuideCar
                 {
                     builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.IsEnable)}={query.IsEnable}");
                 }
-                if (query.StartWorkYears > 0)
+                if (query.StartWorkYears.HasValue && query.StartWorkYears > 0)
                 {
                     builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.WorkYears)}>={query.StartWorkYears}");
                 }
-                if (query.EndWorkYears > 0)
+                if (query.EndWorkYears.HasValue && query.EndWorkYears > 0)
                 {
                     builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.WorkYears)}<={query.EndWorkYears}");
                 }
+
+                if (query.StartScore.HasValue && query.StartScore > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.Score)}>={query.StartScore}");
+                }
+                if (query.EndScore.HasValue && query.EndScore > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_GuideCar_Guide_Extend.Score)}<={query.EndScore}");
+                }
                 if (!string.IsNullOrEmpty(query.StartTime))
                 {
                     builder.Append($" and a.{nameof(RB_GuideCar_Guide_Extend.CreateDate)} >='{query.StartTime}'");