页面修改

Edu.Model/ViewModel/Customer/RB_Customer_Category_Extend.cs

@@ -29,5 +29,10 @@ namespace Edu.Model.ViewModel.Customer
         /// 订单金额
         /// </summary>
         public decimal OrderSales { get; set; }
+
+        /// <summary>
+        /// 是否查询全部
+        /// </summary>
+        public int IsQueryAll { get; set; }
     }
 }

Edu.Module.Customer/CustomerModule.cs

@@ -546,6 +546,31 @@ namespace Edu.Module.Customer
             return list;
         }
 
+        /// <summary>
+        /// 检测同行是否存在
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool CheckCustomerCategoryModule(RB_Customer_Category_Extend model)
+        {
+            List<WhereHelper> list = new List<WhereHelper>
+            {
+                new WhereHelper(nameof(RB_Customer_Category_Extend.CategoryName), model.CategoryName),
+                new WhereHelper(nameof(RB_Customer_Category_Extend.Status), 0),
+                new WhereHelper(nameof(RB_Customer_Category_Extend.Group_Id), model.Group_Id)
+            };
+            if (model.CategoryId > 0)
+            {
+                list.Add(new WhereHelper()
+                {
+                    FiledName = nameof(RB_Customer_Category_Extend.CategoryId),
+                    FiledValue = model.CategoryId,
+                    OperatorEnum = OperatorEnum.NotEqual
+                });
+            }
+            return customer_CategoryRepository.Exists(list);
+        }
+
         /// <summary>
         /// 新增修改同行
         /// </summary>
@@ -558,7 +583,7 @@ namespace Edu.Module.Customer
             {
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
                 {
-                    { nameof(RB_Customer_Category_Extend.CategoryName),model.CategoryName},
+                    { nameof(RB_Customer_Category_Extend.CategoryName),model.CategoryName.Trim()},
                     { nameof(RB_Customer_Category_Extend.CatetoryType),model.CatetoryType},
                     { nameof(RB_Customer_Category_Extend.UpdateBy),model.UpdateBy},
                     { nameof(RB_Customer_Category_Extend.UpdateTime),model.UpdateTime},

Edu.Repository/Customer/RB_Customer_CategoryRepository.cs

@@ -47,6 +47,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Customer_Category_Extend.CatetoryType), (int)query.CatetoryType);
                 }
+                if (query.CreateBy > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Customer_Category_Extend.CreateBy), query.CreateBy);
+                }
             }
             builder.AppendFormat(" ORDER BY A.{0} DESC  ", nameof(RB_Customer_Category_Extend.CategoryId));
             return GetPage<RB_Customer_Category_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();

Edu.WebApi/Controllers/Customer/B2BCustomerController.cs

@@ -484,6 +484,7 @@ namespace Edu.WebApi.Controllers.Customer
                 x.ContactNumber,
                 x.EnterpriseName,
                 x.CustomerType,
+                CustomerTypeName=x.CustomerType.ToName(),
                 x.StuNum,
                 x.OrderNum,
                 x.OrderSales,
@@ -491,7 +492,9 @@ namespace Edu.WebApi.Controllers.Customer
                 x.ApproveStateStr,
                 x.CreateBy,
                 x.CreateByName,
-                x.CreateTimeStr
+                x.CreateTimeStr,
+                x.CategoryName,
+                x.CategoryId,
             });
             pageModel.Count = rowsCount;
             return ApiResult.Success(data: pageModel);
@@ -795,7 +798,11 @@ namespace Edu.WebApi.Controllers.Customer
                 CategoryName = base.ParmJObj.GetStringValue("CategoryName"),
                 CatetoryType=(CatetoryTypeEnum)base.ParmJObj.GetInt("CatetoryType"),
             };
-            query.CreateBy = userInfo.Id;
+            int IsQueryAll = base.ParmJObj.GetInt("IsQueryAll");
+            if (IsQueryAll ==0)
+            {
+                query.CreateBy = userInfo.Id;
+            }
             var list = customerModule.GetCustomerCategoryPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             List<object> result = new List<object>();
             foreach (var item in list)
@@ -874,6 +881,10 @@ namespace Edu.WebApi.Controllers.Customer
             extModel.CreateTime = DateTime.Now;
             extModel.UpdateTime = DateTime.Now;
             extModel.Status = Common.Enum.DateStateEnum.Normal;
+            if (customerModule.CheckCustomerCategoryModule(extModel))
+            {
+                return ApiResult.Failed(message: "已存在此同行信息,请重新录入!");
+            }
             bool flag = customerModule.SetCustomerCategoryModule(extModel);
             if (flag && CategoryId <= 0)
             {