src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -2996,7 +2996,7 @@ namespace Hotline.Api.Controllers.Bi
 
             foreach (var item in items)
             {
-                item.ZxAllTimes = Math.Round(((double)item.ZxAllTimes / 3600/24), 2);
+                item.ZxAllTimes = Math.Round(((double)item.ZxAllTimes / 3600 / 24), 2);
                 item.JyAllTimes = Math.Round(((double)item.JyAllTimes / 3600 / 24), 2);
                 item.QzAllTimes = Math.Round(((double)item.QzAllTimes / 3600 / 24), 2);
                 item.ByAllTimes = Math.Round(((double)item.ByAllTimes / 3600 / 24), 2);

src/Hotline.Api/Controllers/HotSpotController.cs

@@ -1,4 +1,5 @@
-using Hotline.Caching.Interfaces;
+using Hotline.Application.ExportExcel;
+using Hotline.Caching.Interfaces;
 using Hotline.FlowEngine;
 using Hotline.Repository.SqlSugar.Extensions;
 using Hotline.Settings;
@@ -6,6 +7,7 @@ using Hotline.Settings.Hotspots;
 using Hotline.Settings.TimeLimits;
 using Hotline.Share.Dtos;
 using Hotline.Share.Dtos.Hotspots;
+using Hotline.Share.Dtos.Order;
 using Hotline.Share.Dtos.Settings;
 using Hotline.Share.Enums.Order;
 using Hotline.Share.Enums.Settings;
@@ -31,9 +33,10 @@ namespace Hotline.Api.Controllers
         private readonly ITimeLimitRepository _timeLimitRepository;
         private readonly ISystemDicDataCacheManager _sysDicDataCacheManager;
         private readonly IEventCategoryRepository _eventCategoryRepository;
+        private readonly IExportApplication _exportApplication;
 
         public HotspotController(IRepository<Hotspot> hotspotTypeRepository,
-            IMapper mapper, ITimeLimitDomainService timeLimitDomainService, ITimeLimitRepository timeLimitRepository, ISystemDicDataCacheManager sysDicDataCacheManager, IEventCategoryRepository eventCategoryRepository)
+            IMapper mapper, ITimeLimitDomainService timeLimitDomainService, ITimeLimitRepository timeLimitRepository, ISystemDicDataCacheManager sysDicDataCacheManager, IEventCategoryRepository eventCategoryRepository, IExportApplication exportApplication)
         {
             _hotspotTypeRepository = hotspotTypeRepository;
             _mapper = mapper;
@@ -41,6 +44,7 @@ namespace Hotline.Api.Controllers
             _timeLimitRepository = timeLimitRepository;
             _sysDicDataCacheManager = sysDicDataCacheManager;
             _eventCategoryRepository = eventCategoryRepository;
+            _exportApplication = exportApplication;
         }
 
         #region 热点
@@ -129,6 +133,20 @@ namespace Hotline.Api.Controllers
                 .ToTreeAsync(x => x.Children, it => it.ParentId,null);
         }
 
+        /// <summary>
+        /// 事件导出
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost("event/tree/export")]
+        public async Task<FileStreamResult> GetEventAllTreeExport([FromBody]ExportExcelDto<string> dto)
+        {
+            var items = await _eventCategoryRepository.Queryable()
+                .OrderBy(d => d.OrderBy)
+                .ToTreeAsync(x => x.Children, it => it.ParentId, null);
+            return _exportApplication.GetExcelFile(dto, items, "事件");
+        }
+
         /// <summary>
         /// 查询子项
         /// </summary>

src/Hotline.Api/Controllers/OrderController.cs

@@ -5660,12 +5660,28 @@ public class OrderController : BaseController
             //string applicantId, string applicantOrgId, string[] applicantRoleIds,
             //    ISessionContext current, CancellationToken cancellationToken);
             sendBack.SendBackData.ExpiredTime = order.ExpiredTime;
-            var result = await _workflowApplication.PreviousAsync(sendBack.SendBackData, sendBack.WorkflowUserId,
-                sendBack.WorkflowOrgId, sendBack.WorkflowRoleIds.ToArray(),
-                cancellationToken: HttpContext.RequestAborted);
+            //var result = await _workflowApplication.PreviousAsync(sendBack.SendBackData, sendBack.WorkflowUserId,
+            //    sendBack.WorkflowOrgId, sendBack.WorkflowRoleIds.ToArray(),
+            //    cancellationToken: HttpContext.RequestAborted);
+
+            var (workflow, currentStep1, prevDefine, prevStep1, newStep, flowDirection) =
+                await _workflowApplication.PreviousAsync(sendBack.SendBackData,
+                    sendBack.WorkflowUserId, sendBack.WorkflowOrgId, sendBack.WorkflowRoleIds.ToArray(),
+                    async (workflow1, prevStepDefine, prevStep1, newStep) =>
+                    {
+                        var stepAssignInfo =
+                            await _orderApplication.GetOrderPreviousAssignInfoAsync(workflow1, prevStepDefine,
+                                prevStep1, HttpContext.RequestAborted);
+                        if (stepAssignInfo is null) return;
+                        var validator = new StepAssignInfoValidator();
+                        await validator.ValidateAndThrowAsync(stepAssignInfo);
+                        newStep.Assign(stepAssignInfo);
+                    },
+                    HttpContext.RequestAborted);
+
             //var flowDirection = await _workflowApplication.PreviousAsync(sendBack.SendBackData, sendBack.WorkflowUserId, HttpContext.RequestAborted);
-            var processType = result.flowDirection == EFlowDirection.OrgToCenter ||
-                              result.flowDirection == EFlowDirection.CenterToCenter
+            var processType = flowDirection == EFlowDirection.OrgToCenter ||
+                              flowDirection == EFlowDirection.CenterToCenter
                 ? EProcessType.Zhiban
                 : EProcessType.Jiaoban;
             if (sendBack.ApplyOrgId != OrgSeedData.CenterId && sendBack.SendBackOrgId == OrgSeedData.CenterId)
@@ -5674,8 +5690,8 @@ public class OrderController : BaseController
                 .Where(o => o.Id == sendBack.OrderId).ExecuteCommandAsync(HttpContext.RequestAborted);
 
             //记录退回后最新的流程节点
-            if (result.newStep != null && !string.IsNullOrEmpty(result.newStep.Id))
-                sendBack.NewCurrentStepId = result.newStep.Id;
+            if (newStep != null && !string.IsNullOrEmpty(newStep.Id))
+                sendBack.NewCurrentStepId = newStep.Id;
             //发送短信TODO
         }
         else
@@ -5739,11 +5755,27 @@ public class OrderController : BaseController
                 }
 
                 sendBack.SendBackData.ExpiredTime = order.ExpiredTime;
-                var result = await _workflowApplication.PreviousAsync(sendBack.SendBackData,
-                    sendBack.WorkflowUserId, sendBack.WorkflowOrgId, sendBack.WorkflowRoleIds.ToArray(),
-                    cancellationToken: HttpContext.RequestAborted);
+                //var result = await _workflowApplication.PreviousAsync(sendBack.SendBackData,
+                //    sendBack.WorkflowUserId, sendBack.WorkflowOrgId, sendBack.WorkflowRoleIds.ToArray(),
+                //    cancellationToken: HttpContext.RequestAborted);
                 //var flowDirection = await _workflowApplication.PreviousAsync(sendBack.SendBackData, sendBack.WorkflowUserId, HttpContext.RequestAborted);
-                var processType = result.flowDirection == EFlowDirection.OrgToCenter || result.flowDirection == EFlowDirection.CenterToCenter
+
+                var (workflow, currentStep1, prevDefine, prevStep1, newStep, flowDirection) =
+                    await _workflowApplication.PreviousAsync(sendBack.SendBackData,
+                        sendBack.WorkflowUserId, sendBack.WorkflowOrgId, sendBack.WorkflowRoleIds.ToArray(),
+                        async (workflow1, prevStepDefine, prevStep1, newStep) =>
+                        {
+                            var stepAssignInfo =
+                                await _orderApplication.GetOrderPreviousAssignInfoAsync(workflow1, prevStepDefine,
+                                    prevStep1, HttpContext.RequestAborted);
+                            if (stepAssignInfo is null) return;
+                            var validator = new StepAssignInfoValidator();
+                            await validator.ValidateAndThrowAsync(stepAssignInfo);
+                            newStep.Assign(stepAssignInfo);
+                        },
+                        HttpContext.RequestAborted);
+
+                var processType = flowDirection == EFlowDirection.OrgToCenter || flowDirection == EFlowDirection.CenterToCenter
                     ? EProcessType.Zhiban
                     : EProcessType.Jiaoban;
                 if (sendBack.ApplyOrgId != OrgSeedData.CenterId && sendBack.SendBackOrgId == OrgSeedData.CenterId)
@@ -5752,8 +5784,8 @@ public class OrderController : BaseController
                     .Where(o => o.Id == sendBack.OrderId).ExecuteCommandAsync(HttpContext.RequestAborted);
 
                 //记录退回后最新的流程节点
-                if (result.newStep != null && !string.IsNullOrEmpty(result.newStep.Id))
-                    sendBack.NewCurrentStepId = result.newStep.Id;
+                if (newStep != null && !string.IsNullOrEmpty(newStep.Id))
+                    sendBack.NewCurrentStepId = newStep.Id;
                 //发送短信TODO
             }
             else
@@ -6490,7 +6522,16 @@ public class OrderController : BaseController
         var order = await _orderRepository.GetAsync(x => x.Id == special.OrderId);
         if (special.State == 1)
         {
-            await _orderApplication.RecallAsync(dto, special, order, HttpContext.RequestAborted);
+            var (workflow, targetStepDefine, currentStep, targetStep, newStep, isOrgToCenter) = 
+                await _orderApplication.RecallAsync(dto, special, order, HttpContext.RequestAborted);
+
+            if (string.IsNullOrEmpty(currentStep?.HandlerOrgId))
+            {
+                special.OrgId = currentStep.HandlerOrgId;
+                special.OrgName = currentStep.HandlerOrgName;
+                special.StepName = currentStep.Name;
+                special.StepCode = currentStep.Code;
+            }
 
             if (order.Status >= EOrderStatus.Filed)
             {
@@ -6549,12 +6590,12 @@ public class OrderController : BaseController
     [LogFilter("批量审批工单特提")]
     public async Task UpdateBatch([FromBody] BatchAuditOrderSpecialDto dto)
     {
-        foreach (string id in dto.ids)
+        var specials = await _orderSpecialRepository.Queryable()
+            .Includes(d => d.Order)
+            .Where(d => dto.ids.Contains(d.Id))
+            .ToListAsync(HttpContext.RequestAborted);
+        foreach (var special in specials)
         {
-            var special = await _orderSpecialRepository
-                .Queryable()
-                .Includes(d => d.Order)
-                .FirstAsync(d => d.Id == id);
             if (special is null) throw UserFriendlyException.SameMessage("无效特提审批信息！");
             if (special.State != 0) throw UserFriendlyException.SameMessage("无效特提审批信息,特提审批信息错误,该信息已审核！");
             special.State = dto.State;
@@ -6563,10 +6604,13 @@ public class OrderController : BaseController
                 special.ReplyFileJson = await _fileRepository.AddFileAsync(dto.Files, special.Id, "", HttpContext.RequestAborted);
             else
                 special.ReplyFileJson = new List<Share.Dtos.File.FileJson>();
-
-            var order = await _orderRepository.GetAsync(x => x.Id == special.OrderId);
+            
+            //var order = await _orderRepository.GetAsync(x => x.Id == special.OrderId);
+            var order = special.Order;
             if (special.State == 1)
             {
+                #region MyRegion
+
                 //var recall = new RecallDto
                 //{
                 //    WorkflowId = special.WorkflowId!,
@@ -6653,8 +6697,19 @@ public class OrderController : BaseController
                 //        .ExecuteCommandAsync(HttpContext.RequestAborted);
                 //}
 
+                #endregion
+
+                var (workflow, targetStepDefine, currentStep, targetStep, newStep, isOrgToCenter) =
                 await _orderApplication.RecallAsync(dto, special, order, HttpContext.RequestAborted);
 
+                if (string.IsNullOrEmpty(currentStep?.HandlerOrgId))
+                {
+                    special.OrgId = currentStep.HandlerOrgId;
+                    special.OrgName = currentStep.HandlerOrgName;
+                    special.StepName = currentStep.Name;
+                    special.StepCode = currentStep.Code;
+                }
+
                 if (order.Status >= EOrderStatus.Filed)
                 {
                     var publish = await _orderPublishRepository.GetAsync(x => x.OrderId == special.OrderId);
@@ -6701,8 +6756,10 @@ public class OrderController : BaseController
                     .Where(o => o.Id == order.Id).ExecuteCommandAsync(HttpContext.RequestAborted);
             }
 
-            await _orderSpecialRepository.UpdateAsync(special, HttpContext.RequestAborted);
+            //await _orderSpecialRepository.UpdateAsync(special, HttpContext.RequestAborted);
         }
+
+        await _orderSpecialRepository.UpdateRangeAsync(specials, HttpContext.RequestAborted);
     }
 
     /// <summary>

src/Hotline.Api/Controllers/OrgController.cs

@@ -1,6 +1,11 @@
-using Hotline.Configurations;
+using Hotline.Api.Filter;
+using Hotline.Caching.Interfaces;
+using Hotline.Application.ExportExcel;
+using Hotline.Application.Users;
+using Hotline.Configurations;
 using Hotline.Permissions;
 using Hotline.Settings;
+using Hotline.Share.Dtos.Order;
 using Hotline.Share.Dtos.Org;
 using Hotline.Share.Enums.Order;
 using MapsterMapper;
@@ -25,6 +30,8 @@ namespace Hotline.Api.Controllers
         private readonly IMapper _mapper;
         private readonly ISessionContext _sessionContext;
 		private readonly IOptionsSnapshot<AppConfiguration> _appOptions;
+        private readonly IOrgApplication _orgApplication;
+        private readonly IExportApplication _exportApplication;
 
         public OrgController(
             ISystemOrganizeRepository systemOrganizeRepository,
@@ -32,7 +39,9 @@ namespace Hotline.Api.Controllers
             ISystemAreaDomainService areaDomainService,
             IMapper mapper,
             ISessionContext sessionContext,
-            IOptionsSnapshot<AppConfiguration> appOptions)
+            IOptionsSnapshot<AppConfiguration> appOptions,
+            IOrgApplication orgApplication,
+            IExportApplication exportApplication)
         {
             _systemOrganizeRepository = systemOrganizeRepository;
             _systemDomainService = systemDomainService;
@@ -40,6 +49,8 @@ namespace Hotline.Api.Controllers
             _mapper = mapper;
             _sessionContext = sessionContext;
             _appOptions = appOptions;
+            _orgApplication = orgApplication;
+            _exportApplication = exportApplication;
         }
 
         /// <summary>
@@ -55,18 +66,20 @@ namespace Hotline.Api.Controllers
 
         [HttpGet("getorgjsonforuser")]
         [AllowAnonymous]
-        public async Task<IReadOnlyList<SystemOrganize>> GetOrgJsonForUser()
+        public async Task<IReadOnlyList<SystemOrganize>> GetOrgJsonItems()
         {
-            if (_sessionContext.OrgIsCenter)
-            {
-                return await _systemOrganizeRepository.GetOrgJson();
-            }
-            else
-            {
-                return await _systemOrganizeRepository.GetOrgJsonForUser(_sessionContext.RequiredOrgId);
-            }
+            return await _orgApplication.GetOrgJsonItems();
         }
 
+        [HttpPost("getorgjsonforuser/export")]
+        [AllowAnonymous]
+        public async Task<FileStreamResult> GetOrgJsonItemsExport([FromBody] ExportExcelDto<string> dto)
+        {
+            var items = await _orgApplication.GetOrgJsonItems();
+            return _exportApplication.GetExcelFile(dto, items.ToList(), "组织架构");
+        }
+
+
         ///// <summary>
         ///// 新增组织架构
         ///// </summary>
@@ -154,6 +167,25 @@ namespace Hotline.Api.Controllers
             await _systemOrganizeRepository.UpdateAsync(org, HttpContext.RequestAborted);
         }
 
+        /// <summary>
+        /// 删除组织数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpDelete("delete-org/{id}")]
+        [LogFilter("删除组织")]
+        public async Task DeleteOrg(string id)
+        {
+            var org = await _systemOrganizeRepository.GetAsync(id, HttpContext.RequestAborted);
+            if (org is null)
+                throw UserFriendlyException.SameMessage("无效组织架构");
+           var chail= await _systemOrganizeRepository.AnyAsync(p => p.ParentId == org.Id);
+            if(chail==true)
+                throw UserFriendlyException.SameMessage("存在下级部门，请先删除下级部门数据！");
+
+            await _systemOrganizeRepository.RemoveAsync(org, true, HttpContext.RequestAborted);
+        }
+
         /// <summary>
         /// 获取组织
         /// </summary>

src/Hotline.Api/Controllers/RoleController.cs

@@ -1,4 +1,5 @@
 using Fw.Utility.UnifyResponse;
+using Hotline.Application.Users;
 using Hotline.Caching.Interfaces;
 using Hotline.Identity.Roles;
 using Hotline.Permissions;
@@ -12,6 +13,7 @@ using Hotline.Share.Enums.Identity;
 using Hotline.Share.Enums.Order;
 using Hotline.Share.Enums.Settings;
 using Hotline.Share.Enums.User;
+using Hotline.Share.Tools;
 using MapsterMapper;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
@@ -39,6 +41,7 @@ public class RoleController : BaseController
     private readonly IOptions<IdentityConfiguration> _identityConfigurationAccessor;
     private readonly IRepository<SystemDataTable> _systemDataTableRepository;
     private readonly ISessionContext _sessionContext;
+    private readonly IRoleApplication _roleApplication;
 
     public RoleController(
         IRepository<Role> roleRepository,
@@ -50,7 +53,8 @@ public class RoleController : BaseController
         IMapper mapper,
         IOptions<IdentityConfiguration> identityConfigurationAccessor,
         IRepository<SystemDataTable> systemDataTableRepository,
-        ISessionContext sessionContext)
+        ISessionContext sessionContext,
+        IRoleApplication roleApplication)
     {
         _roleRepository = roleRepository;
         _systemAuthorityRepository = systemAuthorityRepository;
@@ -62,6 +66,7 @@ public class RoleController : BaseController
         _identityConfigurationAccessor = identityConfigurationAccessor;
         _systemDataTableRepository = systemDataTableRepository;
         _sessionContext = sessionContext;
+        _roleApplication = roleApplication;
     }
 
     /// <summary>
@@ -70,22 +75,9 @@ public class RoleController : BaseController
     /// <param name="dto"></param>
     /// <returns></returns>
     [HttpGet("paged")]
-    public async Task<PagedDto<RoleDto>> QueryPaged([FromQuery] QueryRolesPagedDto dto)
+    public async Task<PagedDto<RoleDto>> GetRuleItems([FromQuery] QueryRolesPagedDto dto)
     {
-        var query = _roleRepository.Queryable(includeDeleted: true);
-        if (dto.IsDeleted.HasValue)
-            query = query.Where(d => d.IsDeleted == dto.IsDeleted);
-
-        var (total, items) = await query
-            .Includes(d => d.Accounts.Where(x => !x.IsDeleted && x.Status == EAccountStatus.Normal).ToList())
-            .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Name.Contains(dto.Keyword!) || d.DisplayName.Contains(dto.Keyword!))
-            .WhereIF(_sessionContext.OrgIsCenter==false,d=>d.RoleType == ERoleType.OrgRole)
-            .Where(x=>x.Id != RoleSeedData.AdminId)
-            .OrderBy(d => d.IsDeleted)
-            .OrderByDescending(d => d.CreationTime)
-            .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
-
-        return new PagedDto<RoleDto>(total, _mapper.Map<IReadOnlyList<RoleDto>>(items));
+        return (await _roleApplication.GetRuleItems(dto).ToPagedListAsync(dto)).ToPaged();
     }
 
     /// <summary>

src/Hotline.Api/Controllers/SysController.cs

@@ -1,4 +1,6 @@
 using EasyCaching.Core;
+using Hotline.Application.ExportExcel;
+using Hotline.Api.Filter;
 using Hotline.Application.Systems;
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Ivrs;
@@ -14,6 +16,7 @@ using Hotline.Settings.CommonOpinions;
 using Hotline.Share.Dtos;
 using Hotline.Share.Dtos.Dic;
 using Hotline.Share.Dtos.Menu;
+using Hotline.Share.Dtos.Order;
 using Hotline.Share.Dtos.Settings;
 using Hotline.Share.Enums.Settings;
 using Hotline.Share.Requests;
@@ -58,6 +61,8 @@ namespace Hotline.Api.Controllers
         private readonly IRedisCachingProvider _redisCaching;
         private readonly IEasyCachingProvider _easyCaching;
         private readonly IOptionsSnapshot<AppConfiguration> _appOptions;
+        private readonly ISystemLogApplication _systemLogApplication;
+        private readonly IExportApplication _exportApplication;
 
         /// <summary>
         /// 系统管理相关接口
@@ -93,7 +98,9 @@ namespace Hotline.Api.Controllers
             IRedisCachingProvider redisCaching,
             IEasyCachingProvider easyCaching
 ,
-            IOptionsSnapshot<AppConfiguration> appOptions)
+            IOptionsSnapshot<AppConfiguration> appOptions,
+            ISystemLogApplication systemLogApplication,
+            IExportApplication exportApplication)
         {
             _mapper = mapper;
             _systemSettingsRepository = systemSettingsRepository;
@@ -112,6 +119,8 @@ namespace Hotline.Api.Controllers
             _redisCaching = redisCaching;
             _easyCaching = easyCaching;
             _appOptions = appOptions;
+            _systemLogApplication = systemLogApplication;
+            _exportApplication = exportApplication;
         }
 
         #region 菜单管理
@@ -292,6 +301,18 @@ namespace Hotline.Api.Controllers
             //return await _sysDicDataRepository.Queryable().Where(x => x.DicTypeId == dto.typeid).WhereIF(!string.IsNullOrEmpty(dto.datavalue), x => x.DicDataValue.Contains(dto.datavalue)).WhereIF(!string.IsNullOrEmpty(dto.ParentId), x => x.ParentId == dto.ParentId).ToListAsync();
         }
 
+        /// <summary>
+        /// 根据字典类型ID获取字典列表
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost("dictdata-type/export")]
+        public async Task<FileStreamResult> GetSysDicDataExport([FromBody]ExportExcelDto<GetSysDicDataDto> dto)
+        {
+            var items = await _sysDicDataRepository.Queryable().Where(x => x.DicTypeId == dto.QueryDto.typeid).OrderBy(x => x.Sort).ToTreeAsync(x => x.Children, x => x.ParentId, "");
+            return _exportApplication.GetExcelFile(dto, items, "字典列表");
+        }
+
         /// <summary>
         /// 根据字典类型Code获取字典列表
         /// </summary>
@@ -355,6 +376,28 @@ namespace Hotline.Api.Controllers
             await _sysDicDataRepository.UpdateAsync(dicData, HttpContext.RequestAborted);
         }
 
+        /// <summary>
+        /// 删除字典数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpDelete("delete-dicdata/{id}")]
+        [LogFilter("删除字典")]
+        public async Task DeleteDicData(string id)
+        {
+            var dicData = await _sysDicDataRepository.GetAsync(id, HttpContext.RequestAborted);
+            if (dicData is null)
+                throw UserFriendlyException.SameMessage("无效字典数据");
+            var chail = await _sysDicDataRepository.AnyAsync(p => p.ParentId == id, HttpContext.RequestAborted);
+            if(chail==true)
+                throw UserFriendlyException.SameMessage("存在下级数据，请先删除下级数据！");
+
+            var dicType = await _sysDicTypeRepository.GetAsync(dicData.DicTypeId, HttpContext.RequestAborted);
+            if (dicType != null)
+                _systemDicDataCacheManager.RemoveSysDicDataCache(dicType.DicTypeCode);
+            await _sysDicDataRepository.RemoveAsync(dicData, true, HttpContext.RequestAborted);
+        }
+
         #endregion
 
         #region 行政区划
@@ -369,6 +412,17 @@ namespace Hotline.Api.Controllers
             return await _systemAreaDomainService.GetAreaTree(_appOptions.Value.IsZiGong ? 6 : 0);
         }
 
+        /// <summary>
+        /// 获取省市区树形
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("area/tree/export")]
+        public async Task<FileStreamResult> GetAreaTreeExport([FromBody]ExportExcelDto<string> dto)
+        {
+            var items = await _systemAreaDomainService.GetAreaTree(_appOptions.Value.IsZiGong ? 6 : 0);
+            return _exportApplication.GetExcelFile(dto, items, "行政区域");
+        }
+
         /// <summary>
         /// 新增省市区
         /// </summary>
@@ -565,34 +619,17 @@ namespace Hotline.Api.Controllers
         /// <param name="dto"></param>
         /// <returns></returns>
         [HttpGet("log_list")]
-        public async Task<PagedDto<SystemLogDto>> List([FromQuery] SysLogPagedKeywordRequest dto)
-        {
-            var (total, items) = await _systemLogRepository.Queryable()
-                .WhereIF(dto.IsAll.HasValue && !dto.IsAll.Value, x => !string.IsNullOrEmpty(x.Name))
-                .WhereIF(!string.IsNullOrEmpty(dto.Name), x => x.Name.Contains(dto.Name))
-                .WhereIF(!string.IsNullOrEmpty(dto.CreatorName), x => x.CreatorName.Contains(dto.CreatorName))
-                .WhereIF(!string.IsNullOrEmpty(dto.ExecuteUrl), x => x.ExecuteUrl.Contains(dto.ExecuteUrl))
-                .WhereIF(!string.IsNullOrEmpty(dto.ExecuteParam),
-                    x => SqlFunc.JsonLike(x.ExecuteParam, dto.ExecuteParam))
-                .WhereIF(dto.StartTime.HasValue && dto.EndTime.HasValue,
-                    x => x.CreationTime >= dto.StartTime && x.CreationTime <= dto.EndTime)
-                                //.WhereIF(!string.IsNullOrEmpty(dto.Keyword), x => x.Name.Contains(dto.Keyword!) || x.CreatorName.Contains(dto.Keyword!))
-                .Select(x => new SystemLogDto
-                {
-                    ExecuteParam = x.ExecuteParam
-                }, true)
-                .OrderByDescending(x => x.CreationTime)
-                .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
-            return new PagedDto<SystemLogDto>(total, items);
-
+        public async Task<PagedDto<SystemLogDto>> GetSystemLotItems([FromQuery] SysLogPagedKeywordRequest dto)
+        {
+            return (await _systemLogApplication.GetSystemLotItems(dto).ToPagedListAsync(dto)).ToPaged();
         }
 
-		/// <summary>
-		/// 获取日志实体
-		/// </summary>
-		/// <param name="id"></param>
-		/// <returns></returns>
-		[HttpGet("log/{id}")]
+        /// <summary>
+        /// 获取日志实体
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet("log/{id}")]
         public async Task<SystemLogDto> ItemEntity(string id)
         {
             var log = await _systemLogRepository.Queryable()

src/Hotline.Application/Orders/IOrderApplication.cs

@@ -423,6 +423,7 @@ namespace Hotline.Application.Orders
         /// <summary>
         /// 工单特提
         /// </summary>
-        Task<Order> RecallAsync(AuditOrderSpecialDto dto, OrderSpecial special, Order? order, CancellationToken cancellation);
+        Task<(Workflow, StepDefine, WorkflowStep, WorkflowStep, WorkflowStep, bool)> RecallAsync
+            (AuditOrderSpecialDto dto, OrderSpecial special, Order? order, CancellationToken cancellation);
     }
 }

src/Hotline.Application/Orders/OrderApplication.cs

@@ -4013,7 +4013,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
     /// <summary>
     /// 工单特提
     /// </summary>
-    public async Task<Order> RecallAsync(AuditOrderSpecialDto dto, OrderSpecial special, Order? order, CancellationToken cancellation)
+    public async Task<(Workflow, StepDefine, WorkflowStep, WorkflowStep, WorkflowStep, bool)> RecallAsync
+        (AuditOrderSpecialDto dto, OrderSpecial special, Order? order, CancellationToken cancellation)
     {
         var recall = new RecallDto
         {
@@ -4067,7 +4068,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
 
         //todo 特提重办，按审批通过时间依据中心派至部门的规则计算期满时间，更新order
 
-        var (workflow, targetStepDefine, currentStep, targetStep, newStep, isOrgToCenter) = await _workflowDomainService.RecallAsync(
+        var (workflow, targetStepDefine, currentStep, targetStep, newStep, isOrgToCenter) = 
+            await _workflowDomainService.RecallAsync(
             recall, recall.NextHandlers.FirstOrDefault(), EWorkflowTraceType.Recall,
             order.ExpiredTime, order.Status >= EOrderStatus.Filed, EHandleMode.Recall,
             async (workflow, currentStep, targetStepDefine, targetStep, targetStepNew) =>
@@ -4100,7 +4102,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
 
         await _orderRepository.UpdateAsync(order, cancellation);
 
-        return order;
+        return (workflow, targetStepDefine, currentStep, targetStep, newStep, isOrgToCenter);
     }
 
     #region private

src/Hotline.Application/Quality/QualityApplication.cs

@@ -404,7 +404,7 @@ namespace Hotline.Application.Quality
 
 			var quality = await _qualityRepository.Queryable().Includes(x => x.Order).Where(x => x.Id == Id).FirstAsync();
 			var call = await _callApplication.GetCallAsync(quality.Order.CallId, cancellationToken);
-			var items = await _qualiteyItem.Queryable().Where(x => x.IsEnable == 1 && x.IsDeleted == false && x.IsIntelligent == 1).ToListAsync();
+			var items = await _qualiteyItem.Queryable().Where(x => x.IsEnable == 1 && x.IsDeleted == false && x.IsIntelligent == 1).ToListAsync(cancellationToken);
 
 			var transfers = new List<Transfer>();
 			if (!string.IsNullOrEmpty(call?.AudioFile))

src/Hotline.Application/Systems/ISystemLogApplication.cs

@@ -1,4 +1,7 @@
-using Microsoft.AspNetCore.Http;
+using Hotline.Share.Dtos.Settings;
+using Hotline.Share.Requests;
+using Microsoft.AspNetCore.Http;
+using SqlSugar;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,5 +16,6 @@ namespace Hotline.Application.Systems
 
 		Task<bool> HasByIpUrlAsync(string ipUrl);
 
+		ISugarQueryable<SystemLogDto> GetSystemLotItems(SysLogPagedKeywordRequest dto);
     }
 }

src/Hotline.Application/Systems/SystemLogApplication.cs

@@ -1,10 +1,14 @@
 using Hotline.Settings;
+using Hotline.Share.Attributes;
+using Hotline.Share.Dtos.Settings;
+using Hotline.Share.Requests;
 using Hotline.Tools;
 using MapsterMapper;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using Org.BouncyCastle.Asn1.Ocsp;
+using SqlSugar;
 using System.Text;
 using XF.Domain.Dependency;
 using XF.Domain.Repository;
@@ -47,6 +51,27 @@ namespace Hotline.Application.Systems
         public async Task<bool> HasByIpUrlAsync(string ipUrl)
         {
 			return await _systemLogRepository.Queryable().Where(x => x.IpUrl == ipUrl).AnyAsync();
+        }
+
+		[ExportExcel("操作日志")]
+        public ISugarQueryable<SystemLogDto> GetSystemLotItems(SysLogPagedKeywordRequest dto)
+		{
+			var query =  _systemLogRepository.Queryable()
+				.WhereIF(dto.IsAll.HasValue && !dto.IsAll.Value, x => !string.IsNullOrEmpty(x.Name))
+				.WhereIF(!string.IsNullOrEmpty(dto.Name), x => x.Name.Contains(dto.Name))
+				.WhereIF(!string.IsNullOrEmpty(dto.CreatorName), x => x.CreatorName.Contains(dto.CreatorName))
+				.WhereIF(!string.IsNullOrEmpty(dto.ExecuteUrl), x => x.ExecuteUrl.Contains(dto.ExecuteUrl))
+				.WhereIF(!string.IsNullOrEmpty(dto.ExecuteParam),
+					x => SqlFunc.JsonLike(x.ExecuteParam, dto.ExecuteParam))
+				.WhereIF(dto.StartTime.HasValue && dto.EndTime.HasValue,
+					x => x.CreationTime >= dto.StartTime && x.CreationTime <= dto.EndTime)
+				//.WhereIF(!string.IsNullOrEmpty(dto.Keyword), x => x.Name.Contains(dto.Keyword!) || x.CreatorName.Contains(dto.Keyword!))
+				.Select(x => new SystemLogDto
+				{
+					ExecuteParam = x.ExecuteParam
+				}, true)
+				.OrderByDescending(x => x.CreationTime);
+			return query;
         }
     }
 }

src/Hotline.Application/Users/IOrgApplication.cs

@@ -0,0 +1,13 @@
+using Hotline.Settings;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Hotline.Application.Users;
+public interface IOrgApplication
+{
+    Task<IReadOnlyList<SystemOrganize>> GetOrgJsonItems();
+}

src/Hotline.Application/Users/IRoleApplication.cs

@@ -0,0 +1,13 @@
+using Hotline.Share.Dtos.Roles;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Hotline.Application.Users;
+public interface IRoleApplication
+{
+    ISugarQueryable<RoleDto> GetRuleItems(QueryRolesPagedDto dto);
+}

src/Hotline.Application/Users/OrgApplication.cs

@@ -0,0 +1,35 @@
+using Hotline.Repository.SqlSugar.System;
+using Hotline.Settings;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using XF.Domain.Authentications;
+using XF.Domain.Dependency;
+
+namespace Hotline.Application.Users;
+public class OrgApplication : IOrgApplication, IScopeDependency
+{
+    private readonly ISystemOrganizeRepository _systemOrganizeRepository;
+    private readonly ISessionContext _sessionContext;
+
+    public OrgApplication(ISystemOrganizeRepository systemOrganizeRepository, ISessionContext sessionContext)
+    {
+        _systemOrganizeRepository = systemOrganizeRepository;
+        _sessionContext = sessionContext;
+    }
+
+    public async Task<IReadOnlyList<SystemOrganize>> GetOrgJsonItems()
+    {
+        if (_sessionContext.OrgIsCenter)
+        {
+            return await _systemOrganizeRepository.GetOrgJson();
+        }
+        else
+        {
+            return await _systemOrganizeRepository.GetOrgJsonForUser(_sessionContext.RequiredOrgId);
+        }
+    }
+}

src/Hotline.Application/Users/RoleApplication.cs

@@ -0,0 +1,48 @@
+using Hotline.Identity.Roles;
+using Hotline.SeedData;
+using Hotline.Share.Attributes;
+using Hotline.Share.Dtos;
+using Hotline.Share.Dtos.Roles;
+using Hotline.Share.Enums.Identity;
+using Hotline.Share.Enums.User;
+using Microsoft.AspNetCore.Http;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using XF.Domain.Authentications;
+using XF.Domain.Dependency;
+using XF.Domain.Repository;
+
+namespace Hotline.Application.Users;
+public class RoleApplication : IRoleApplication, IScopeDependency
+{
+    private readonly IRepository<Role> _roleRepository;
+    private readonly ISessionContext _sessionContext;
+
+    public RoleApplication(IRepository<Role> roleRepository, ISessionContext sessionContext)
+    {
+        _roleRepository = roleRepository;
+        _sessionContext = sessionContext;
+    }
+
+    [ExportExcel("角色")]
+    public ISugarQueryable<RoleDto> GetRuleItems(QueryRolesPagedDto dto)
+    {
+        var query = _roleRepository.Queryable(includeDeleted: true);
+        if (dto.IsDeleted.HasValue)
+            query = query.Where(d => d.IsDeleted == dto.IsDeleted);
+
+        var roleQuery = query
+            .Includes(d => d.Accounts.Where(x => !x.IsDeleted && x.Status == EAccountStatus.Normal).ToList())
+            .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Name.Contains(dto.Keyword!) || d.DisplayName.Contains(dto.Keyword!))
+            .WhereIF(_sessionContext.OrgIsCenter == false, d => d.RoleType == ERoleType.OrgRole)
+            .Where(x => x.Id != RoleSeedData.AdminId)
+            .OrderBy(d => d.IsDeleted)
+            .OrderByDescending(d => d.CreationTime)
+            .Select<RoleDto>();
+        return roleQuery;
+    }
+}

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

@@ -139,7 +139,9 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public double AllDuration { get; set; }
 
-
+        /// <summary>
+        /// 全流程时长小时
+        /// </summary>
         public string AllDurationHour => GetAllDurationHour();
 
         public string GetAllDurationHour()

src/Hotline/FlowEngine/Workflows/IWorkflowDomainService.cs

@@ -90,8 +90,8 @@ namespace Hotline.FlowEngine.Workflows
         /// 退回（new）
         /// </summary>
         Task<(Workflow workflow, WorkflowStep currentStep, StepDefine prevDefine, 
-            WorkflowStep prevStep, WorkflowStep newStep, EFlowDirection flowDirection)> 
-            PreviousAsync(Workflow workflow, PreviousWorkflowDto dto, OperatorInfo operatorInfo,
+            WorkflowStep prevStep, WorkflowStep newStep, EFlowDirection flowDirection)> PreviousAsync
+            (Workflow workflow, PreviousWorkflowDto dto, OperatorInfo operatorInfo,
             Action<Workflow, StepDefine, WorkflowStep, WorkflowStep>? stepConfig = null,
             CancellationToken cancellationToken = default);
 

src/Hotline/Orders/Order.cs

@@ -173,32 +173,32 @@ namespace Hotline.Orders
         [SugarColumn(ColumnDescription = "标题")]
         public string Title { get; set; }
 
-		#region 工单标签（自贡）
-		/// <summary>
-		/// 工单标签（自贡）-- 弃用
-		/// </summary>
-		[SugarColumn(ColumnDescription = "工单标签-- 弃用")]
-		public string? OrderTag { get; set; }
+        #region 工单标签（自贡）
+        /// <summary>
+        /// 工单标签（自贡）-- 弃用
+        /// </summary>
+        [SugarColumn(ColumnDescription = "工单标签-- 弃用")]
+        public string? OrderTag { get; set; }
 
-		[SugarColumn(ColumnDescription = "工单标签代码-- 弃用")]
-		public string? OrderTagCode { get; set; }
+        [SugarColumn(ColumnDescription = "工单标签代码")]
+        public string? OrderTagCode { get; set; }
 
 
 
-		/// <summary>
-		/// 工单标签
-		/// </summary>
-		[Navigate(typeof(OrderRelationTag), nameof(OrderRelationTag.OrderId), nameof(OrderRelationTag.TagId))]
-		public List<SystemDicData> OrderTags { get; set; }
+        /// <summary>
+        /// 工单标签
+        /// </summary>
+        [Navigate(typeof(OrderRelationTag), nameof(OrderRelationTag.OrderId), nameof(OrderRelationTag.TagId))]
+        public List<SystemDicData> OrderTags { get; set; }
 
-		#endregion
+        #endregion
 
-		#region 热点
+        #region 热点
 
-		/// <summary>
-		/// 热点
-		/// </summary>
-		[SugarColumn(ColumnDescription = "热点ID")]
+        /// <summary>
+        /// 热点
+        /// </summary>
+        [SugarColumn(ColumnDescription = "热点ID")]
         public string? HotspotId { get; set; }
 
         //public string? HotspotCode { get; set; }

src/Hotline/Orders/OrderSpecial.cs

@@ -101,12 +101,6 @@ namespace Hotline.Orders
 
 		public string? OrgName { get; set; }
 
-        /// <summary>
-        /// 工单
-        /// </summary>
-        [Navigate(NavigateType.OneToOne, nameof(OrderId))]
-        public Order Order { get; set; }
-
         [SugarColumn(ColumnDataType = "json", IsJson = true, IsNullable = true)]
         public List<FileJson>? FileJson { get; set; }
 
@@ -142,6 +136,12 @@ namespace Hotline.Orders
         /// </summary>
         [SugarColumn(ColumnDescription = "特提后最新节点Id")]
         public string? NewCurrentStepId { get; set; }
+
+        /// <summary>
+        /// 工单
+        /// </summary>
+        [Navigate(NavigateType.OneToOne, nameof(OrderId))]
+        public Order Order { get; set; }
     }
 
     //public class ReTransactError { 

src/Hotline/Settings/SystemDomainService.cs

@@ -124,7 +124,7 @@ public class SystemDomainService : ISystemDomainService, IScopeDependency
         if (string.IsNullOrEmpty(dto.ParentId))
         {
             //一级部门
-            var maxCode = await _organizeRepository.Queryable()
+            var maxCode = await _organizeRepository.Queryable(includeDeleted:true)
                 .Where(d => d.Level == 1)
                 .MaxAsync(d => d.Id, cancellationToken);
 
@@ -151,7 +151,7 @@ public class SystemDomainService : ISystemDomainService, IScopeDependency
             if (parentOrg == null)
                 throw new UserFriendlyException("无效上级部门编码");
 
-            var maxCode = await _organizeRepository.Queryable()
+            var maxCode = await _organizeRepository.Queryable(includeDeleted:true)
                 .Where(d => d.ParentId == dto.ParentId)
                 .MaxAsync(d => d.Id, cancellationToken);