Merge branch 'master' of http://192.168.1.222:3000/zhengbingbing/ZLJ_API_V6.0

代码/System.Model/T_Sys_Area.cs

@@ -12,9 +12,9 @@ namespace System.Model
         /// </summary>
         public int F_Id { get; set; }
         /// <summary>
-		/// 行政编号
+		/// 编号
 		/// </summary>
-		public string F_AreaCode { get; set; }
+		public string F_Code { get; set; }
         /// <summary>
         /// 地区
         /// </summary>
@@ -24,6 +24,14 @@ namespace System.Model
         /// </summary>
         public int? F_ParentId { get; set; }
         /// <summary>
+        /// 父级编号
+        /// </summary>
+        public string F_ParentCode { get; set; }
+        /// <summary>
+        /// 类型 1省，2市，3县/区，4乡镇/街道
+        /// </summary>
+        public int F_Level { get; set; }
+        /// <summary>
         /// 排序
         /// </summary>
         public int? F_Sort { get; set; }

代码/TVShoppingCallCenter_ZLJ/Controllers/Traffic/SetAreaController.cs

@@ -25,15 +25,24 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Traffic
         {
             _sys_areaRepository = sys_areaRepository;
         }
-        
+
         /// <summary>
         /// 返回树形下拉框 菜单数据 
         /// </summary>
         /// <returns></returns>
         [HttpGet("getall")]
-        public async Task<IActionResult> GetALL()
+        public async Task<IActionResult> GetALL(string code, int level = 0)
         {
-            var list_ModuleInfo = await _sys_areaRepository.GetListALL(x => x.F_State == (int)EnumDelState.Enabled, o => o.F_Sort, SqlSugar.OrderByType.Asc);
+            #region 筛选
+            List<IConditionalModel> conModels = new List<IConditionalModel>();
+            conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = ((int)EnumDelState.Enabled).ToString() });
+
+            if (level > 0)
+                conModels.Add(new ConditionalModel() { FieldName = "F_Level", ConditionalType = ConditionalType.LessThanOrEqual, FieldValue = level.ToString() });
+            if (!string.IsNullOrWhiteSpace(code))
+                conModels.Add(new ConditionalModel() { FieldName = "F_Code", ConditionalType = ConditionalType.LikeLeft, FieldValue = code });
+            #endregion
+            var list_ModuleInfo = await _sys_areaRepository.GetListALL(conModels, "F_Code asc");
             var treeList = new List<TreeModel>();
             foreach (var item in list_ModuleInfo)
             {
@@ -44,7 +53,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Traffic
                 treeModel.parentid = item.F_ParentId.Value;
                 treeList.Add(treeModel);
             }
-            return Success("获取地区树成功", treeList.TreeRecursion(0));
+            return Success("获取地区树成功", treeList.TreeRecursion(1));
         }
 
         /// <summary>
@@ -53,14 +62,23 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Traffic
         /// <param name="keyword"></param>
         /// <returns></returns>
         [HttpGet("gettreegridjson")]
-        public async Task<ActionResult> GetTreeGridJson(string keyword)
+        public async Task<ActionResult> GetTreeGridJson(string keyword, int level = 0)
         {
-            var list_ModuleInfo = await _sys_areaRepository.GetListALL(x => x.F_State < (int)EnumDelState.Delete);
+            #region 筛选
+            List<IConditionalModel> conModels = new List<IConditionalModel>();
+            conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = ((int)EnumDelState.Enabled).ToString() });
+
+            if (level > 0)
+                conModels.Add(new ConditionalModel() { FieldName = "F_Level", ConditionalType = ConditionalType.LessThanOrEqual, FieldValue = level.ToString() });
+            #endregion
+
+            var list_ModuleInfo = await _sys_areaRepository.GetListALL(conModels, "F_Code asc");
+            
             if (!string.IsNullOrEmpty(keyword))
             {
-                list_ModuleInfo = list_ModuleInfo.ToList().TreeWhere(t => t.F_AreaName.Contains(keyword) || t.F_AreaCode.Contains(keyword), "F_Id", "F_ParentId").ToList();
+                list_ModuleInfo = list_ModuleInfo.ToList().TreeWhere(t => t.F_AreaName.Contains(keyword) || t.F_Code.StartsWith(keyword) || t.F_Code=="0", "F_Id", "F_ParentId").ToList();
             }
-            list_ModuleInfo = list_ModuleInfo.Where(x => x.F_State != (int)EnumDelState.Delete).OrderBy(x => x.F_Sort).ThenByDescending(x => x.F_LastModifyOn).ToList();//排序
+            list_ModuleInfo = list_ModuleInfo.OrderBy(x => x.F_Sort).ThenByDescending(x => x.F_LastModifyOn).ToList();//排序
 
             var treeList = new List<TreeGridModel>();
             foreach (var item in list_ModuleInfo)
@@ -140,8 +158,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Traffic
             #endregion
             T_Sys_Area clmodel = new T_Sys_Area();
             clmodel.F_AreaName = input.areaname;
-            clmodel.F_AreaCode = input.areacode;
+            clmodel.F_Code = input.code;
+            clmodel.F_ParentCode = input.parentcode;
             clmodel.F_ParentId = input.parentid;
+            clmodel.F_Level = input.level;
             clmodel.F_Sort = input.sort;
             clmodel.F_Remark = input.remark;
 
@@ -177,8 +197,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Traffic
             if (clmodel == null)
                 return Error("信息获取失败");
             clmodel.F_AreaName = input.areaname;
-            clmodel.F_AreaCode = input.areacode;
+            clmodel.F_Code = input.code;
+            clmodel.F_ParentCode = input.parentcode;
             clmodel.F_ParentId = input.parentid;
+            clmodel.F_Level = input.level;
             clmodel.F_Sort = input.sort;
             clmodel.F_Remark = input.remark;
 
@@ -226,7 +248,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Traffic
         }
 
         /// <summary>
-        /// 导入号码段
+        /// 导入地区
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -244,14 +266,14 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Traffic
             if (dtExcel.Rows.Count <= 0)
                 return Error("请选择要导入的文件");
 
-            IList<AreaInput> IMobileDatas = ModelConvertHelper<AreaInput>.ConvertToModel(dtExcel);
-            List<AreaInput> MobileDatas = ModelConvertHelper<AreaInput>.ConvertIListToList(IMobileDatas);
-            int num = MobileDatas.Count;
+            IList<AreaInput> IDatas = ModelConvertHelper<AreaInput>.ConvertToModel(dtExcel);
+            List<AreaInput> Datas = ModelConvertHelper<AreaInput>.ConvertIListToList(IDatas);
+            int num = Datas.Count;
             List<AreaInput> inputlist = new List<AreaInput>();
 
-            foreach (AreaInput input in MobileDatas)
+            foreach (AreaInput input in Datas)
             {
-                Expression<Func<T_Sys_Area, bool>> eq = a => a.F_AreaCode == input.areacode;
+                Expression<Func<T_Sys_Area, bool>> eq = a => a.F_Code == input.code;
                 eq = eq.And(b => b.F_AreaName == input.areaname);
                 if (await _sys_areaRepository.GetCount(eq) > 0)
                 {
@@ -351,9 +373,11 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Traffic
             foreach (var input in inputs)
             {
                 T_Sys_Area clmodel = new T_Sys_Area();
-                clmodel.F_AreaName = input.areaname.Trim();
-                clmodel.F_AreaCode = input.areacode.Trim();
+                clmodel.F_AreaName = input.areaname;
+                clmodel.F_Code = input.code;
+                clmodel.F_ParentCode = input.parentcode;
                 clmodel.F_ParentId = input.parentid;
+                clmodel.F_Level = input.level;
                 clmodel.F_Sort = input.sort;
                 clmodel.F_Remark = input.remark;
 

代码/TVShoppingCallCenter_ZLJ/Controllers/Traffic/SetMobileDataController.cs

@@ -216,6 +216,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Traffic
             foreach (MobileDataInput input in MobileDatas)
             {
                 Expression<Func<T_Sys_MobileData, bool>> eq = a => a.F_MobileNum == input.mobilenum;
+                eq = eq.Or(b => b.F_ZipCode == input.zipcode);
                 //eq = eq.Or(b => b.F_ZipCode == input.zipcode);
                 //eq = eq.Or(b => b.F_CityDes == input.citydes);
                 //eq = eq.Or(b => b.F_CardDes == input.carddes);

代码/TVShoppingCallCenter_ZLJ/Models/Inputs/Traffic/AreaInput.cs

@@ -14,7 +14,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs.Traffic
         /// <summary>
 		/// 行政编号
 		/// </summary>
-		public string areacode { get; set; }
+		public string code { get; set; }
         /// <summary>
         /// 地区
         /// </summary>
@@ -24,6 +24,14 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs.Traffic
         /// </summary>
         public int parentid { get; set; } = 0;
         /// <summary>
+        /// 父级编号
+        /// </summary>
+        public string parentcode { get; set; }
+        /// <summary>
+        /// 类型 1省，2市，3县/区，4乡镇/街道
+        /// </summary>
+        public int level { get; set; } = 1;
+        /// <summary>
         /// 排序
         /// </summary>
         public int sort { get; set; } = 0;