页面修改

Edu.Repository/Customer/RB_CustomerRepository.cs

@@ -86,6 +86,11 @@ WHERE 1=1
                         case 4: builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Customer_Extend.CustomerState), (int)CustomerStateEnum.Disable);break;
                     }
                 }
+                if (!string.IsNullOrEmpty(query.CategoryName))
+                {
+                    builder.AppendFormat(" AND B.{0} LIKE @CategoryName ", nameof(RB_Customer_Extend.CategoryName));
+                    parameters.Add("CategoryName", "%" + query.CategoryName.Trim() + "%");
+                }
             }
             builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Customer_Extend.CustomerId));
             return GetPage<RB_Customer_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();

Edu.WebApi/Controllers/Customer/B2BCustomerController.cs

@@ -487,7 +487,8 @@ namespace Edu.WebApi.Controllers.Customer
                 CustomerName = base.ParmJObj.GetStringValue("CustomerName"),
                 ContactNumber = base.ParmJObj.GetStringValue("ContactNumber"),
                 ApproveState = base.ParmJObj.GetInt("ApproveState"),
-                QCustomerState = base.ParmJObj.GetInt("QCustomerState")
+                QCustomerState = base.ParmJObj.GetInt("QCustomerState"),
+                CategoryName=base.ParmJObj.GetStringValue("CategoryName"),
             };
             query.CreateBy = userInfo.Id;
             var list = customerModule.GetCustomerPageModule_V2(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
@@ -538,7 +539,8 @@ namespace Edu.WebApi.Controllers.Customer
                 ContactNumber = base.ParmJObj.GetStringValue("ContactNumber"),
                 ApproveState = base.ParmJObj.GetInt("ApproveState"),
                 QCustomerState = base.ParmJObj.GetInt("QCustomerState"),
-                CreateBy = base.ParmJObj.GetInt("CreateBy")
+                CreateBy = base.ParmJObj.GetInt("CreateBy"),
+                CategoryName=base.ParmJObj.GetStringValue("CategoryName"),
             };
             var list = customerModule.GetCustomerPageModule_V2(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             foreach (var item in list)
@@ -553,8 +555,9 @@ namespace Edu.WebApi.Controllers.Customer
                 x.CustomerId,
                 x.CustomerName,
                 x.ContactNumber,
-                x.EnterpriseName,
                 x.CustomerType,
+                CustomerTypeName = x.CustomerType.ToName(),
+                x.EnterpriseName,
                 x.StuNum,
                 x.OrderNum,
                 x.OrderSales,
@@ -565,6 +568,8 @@ namespace Edu.WebApi.Controllers.Customer
                 x.CreateTimeStr,
                 x.QQ,
                 x.WeChatNo,
+                x.CategoryName,
+                x.CategoryId,
             });
             pageModel.Count = rowsCount;
             return ApiResult.Success(data: pageModel);