sys/area

src/Hotline.Api/Controllers/CommonPController.cs

@@ -64,77 +64,12 @@ namespace Hotline.Api.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpGet("tree-area")]
+        [Obsolete("请调用sys/area/tree")]
         public async Task<List<SystemArea>> GetAearTree()
         {
             return await _systemAreaDomainService.GetAreaTree();
         }
 
-        /// <summary>
-        /// 新增省市区
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <returns></returns>
-        [Permission(EPermission.AddArea)]
-        [HttpPost("add-aear")]
-        public async Task AddArea([FromBody]AddAreaDto dto)
-        {
-            var model = _mapper.Map<SystemArea>(dto);
-            model.IsCanModify = true;
-            await _systemAreaDomainService.AddArea(model,HttpContext.RequestAborted);
-        }
-
-        /// <summary>
-        /// 修改省市区
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <returns></returns>
-        [Permission(EPermission.ModifyArea)]
-        [HttpPost("modify-area")]
-        public async Task ModifyArea([FromBody]ModifyAreaDto dto)
-        {
-            var model = await _systemAreaDomainService.GetArea(dto.Id,HttpContext.RequestAborted);
-            if (model is null)
-                throw UserFriendlyException.SameMessage("未知数据，请刷新页面");
-            if (!model.IsCanModify)
-                throw UserFriendlyException.SameMessage("系统数据，不能修改");
-
-            model = _mapper.Map<SystemArea>(dto);
-            await _systemAreaDomainService.ModifyArea(model, HttpContext.RequestAborted);
-        }
-
-        /// <summary>
-        /// 删除省市区（逻辑）
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [Permission(EPermission.DelArea)]
-        [HttpGet("del-area/{id}")]
-        public async Task DelArea(string id)
-        {
-            var model = await _systemAreaDomainService.GetArea(id, HttpContext.RequestAborted);
-            if (model is null)
-                throw UserFriendlyException.SameMessage("未知数据，请刷新页面");
-            if (!model.IsCanModify)
-                throw UserFriendlyException.SameMessage("系统数据不能删除");
-
-            await _systemAreaDomainService.DelArea(id, HttpContext.RequestAborted);
-        }
-
-        /// <summary>
-        /// 获取区域
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [Permission(EPermission.GetArea)]
-        [HttpGet("get-area/{id}")]
-        public async Task<SystemArea?> GetArea(string id)
-        {
-            var model = await _systemAreaDomainService.GetArea(id, HttpContext.RequestAborted);
-            if (model is null)
-                throw UserFriendlyException.SameMessage("未知数据，请刷新页面");
-            return model;
-        }
-
         #endregion
     }
 }

src/Hotline.Api/Controllers/SettingController.cs

@@ -139,7 +139,6 @@ namespace Hotline.Api.Controllers
 
         #endregion
 
-
         #region 日期类型设置
 
         /// <summary>
@@ -174,5 +173,6 @@ namespace Hotline.Api.Controllers
         }
 
         #endregion
+
     }
 }

src/Hotline.Api/Controllers/SysController.cs

@@ -4,6 +4,7 @@ using Hotline.Settings;
 using Hotline.Share.Dtos;
 using Hotline.Share.Dtos.Dic;
 using Hotline.Share.Dtos.Menu;
+using Hotline.Share.Dtos.Settings;
 using Hotline.Share.Dtos.Trunk;
 using Hotline.Share.Requests;
 using MapsterMapper;
@@ -24,7 +25,8 @@ namespace Hotline.Api.Controllers
         private readonly ISystemMenuRepository _systemMenuRepository;
         private readonly ISysDicTypeRepository _sysDicTypeRepository;
         private readonly ISysDicDataRepository _sysDicDataRepository;
-        
+        private readonly ISystemAreaDomainService _systemAreaDomainService;
+
 
         /// <summary>
         /// 系统管理相关接口
@@ -39,13 +41,16 @@ namespace Hotline.Api.Controllers
             ISystemSettingRepository systemSettingsRepository,
             ISystemMenuRepository systemMenuRepository,
             ISysDicTypeRepository sysDicTypeRepository,
-            ISysDicDataRepository sysDicDataRepository)
+            ISysDicDataRepository sysDicDataRepository,
+            ISystemAreaDomainService systemAreaDomainService
+            )
         {
             _mapper = mapper;
             _systemSettingsRepository = systemSettingsRepository;
             _systemMenuRepository = systemMenuRepository;
             _sysDicTypeRepository = sysDicTypeRepository;
             _sysDicDataRepository = sysDicDataRepository;
+            _systemAreaDomainService = systemAreaDomainService;
         }
 
         #region 菜单管理
@@ -299,7 +304,85 @@ namespace Hotline.Api.Controllers
 
         #endregion
 
+        #region 行政区划
+
+        /// <summary>
+        /// 获取省市区树形
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("area/tree")]
+        public async Task<List<SystemArea>> GetAreaTree()
+        {
+            return await _systemAreaDomainService.GetAreaTree();
+        }
+
+        /// <summary>
+        /// 新增省市区
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [Permission(EPermission.AddArea)]
+        [HttpPost("area")]
+        public async Task AddArea([FromBody] AddAreaDto dto)
+        {
+            var model = _mapper.Map<SystemArea>(dto);
+            model.IsCanModify = true;
+            await _systemAreaDomainService.AddArea(model, HttpContext.RequestAborted);
+        }
+
+        /// <summary>
+        /// 修改省市区
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [Permission(EPermission.ModifyArea)]
+        [HttpPut("area")]
+        public async Task ModifyArea([FromBody] ModifyAreaDto dto)
+        {
+            var model = await _systemAreaDomainService.GetArea(dto.Id, HttpContext.RequestAborted);
+            if (model is null)
+                throw UserFriendlyException.SameMessage("未知数据，请刷新页面");
+            if (!model.IsCanModify)
+                throw UserFriendlyException.SameMessage("系统数据，不能修改");
+
+            model = _mapper.Map<SystemArea>(dto);
+            await _systemAreaDomainService.ModifyArea(model, HttpContext.RequestAborted);
+        }
+
+        /// <summary>
+        /// 删除省市区（逻辑）
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [Permission(EPermission.DelArea)]
+        [HttpDelete("area/{id}")]
+        public async Task DelArea(string id)
+        {
+            var model = await _systemAreaDomainService.GetArea(id, HttpContext.RequestAborted);
+            if (model is null)
+                throw UserFriendlyException.SameMessage("未知数据，请刷新页面");
+            if (!model.IsCanModify)
+                throw UserFriendlyException.SameMessage("系统数据不能删除");
+
+            await _systemAreaDomainService.DelArea(id, HttpContext.RequestAborted);
+        }
+
+        /// <summary>
+        /// 获取区域
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [Permission(EPermission.GetArea)]
+        [HttpGet("area/{id}")]
+        public async Task<SystemArea?> GetArea(string id)
+        {
+            var model = await _systemAreaDomainService.GetArea(id, HttpContext.RequestAborted);
+            if (model is null)
+                throw UserFriendlyException.SameMessage("未知数据，请刷新页面");
+            return model;
+        }
+
+        #endregion
 
-       
     }
 }

src/Hotline.Share/Dtos/Order/OrderComplainDto.cs

@@ -36,7 +36,7 @@ public class OrderComplainDto : OrderExtensionDto
     /// <summary>
     /// 诉求类型，多选
     /// </summary>
-    public List<EComplainType> ComplainTypes { get; set; } = new();
+    public List<IdName> ComplainTypes { get; set; } = new();
 
     #endregion
 }

src/Hotline.Share/Dtos/PositionDto.cs

@@ -43,6 +43,9 @@ namespace Hotline.Share.Dtos
         /// </summary>
         public string? Street { get; set; }
 
-        public string Address => $"{Province ?? string.Empty}{City ?? string.Empty}{County ?? string.Empty}{Street ?? string.Empty}";
+        /// <summary>
+        /// 完整地址
+        /// </summary>
+        public string Address { get; set; }
     }
 }

src/Hotline/Orders/Order.cs

@@ -452,6 +452,16 @@ namespace Hotline.Orders
         [SugarColumn(IsNullable = true)]
         public string? AcceptorStaffNo { get; set; }
 
+        /// <summary>
+        /// 受理人部门编码
+        /// </summary>
+        public string? AcceptorOrgCode { get; set; }
+
+        /// <summary>
+        /// 受理人部门名称
+        /// </summary>
+        public string? AcceptorOrgName { get; set; }
+
         #endregion
 
         #endregion

src/Hotline/Orders/OrderComplain.cs

@@ -1,4 +1,5 @@
-using Hotline.Share.Enums.Order;
+using Hotline.Share.Dtos;
+using Hotline.Share.Enums.Order;
 using SqlSugar;
 using XF.Domain.Repository;
 
@@ -46,7 +47,7 @@ public class OrderComplain : OrderExtensionEntity
     /// 诉求内容，多选
     /// </summary>
     [SugarColumn(ColumnDataType = "json", IsJson = true)]
-    public List<EComplainType> ComplainTypes { get; set; } = new();
+    public List<IdName> ComplainTypes { get; set; } = new();
 
     #endregion
 }

src/XF.Domain.Repository/Entity.cs

@@ -92,7 +92,7 @@ public abstract class SoftDeleteEntity : Entity, IHasDeletionTime, ISoftDelete
 /// </summary>
 public abstract class CreationSoftDeleteEntity : CreationEntity, IHasDeletionTime, ISoftDelete
 {
-    [SugarColumn(ColumnDescription = "是否删除",DefaultValue ="f")]
+    [SugarColumn(ColumnDescription = "是否删除", DefaultValue = "f")]
     public bool IsDeleted { get; set; }
 
     /// <summary>
@@ -196,6 +196,11 @@ public abstract class WorkflowEntity : FullStateEntity, IWorkflow
 
 public abstract class PositionEntity : FullStateEntity
 {
+    public PositionEntity()
+    {
+        Address ??= $"{Province ?? string.Empty}{City ?? string.Empty}{County ?? string.Empty}{Street ?? string.Empty}";
+    }
+
     /// <summary>
     /// 经度
     /// </summary>
@@ -226,8 +231,7 @@ public abstract class PositionEntity : FullStateEntity
     [SugarColumn(IsNullable = true)]
     public string? Street { get; set; }
 
-    [SugarColumn(IsIgnore = true)]
-    public string Address => $"{Province ?? string.Empty}{City ?? string.Empty}{County ?? string.Empty}{Street ?? string.Empty}";
+    public string Address { get; set; } //=> $"{Province ?? string.Empty}{City ?? string.Empty}{County ?? string.Empty}{Street ?? string.Empty}";
 }
 
 public abstract class PositionWorkflowEntity : PositionEntity, IWorkflow