页面修改

Edu.Common/Enum/StudyAbroad/StudyAbroadProductTypeEnum.cs

@@ -45,5 +45,11 @@ namespace Edu.Common.Enum.StudyAbroad
         /// </summary>
         [EnumField("日本初高中常规产品")]
         RBCGZCGCP = 7,
+
+        /// <summary>
+        /// 日本初高中常规产品
+        /// </summary>
+        [EnumField("日本语言学校项目")]
+        RBYYXXXM =8,
     }
 }

Edu.Repository/StudyAbroad/RB_StudyAbroadRepository.cs

@@ -58,6 +58,14 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1}", nameof(RB_StudyAbroad_ViewModel.SaleState),(int)query.SaleState);
                 }
+                if (query.ProductType > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1}", nameof(RB_StudyAbroad_ViewModel.ProductType), (int)query.ProductType);
+                }
+                if (query.StudyCountryId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1}", nameof(RB_StudyAbroad_ViewModel.StudyCountryId), query.StudyCountryId);
+                }
                 return GetPage<RB_StudyAbroad_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
             }
         }

Edu.WebApi/Controllers/StudyAbroad/StudyAbroadController.cs

@@ -223,6 +223,8 @@ namespace Edu.WebApi.Controllers.StudyAbroad
                 AuditType=base.ParmJObj.GetInt("AuditType"),
                 SaleState=(SaleStateEnum)base.ParmJObj.GetInt("SaleState"),
                 AuditState=base.ParmJObj.GetInt("AuditState"),
+                ProductType=(StudyAbroadProductTypeEnum)base.ParmJObj.GetInt("ProductType"),
+                StudyCountryId=base.ParmJObj.GetInt("StudyCountryId"),
             };
             query.Group_Id = base.UserInfo.Group_Id;
             List<object> result = new List<object>();