添加大区名称分公司名称

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerNewController.cs

@@ -89,11 +89,13 @@ namespace CallCenterApi.Interface.Controllers.customer
                     true,
                     out recordCount);
             }
+            List<Model.T_Cus_CustomerBaseNew> modlelist = new BLL.T_Cus_CustomerBaseNew().DataTableToList(dt);
+            List<CustomerBaseNewInput> Input = modeltooip(modlelist);
             var obj = new
             {
                 state = "success",
                 message = "成功",
-                rows = dt,
+                rows = Input,
                 total = recordCount
             };
 
@@ -114,8 +116,9 @@ namespace CallCenterApi.Interface.Controllers.customer
                 sql += " and F_IsDelete=0";
                 list = cusbll.GetModelList(sql);
             }
-            if (list.Count > 0)
-                return Success("根据关键字获取公司信息", list.FirstOrDefault());
+            List<CustomerBaseNewInput> Input = modeltooip(list);
+            if (Input.Count > 0)
+                return Success("根据关键字获取公司信息", Input.FirstOrDefault());
             else
                 return Error("没有获取到相关公司，请重新搜索");
         }
@@ -128,9 +131,12 @@ namespace CallCenterApi.Interface.Controllers.customer
             if (cusid != 0)
             {
                 Model.T_Cus_CustomerBaseNew userModel = cusbll.GetModel(cusid);
+                List<Model.T_Cus_CustomerBaseNew> model = new List<T_Cus_CustomerBaseNew>();
                 if (userModel != null)
                 {
-                    return Success("获取成功", userModel);
+                    model.Add(userModel);
+                    List<CustomerBaseNewInput> Input = modeltooip(model);
+                    return Success("获取成功", Input.FirstOrDefault());
                 }
                 else
                 {
@@ -155,7 +161,8 @@ namespace CallCenterApi.Interface.Controllers.customer
                 var userModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 " + sql);
                 if (userModel.Count() > 0)
                 {
-                    var model = userModel.Last();
+                    List<CustomerBaseNewInput> Input = modeltooip(userModel);
+                    var model = Input.Last();
 
                     return Success("获取成功", model);
                 }
@@ -226,7 +233,77 @@ namespace CallCenterApi.Interface.Controllers.customer
             else
                 return Error("保存失败！");
         }
+        /// <summary>
+        /// 根据model返回CustomerBaseNewInput对象
+        /// </summary>
+        private List<CustomerBaseNewInput> modeltooip(List <Model.T_Cus_CustomerBaseNew> model)
+        {
+            if (model!=null &&model .Count >0)
+            {
+                List<CustomerBaseNewInput> Input = new List<CustomerBaseNewInput>(model.Count);
+                for (int i=0;i<model .Count;i++)
+                {
+                    CustomerBaseNewInput Input1 = new CustomerBaseNewInput();
+                    #region 基本字段
+                    if (!string.IsNullOrWhiteSpace(model[i].F_CustomerCode))
+                        Input1.F_CustomerCode = model[i].F_CustomerCode;
+                 
+                    if (!string.IsNullOrWhiteSpace(model[i].F_CompanyName))
+                        Input1.F_CompanyName = model[i].F_CompanyName;
+                    Input1.F_AreaID = model[i].F_AreaID;//大区ID
+                    Input1.F_BranchID = model[i].F_BranchID;//分公司ID
+                    Model.T_Sys_Department pdModel = departmentBLL.GetModel(model[i].F_AreaID);
+                    if (pdModel != null)
+                    {
+                        Input1.F_AreaName = pdModel.F_DeptName.ToString();
+                    }
+                    Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(model[i].F_BranchID);
+                    if (pdModel1 != null)
+                    {
+                        Input1.F_BranchName = pdModel1.F_DeptName.ToString();
+                    }
+                    Input1.F_Salesman = model[i].F_Salesman;//业务员
+                    Input1.F_SalesPhone = model[i].F_SalesPhone;//业务员电话
+                    Input1.F_CustomerNature = model[i].F_CustomerNature;//客户性质
+                    Input1.F_Channel = model[i].F_Channel;// 渠道类型:总经销、二级商、种田大户、农户、化工客户、公司员工
+                    Input1.F_Credit = model[i].F_Credit;//信用等级:一星、二星、三星、四星、五星、空
+                    Input1.F_Legal = model[i].F_Legal;//法人 
+                    Input1.F_LegalPhone = model[i].F_LegalPhone;//法人电话
+                    Input1.F_AddressProvince = model[i].F_AddressProvince;//省
+                    Input1.F_AddressCity = model[i].F_AddressCity;//市
+                    Input1.F_AddressCountry = model[i].F_AddressCountry;//县
+                    Input1.F_AddressTownship = model[i].F_AddressTownship;//乡
+                    Input1.F_AddressFull = model[i].F_AddressFull;//详细地址
+                    Input1.F_Brands = model[i].F_Brands;// 经营品牌:心连心、手拉手、沃利沃、双心、空
+                    Input1.F_Product = model[i].F_Product;//产品:复合肥心连心、复合肥手拉手、复合肥沃利沃、复合肥双心、尿素心连心、尿素手拉手、尿素沃利沃、尿素双心
+                    Input1.F_FrozenFlag = model[i].F_FrozenFlag;//冻结标志
+                    Input1.F_IsOpenAccount = model[i].F_IsOpenAccount;//是否开户:已开户、未开户
+                    Input1.F_LevelCode = model[i].F_LevelCode;//上级客户编码
+                    Input1.F_LevelName = model[i].F_LevelName;//上级客户名称
+                    Input1.F_MnemonicCode = model[i].F_MnemonicCode;//助记码
+                    Input1.F_InvoiceBank = model[i].F_InvoiceBank;//开票银行名称
+                    Input1.F_InvoiceBankAccount = model[i].F_InvoiceBankAccount;//开票银行账号
+                    Input1.F_TaxRegCode = model[i].F_TaxRegCode;//纳税人登记号
+                    Input1.F_IsRunXLX = model[i].F_IsRunXLX;// 是否经营心连心:是、否
+                    Input1.F_AnnualSales = model[i].F_AnnualSales;//年销量
+                    Input1.F_Formula = model[i].F_Formula;//配方
+                    Input1.F_RaiseCrops = model[i].F_RaiseCrops;//种植作物
+                    Input1.F_PlantingArea = model[i].F_PlantingArea;//种植面积
+                    Input1.F_FertilizerBrand = model[i].F_FertilizerBrand;//用肥品牌
+                    Input1.F_Remark = model[i].F_Remark;//备注
+                    Input1.F_FileId = 0;
+                    Input.Add(Input1);
+                    #endregion
+                }
+
+                return Input;
+            }
+            else
+            {
+                return null;
+            }
 
+        }
         /// <summary>
         /// 根据传入的对象和input的内容返回对象
         /// </summary>
@@ -240,7 +317,6 @@ namespace CallCenterApi.Interface.Controllers.customer
             if (!string.IsNullOrWhiteSpace(input.F_CompanyName))
                 model.F_CompanyName = input.F_CompanyName;
             #region 基本字段
-          
             model.F_AreaID = input.F_AreaID;//大区ID
             model.F_BranchID = input.F_BranchID;//分公司ID
             model.F_Salesman = input.F_Salesman;//业务员
@@ -426,17 +502,20 @@ namespace CallCenterApi.Interface.Controllers.customer
                             {
                                 dModel.F_CustomerCode = dr["客户编号"].ToString();
                                 dModel.F_CompanyName = dr["公司名称"].ToString();
+                               
                                 #region
+                                
                                 Model.T_Sys_Department pdModel = departmentBLL.GetModel(dr["大区名称"].ToString());
-                                Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(dr["分公司名称"].ToString());
-                                if (!string .IsNullOrEmpty(pdModel.F_DeptId.ToString()))
+                                if (pdModel!=null )
                                 {
                                     dModel.F_AreaID = pdModel.F_DeptId.ToString();
                                 }
-                                if (!string.IsNullOrEmpty(pdModel1.F_DeptId.ToString()))
+                                    Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(dr["分公司名称"].ToString());
+                                if (pdModel1!=null )
                                 {
                                     dModel.F_BranchID = pdModel1.F_DeptId.ToString();
                                 }
+                             
                                 dModel.F_Salesman = dr["业务员"].ToString();
                                 dModel.F_SalesPhone = dr["业务员电话"].ToString();
                                 dModel.F_CustomerNature = dr["客户性质"].ToString();

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/CustomerBaseNewInput.cs

@@ -24,10 +24,18 @@ namespace CallCenterApi.Interface.Models.Input
         /// </summary>
         public string F_AreaID { set; get; }
         /// <summary>
+        /// 大区名称
+        /// </summary>
+        public string F_AreaName { set; get; }
+        /// <summary>
         /// 分公司ID
         /// </summary>
         public string F_BranchID { set; get; }
         /// <summary>
+        /// 分公司名称
+        /// </summary>
+        public string F_BranchName { set; get; }
+        /// <summary>
         /// 业务员
         /// </summary>
         public string F_Salesman { set; get; }