字段完善

代码/System.Model/T_Cus_VipInfo.cs

@@ -214,7 +214,14 @@ namespace System.Model
         /// 累计积分
         /// </summary>				
         public decimal F_TotalScore { get; set; }
-
+        /// <summary>
+        /// 销售负责人
+        /// </summary>				
+        public string F_Saleperson { get; set; }
+        /// <summary>
+        /// 联系频次
+        /// </summary>				
+        public string F_Contact { get; set; }
         #endregion Model
     }
 }

代码/TVShoppingCallCenter_ZLJ/Controllers/Customer/VIPInfoController.cs

@@ -41,23 +41,68 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
         /// <param name="pagesize"></param>
         /// <returns></returns>
         [HttpGet("getlistbypage")]
-        public async Task<IActionResult> GetListsByPageAsync(string keyword, int pageindex = 1, int pagesize = 20)
+        public async Task<IActionResult> GetListsByPageAsync(string keyword,string name,string phone,string label,string province,string city,string area,string town,string address,string birthday,string recommender,string saleperson,string contact, int pageindex = 1, int pagesize = 20)
         {
             List<IConditionalModel> conModels = new List<IConditionalModel>();
             #region 条件筛选
             conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = ((int)EnumDelState.Enabled).ToString() });
 
-            if (!string.IsNullOrEmpty(keyword))
+            if (!string.IsNullOrEmpty(phone))
                 conModels.Add(new ConditionalCollections()
                 {
                     ConditionalList = new List<KeyValuePair<WhereType, ConditionalModel>>()
                     {
-                        new  KeyValuePair<WhereType, ConditionalModel>(WhereType.And, new ConditionalModel() { FieldName = "F_Name", ConditionalType = ConditionalType.Like, FieldValue = keyword }),
-                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_Phone", ConditionalType = ConditionalType.Like, FieldValue = keyword }),
-                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or, new ConditionalModel() { FieldName = "F_VIPCode", ConditionalType = ConditionalType.Like, FieldValue = keyword })
+                        new  KeyValuePair<WhereType, ConditionalModel>(WhereType.And, new ConditionalModel() { FieldName = "F_Phone", ConditionalType = ConditionalType.Like, FieldValue = phone }),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_Mobile", ConditionalType = ConditionalType.Like, FieldValue = phone }),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or, new ConditionalModel() { FieldName = "F_Mobile1", ConditionalType = ConditionalType.Like, FieldValue = phone })
                        
                     }
                 });
+            if (!string.IsNullOrEmpty(name))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Name", ConditionalType = ConditionalType.Like, FieldValue = name });
+            }
+            if (!string.IsNullOrEmpty(label))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Label", ConditionalType = ConditionalType.Like, FieldValue = label });
+            }
+            if (!string.IsNullOrEmpty(province))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Province", ConditionalType = ConditionalType.Like, FieldValue = priovince });
+            }
+
+            if (!string.IsNullOrEmpty(city))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_City", ConditionalType = ConditionalType.Like, FieldValue = city });
+            }
+            if (!string.IsNullOrEmpty(area))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Area", ConditionalType = ConditionalType.Like, FieldValue = area });
+            }
+            if (!string.IsNullOrEmpty(town))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Town", ConditionalType = ConditionalType.Like, FieldValue = town });
+            }
+            if (!string.IsNullOrEmpty(address))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Address", ConditionalType = ConditionalType.Like, FieldValue = address });
+            }
+            if (!string.IsNullOrEmpty(birthday))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Birthday", ConditionalType = ConditionalType.Like, FieldValue = birthday });
+            }
+            if (!string.IsNullOrEmpty(recommender))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Recommender", ConditionalType = ConditionalType.Like, FieldValue = recommender });
+            }
+            if (!string.IsNullOrEmpty(saleperson))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Saleperson", ConditionalType = ConditionalType.Like, FieldValue = saleperson });
+            }
+            if (!string.IsNullOrEmpty(contact))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Contact", ConditionalType = ConditionalType.Like, FieldValue = contact });
+            }
             #endregion
             int recordCount = 0;
             var list = await _cus_vip_infoRepository.GetListByPage(conModels, new MyPageModel() { PageIndex = pageindex, PageSize = pagesize, PageCount = recordCount });
@@ -76,7 +121,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
         /// </summary>
         /// <param name="id">id</param>
         /// <returns></returns>
-        [HttpGet("getdetailes")]
+        [HttpGet("getdetails")]
         public async Task<IActionResult> GetDetailsAsync(int id)
         {
             if (id <= 0)

代码/TVShoppingCallCenter_ZLJ/Controllers/Customer/VipLabelInfoController.cs

@@ -79,7 +79,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
         /// </summary>
         /// <param name="id">id</param>
         /// <returns></returns>
-        [HttpGet("getdetailes")]
+        [HttpGet("getdetails")]
         public async Task<IActionResult> GetDetailsAsync(int id)
         {
             if (id <= 0)