Merge branch 'master' of http://118.178.224.202:3000/ewide/ewide_core

Api/Ewide.Application/Ewide.Application.xml

@@ -329,6 +329,36 @@
             主管部门
             </summary>
         </member>
+        <member name="P:Ewide.Application.Entity.BsHouseCompany.Type">
+            <summary>
+            单位类型，多选
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.Entity.BsHouseCompany.CompanyName">
+            <summary>
+            单位名称
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.Entity.BsHouseCompany.ChargePerson">
+            <summary>
+            单位负责人
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.Entity.BsHouseCompany.ChargePersonTel">
+            <summary>
+            单位负责人电话
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.Entity.BsHouseCompany.ContactPerson">
+            <summary>
+            单位联系人
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.Entity.BsHouseCompany.ContactPersonTel">
+            <summary>
+            单位联系人电话
+            </summary>
+        </member>
         <member name="T:Ewide.Application.Service.HouseCode.HouseCodeService">
             <summary>
             房屋编码相关
@@ -338,7 +368,7 @@
             <summary>
             获取同一区域下的下一个编号
             </summary>
-            <param name="areaCode"></param>
+            <param name="projectId"></param>
             <returns></returns>
         </member>
         <member name="T:Ewide.Application.Service.HouseProjectInfo.HouseProjectInfoService">

Api/Ewide.Core/Ewide.Core.xml

@@ -3969,6 +3969,16 @@
             名称-对应字典值的value
             </summary>
         </member>
+        <member name="P:Ewide.Core.Service.DictTreeOutput.Remark">
+            <summary>
+            备注
+            </summary>
+        </member>
+        <member name="P:Ewide.Core.Service.DictTreeOutput.Sort">
+            <summary>
+            排序
+            </summary>
+        </member>
         <member name="P:Ewide.Core.Service.DictTreeOutput.Children">
             <summary>
             子节点集合

Api/Ewide.Core/Service/Dict/Dto/DictTreeOutput.cs

@@ -1,11 +1,12 @@
-using System.Collections.Generic;
+using System.Collections;
+using System.Collections.Generic;
 
 namespace Ewide.Core.Service
 {
     /// <summary>
     /// 字典类型与字典值构造的树
     /// </summary>
-    public class DictTreeOutput
+    public class DictTreeOutput : ITreeNode
     {
         /// <summary>
         /// Id
@@ -27,9 +28,33 @@ namespace Ewide.Core.Service
         /// </summary>
         public string Name { get; set; }
 
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { set; get; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int Sort { set; get; }
         /// <summary>
         /// 子节点集合
         /// </summary>
         public List<DictTreeOutput> Children { get; set; } = new List<DictTreeOutput>();
+
+        public string GetId()
+        {
+            return Id;
+        }
+
+        public string GetPid()
+        {
+            return Pid;
+        }
+
+        public void SetChildren(IList children)
+        {
+            Children = (List<DictTreeOutput>)children;
+        }
     }
 }

Api/Ewide.Core/Service/Dict/SysDictTypeService.cs

@@ -178,19 +178,16 @@ namespace Ewide.Core.Service
         [HttpGet("/sysDictType/tree")]
         public async Task<List<DictTreeOutput>> GetDictTree()
         {
-            return await _sysDictTypeRep.DetachedEntities.Select(u => new DictTreeOutput
+            var DictTypeList = await _sysDictTypeRep.AsQueryable().ToListAsync();
+            return new TreeBuildUtil<DictTreeOutput>().DoTreeBuild(DictTypeList.Select(u => new DictTreeOutput
             {
-                Id = u.Id,
-                Code = u.Code,
                 Name=u.Name,
-                Children = u.SysDictDatas.Select(c => new DictTreeOutput
+                Code = u.Code,
-                {
+                Pid=u.Pid,
-                    Id = c.Id,
+                Id=u.Id,
-                    Pid = c.TypeId,
+                Remark=u.Remark,
-                    Code = c.Code,
+                Sort =u.Sort
-                    Name = c.Value
+            }).OrderBy(s => s.Sort).ToList());
-                }).ToList()
-            }).ToListAsync();
         }
         /// <summary>
         /// 创建Pids格式