页面修改

Edu.Model/ViewModel/Customer/RB_Customer_Extend.cs

-using Edu.Model.Entity.Customer;
+using Edu.Common.Plugin;
+using Edu.Model.Entity.Customer;
 
 namespace Edu.Model.ViewModel.Customer
 {
@@ -21,5 +22,51 @@ namespace Edu.Model.ViewModel.Customer
         /// 修改时间
         /// </summary>
         public string UpdateTimeStr { get { return Common.ConvertHelper.FormatTime(this.UpdateTime); } }
+
+        /// <summary>
+        /// 客户状态
+        /// </summary>
+        public string CustomerStateStr
+        {
+            get
+            {
+                return this.CustomerState.ToName();
+            }
+        }
+
+        /// <summary>
+        /// 审核状态
+        /// </summary>
+        public string ApproveStateStr
+        {
+            get
+            {
+                string str = "待审核";
+                if (this.ApproveState == 0)
+                {
+                    str = "待审核";
+                }
+                else if (this.ApproveState == 1)
+                {
+                    str = "通过";
+                }
+                else
+                {
+                    str = "拒绝";
+                }
+                return str;
+            }
+
+        }
+
+        /// <summary>
+        /// 审核人
+        /// </summary>
+        public string ApproveName { get; set; }
+
+        /// <summary>
+        /// 审核时间
+        /// </summary>
+        public string ApproveTimeStr { get { return Common.ConvertHelper.FormatTime(this.ApproveTime); } }
     }
 }

Edu.Module.Customer/CustomerModule.cs

-using Edu.Common.Enum;
+using Edu.Cache.User;
+using Edu.Common.Enum;
 using Edu.Model.ViewModel.Customer;
 using Edu.Repository.Customer;
 using System;
@@ -65,6 +66,8 @@ namespace Edu.Module.Customer
             }
             else
             {
+                model.ApproveState = 0;
+                model.CustomerState = Common.Enum.Customer.CustomerStateEnum.NotActivation;
                 model.Password  = Common.DES.Encrypt(Common.Config.DefaultPwd);
                 var newId = customerRepository.Insert(model);
                 model.CustomerId = newId;
@@ -98,6 +101,13 @@ namespace Edu.Module.Customer
         public RB_Customer_Extend GetCustomerModule(object CustomerId)
         {
             var extModel = customerRepository.GetEntity<RB_Customer_Extend>(CustomerId);
+            if (extModel != null)
+            {
+                if (extModel.ApproveId > 0)
+                {
+                    extModel.ApproveName = UserReidsCache.GetUserLoginInfo(extModel.ApproveId)?.AccountName ?? "";
+                }
+            }
             return extModel;
         }
 

Edu.Repository/Customer/RB_CustomerRepository.cs

@@ -43,7 +43,15 @@ WHERE 1=1
                     builder.AppendFormat(" AND A.{0} LIKE @CustomerName ", nameof(RB_Customer_Extend.CustomerName));
                     parameters.Add("CustomerName", "%" + query.CustomerName.Trim() + "%");
                 }
-
+                if (!string.IsNullOrEmpty(query.ContactNumber))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @ContactNumber ", nameof(RB_Customer_Extend.ContactNumber));
+                    parameters.Add("ContactNumber", "%" + query.ContactNumber.Trim() + "%");
+                }
+                if (query.ApproveState > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Customer_Extend.ApproveState), query.ApproveState);
+                }
             }
             return GetPage<RB_Customer_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }

Edu.WebApi/Controllers/Customer/B2BCustomerController.cs

@@ -34,7 +34,8 @@ namespace Edu.WebApi.Controllers.Customer
             var query = new RB_Customer_Extend()
             {
                 Group_Id = base.UserInfo.Group_Id,
-                CustomerName = base.ParmJObj.GetStringValue("CustomerName")
+                CustomerName = base.ParmJObj.GetStringValue("CustomerName"),
+                ApproveState=base.ParmJObj.GetInt("ApproveState"),
             };
             var list = customerModule.GetCustomerPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             foreach (var item in list)