页面修改

Edu.Repository/StudyAbroad/RB_Studyabroad_TypeRepository.cs

@@ -93,7 +93,7 @@ WHERE 1=1
                     parameters.Add("Name", "%" + query.Name.Trim() + "%");
                 }
             }
-            builder.AppendFormat(" OR A.CountryId=0 ");
+            //builder.AppendFormat(" OR A.CountryId=0 ");
             builder.AppendFormat(" ORDER BY A.{0} ", nameof(RB_Studyabroad_Type_Extend.Num));
             return Get<RB_Studyabroad_Type_Extend>(builder.ToString(), parameters).ToList();
         }

Edu.WebApi/Controllers/Customer/B2BCustomerController.cs

@@ -595,6 +595,82 @@ namespace Edu.WebApi.Controllers.Customer
             return ApiResult.Success(data: pageModel);
         }
 
+        /// <summary>
+        /// 导出同行联系人信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [Obsolete]
+        public FileContentResult DownLoadCustomerLinkMan()
+        {
+            var query = new RB_Customer_Extend()
+            {
+                Group_Id = base.UserInfo.Group_Id,
+                CustomerId = base.ParmJObj.GetInt("CustomerId"),
+                CustomerName = base.ParmJObj.GetStringValue("CustomerName"),
+                ContactNumber = base.ParmJObj.GetStringValue("ContactNumber"),
+                ApproveState = base.ParmJObj.GetInt("ApproveState"),
+                QCustomerState = base.ParmJObj.GetInt("QCustomerState"),
+                CreateBy = base.ParmJObj.GetInt("CreateBy"),
+                CategoryName = base.ParmJObj.GetStringValue("CategoryName"),
+                CategoryId = base.ParmJObj.GetInt("CategoryId"),
+            };
+            string excelName = "同行联系人.xls";
+            var list = customerModule.GetCustomerPageModule_V2(1, 100000, out long rowsCount, query);
+            List<ExcelDataSource> slist = new List<ExcelDataSource>();
+            try
+            {
+                ExcelDataSource header = new ExcelDataSource();
+                header.ExcelRows = new List<ExcelColumn>()
+                {
+                    new ExcelColumn("联系人名称"),
+                    new ExcelColumn("类型"),
+                    new ExcelColumn("同行名称"),
+                    new ExcelColumn("电话"),
+                    new ExcelColumn("QQ号"),
+                    new ExcelColumn("微信号"),
+                    new ExcelColumn("客户数量"),
+                    new ExcelColumn("订单数量"),
+                    new ExcelColumn("交易额"),
+                    new ExcelColumn("审核状态"),
+                    new ExcelColumn("加入时间"),
+                    new ExcelColumn("负责人"),
+                };
+                slist.Add(header);
+                foreach (var item in list)
+                {
+                     
+                    var dataRow = new ExcelDataSource()
+                    {
+                        ExcelRows = new List<ExcelColumn>()
+                         {
+                            new ExcelColumn(item.CustomerName),
+                            new ExcelColumn(item.CustomerType.ToName()),
+                            new ExcelColumn(item.CategoryName),
+                            new ExcelColumn(item.ContactNumber),
+                            new ExcelColumn(item.QQ),
+                            new ExcelColumn(item.WeChatNo),
+                            new ExcelColumn(item.StuNum.ToString()),
+                            new ExcelColumn(item.OrderNum.ToString()),
+                            new ExcelColumn(item.OrderSales.ToString()),
+                            new ExcelColumn(item.ApproveStateStr),
+                            new ExcelColumn(item.CreateTimeStr),
+                            new ExcelColumn(UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? ""),
+                         }
+                    };
+                    slist.Add(dataRow);
+                }
+                var byteData = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData, "application/octet-stream", excelName);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList");
+                var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData1, "application/octet-stream", excelName);
+            }
+        }
+
         /// <summary>
         /// 获取同行佣金幸福存折
         /// </summary>

Edu.WebApi/Controllers/User/UserController.cs

@@ -905,7 +905,6 @@ namespace Edu.WebApi.Controllers.User
                 var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
                 return File(byteData1, "application/octet-stream", excelName);
             }
-
         }
 
         /// <summary>