src/Hotline.Api/Controllers/CommonPController.cs

@@ -1,5 +1,5 @@
-using Hotline.Orders;
-using Hotline.Settings;
+using Hotline.Settings;
+using Hotline.Settings.CommonOpinions;
 using Hotline.Share.Dtos.Order;
 using MapsterMapper;
 using Microsoft.AspNetCore.Mvc;

src/Hotline.Api/Controllers/HotSpotController.cs

@@ -1,4 +1,4 @@
-using Hotline.Orders;
+using Hotline.Settings.Hotspots;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 

src/Hotline.Api/Controllers/OrderController.cs

@@ -4,6 +4,7 @@ using Hotline.FlowEngine.Workflows;
 using Hotline.Orders;
 using Hotline.Repository.SqlSugar.Extensions;
 using Hotline.Settings;
+using Hotline.Settings.Hotspots;
 using Hotline.Share.Dtos;
 using Hotline.Share.Dtos.FlowEngine;
 using Hotline.Share.Dtos.Order;

src/Hotline.Repository.SqlSugar/Orders/CommonOpinionRepository.cs

@@ -1,5 +1,5 @@
-using Hotline.Orders;
-using Hotline.Repository.SqlSugar.DataPermissions;
+using Hotline.Repository.SqlSugar.DataPermissions;
+using Hotline.Settings.CommonOpinions;
 using SqlSugar;
 using XF.Domain.Dependency;
 

src/Hotline.Repository.SqlSugar/Orders/HotSpotTypeRepository.cs

@@ -1,6 +1,6 @@
 using Hotline.CallCenter.BlackLists;
-using Hotline.Orders;
 using Hotline.Repository.SqlSugar.DataPermissions;
+using Hotline.Settings.Hotspots;
 using SqlSugar;
 using XF.Domain.Dependency;
 

src/Hotline.Repository.SqlSugar/Orders/OrderRepository.cs

@@ -27,6 +27,9 @@ namespace Hotline.Repository.SqlSugar.Orders
         {
             if (order.OrderType == EOrderType.MarketSupervisionBy12315)
             {
+                //弥补AddNav方法没有自动指派到创建人
+                order.AssignToCreator(_dataPermissionFilterBuilder.DataPermissionManager);
+
                 if (order.AcceptType == EAcceptType.Complain)
                 {
                     order.OrderComplain.InitDatePermission(_dataPermissionFilterBuilder.DataPermissionManager);

src/Hotline.Repository.SqlSugar/Orders/TimeLimitRepository.cs

@@ -1,5 +1,5 @@
-using Hotline.Orders;
-using Hotline.Repository.SqlSugar.DataPermissions;
+using Hotline.Repository.SqlSugar.DataPermissions;
+using Hotline.Settings.TimeLimits;
 using SqlSugar;
 using XF.Domain.Dependency;
 

src/Hotline.Share/Dtos/FlowEngine/WorkflowDto.cs

@@ -27,6 +27,7 @@ namespace Hotline.Share.Dtos.FlowEngine
         public DateTime CurrentStepTime { get; set; }
         
         public EWorkflowStatus Status { get; set; }
+        public string StatusText => Status.ToString();
 
         public DefinitionDto Definition { get; set; }
 

src/Hotline/Orders/ITimeLimitRepository.cs

@@ -1,9 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.Orders
-{
-    public interface ITimeLimitRepository: IRepository<TimeLimit>
-    {
-
-    }
-}

src/Hotline/Orders/TimeLimitDomainService.cs

@@ -1,8 +0,0 @@
-using XF.Domain.Dependency;
-
-namespace Hotline.Orders
-{
-    public class TimeLimitDomainService: ITimeLimitDomainService, IScopeDependency
-    {
-    }
-}

src/Hotline/Orders/CommonOpinion.cs → src/Hotline/Settings/CommonOpinions/CommonOpinion.cs

@@ -1,8 +1,8 @@
 using XF.Domain.Repository;
 
-namespace Hotline.Orders
+namespace Hotline.Settings.CommonOpinions
 {
-    public class CommonOpinion: CreationEntity
+    public class CommonOpinion : CreationEntity
     {
         public string TypeCode { get; set; }
 

src/Hotline/Orders/CommonOpinionDomainService.cs → src/Hotline/Settings/CommonOpinions/CommonOpinionDomainService.cs

@@ -1,7 +1,7 @@
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
 
-namespace Hotline.Orders
+namespace Hotline.Settings.CommonOpinions
 {
     public class CommonOpinionDomainService : ICommonOpinionDomainService, IScopeDependency
     {
@@ -11,7 +11,7 @@ namespace Hotline.Orders
         {
             _commonOpinionRepository = commonOpinionRepository;
         }
-        public async Task AddCommonOpinion(CommonOpinion entity,CancellationToken cancellationToken)
+        public async Task AddCommonOpinion(CommonOpinion entity, CancellationToken cancellationToken)
         {
             await _commonOpinionRepository.AddAsync(entity, cancellationToken);
         }
@@ -22,15 +22,15 @@ namespace Hotline.Orders
             return await _commonOpinionRepository.Queryable().Where(x => x.TypeCode == code).ToListAsync();
         }
 
-        public async Task DelCommonOpinion(string[] Ids,CancellationToken cancellationToken)
+        public async Task DelCommonOpinion(string[] Ids, CancellationToken cancellationToken)
         {
             //TODO 加权限
-            var list =await _commonOpinionRepository.Queryable().In(Ids).ToListAsync();
-            if (list.Count!=Ids.Length)
+            var list = await _commonOpinionRepository.Queryable().In(Ids).ToListAsync();
+            if (list.Count != Ids.Length)
             {
                 throw new UserFriendlyException("数据异常，无权限操作");
             }
-            await _commonOpinionRepository.RemoveRangeAsync(list,cancellationToken);
+            await _commonOpinionRepository.RemoveRangeAsync(list, cancellationToken);
         }
     }
 }

src/Hotline/Orders/CommonOpinionTypeConsts.cs → src/Hotline/Settings/CommonOpinions/CommonOpinionTypeConsts.cs

@@ -1,5 +1,4 @@
-
-namespace Hotline.Orders
+namespace Hotline.Settings.CommonOpinions
 {
     public class CommonOpinionTypeConsts
     {

src/Hotline/Orders/ICommonOpinionDomainService.cs → src/Hotline/Settings/CommonOpinions/ICommonOpinionDomainService.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Hotline.Orders
+namespace Hotline.Settings.CommonOpinions
 {
     public interface ICommonOpinionDomainService
     {
@@ -12,6 +6,6 @@ namespace Hotline.Orders
 
         Task AddCommonOpinion(CommonOpinion entity, CancellationToken cancellationToken);
 
-        Task DelCommonOpinion(string[] Ids,CancellationToken cancellationToken);
+        Task DelCommonOpinion(string[] Ids, CancellationToken cancellationToken);
     }
 }

src/Hotline/Orders/ICommonOpinionRepository.cs → src/Hotline/Settings/CommonOpinions/ICommonOpinionRepository.cs

@@ -1,6 +1,6 @@
 using XF.Domain.Repository;
 
-namespace Hotline.Orders
+namespace Hotline.Settings.CommonOpinions
 {
     public interface ICommonOpinionRepository : IRepository<CommonOpinion>
     {

src/Hotline/Orders/HotSpotType.cs → src/Hotline/Settings/Hotspots/HotSpotType.cs

@@ -1,8 +1,7 @@
-
-using SqlSugar;
+using SqlSugar;
 using XF.Domain.Repository;
 
-namespace Hotline.Orders
+namespace Hotline.Settings.Hotspots
 {
     /// <summary>
     /// 热点基础数据

src/Hotline/Orders/IHotSpotTypeRepository.cs → src/Hotline/Settings/Hotspots/IHotspotTypeRepository.cs

@@ -1,6 +1,6 @@
 using XF.Domain.Repository;
 
-namespace Hotline.Orders
+namespace Hotline.Settings.Hotspots
 {
     public interface IHotspotTypeRepository : IRepository<HotSpotType>
     {

src/Hotline/Orders/ITimeLimitDomainService.cs → src/Hotline/Settings/TimeLimits/ITimeLimitDomainService.cs

@@ -1,5 +1,4 @@
-
-namespace Hotline.Orders
+namespace Hotline.Settings.TimeLimits
 {
     public interface ITimeLimitDomainService
     {

src/Hotline/Settings/TimeLimits/ITimeLimitRepository.cs

@@ -0,0 +1,9 @@
+using XF.Domain.Repository;
+
+namespace Hotline.Settings.TimeLimits
+{
+    public interface ITimeLimitRepository : IRepository<TimeLimit>
+    {
+
+    }
+}

src/Hotline/Orders/TimeLimit.cs → src/Hotline/Settings/TimeLimits/TimeLimit.cs

@@ -2,32 +2,32 @@
 using SqlSugar;
 using XF.Domain.Repository;
 
-namespace Hotline.Orders
+namespace Hotline.Settings.TimeLimits
 {
-    public class TimeLimit: CreationEntity
+    public class TimeLimit : CreationEntity
     {
 
         public string TimeLimitName { get; set; }
 
         public string WorkflowName { get; set; }
-        
+
         public string WorkflowCode { get; set; }
 
         public ETimeLimitState TimeLimitState { get; set; }
 
-        [SugarColumn(ColumnDataType = "longtext", IsJson = true,IsNullable = true)]
+        [SugarColumn(ColumnDataType = "longtext", IsJson = true, IsNullable = true)]
         public List<ParamTypeModel>? ParamArr { get; set; }
 
         /// <summary>
         /// 排序
         /// </summary>
-        [SugarColumn(ColumnDataType = "longtext", IsJson = true,IsNullable = true)]
+        [SugarColumn(ColumnDataType = "longtext", IsJson = true, IsNullable = true)]
         public List<PriorityModel>? Priority { get; set; }
 
         /// <summary>
         /// 组合
         /// </summary>
-        [SugarColumn(ColumnDataType = "longtext", IsJson = true,IsNullable = true)]
+        [SugarColumn(ColumnDataType = "longtext", IsJson = true, IsNullable = true)]
         public List<CombinationModel>? Combination { get; set; }
 
 

src/Hotline/Settings/TimeLimits/TimeLimitDomainService.cs

@@ -0,0 +1,8 @@
+using XF.Domain.Dependency;
+
+namespace Hotline.Settings.TimeLimits
+{
+    public class TimeLimitDomainService : ITimeLimitDomainService, IScopeDependency
+    {
+    }
+}