src/Hotline.Api/Controllers/TestController.cs

@@ -17,6 +17,7 @@ using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Options;
 using NewRock.Sdk;
 using NewRock.Sdk.Security;
+using NpgsqlTypes;
 using SqlSugar;
 using Wex.Sdk;
 using Wex.Sdk.Tel;
@@ -53,6 +54,7 @@ public class TestController : BaseController
     private readonly IDistributedLock _distributedLock;
     private readonly IWexClient _wexClient;
     private readonly ISugarUnitOfWork<WexDbContext> _uowWex;
+    private readonly IOrderUrgeRepository _orderUrgeRepository;
     private readonly IGroupManager _goupManager;
 
     //private readonly ITypedCache<List<User>> _cache;
@@ -78,7 +80,8 @@ public class TestController : BaseController
         ITimeLimitApplication timeLimitApplication,
         IDistributedLock distributedLock,
         IWexClient wexClient,
-        ISugarUnitOfWork<WexDbContext> uowWex
+        ISugarUnitOfWork<WexDbContext> uowWex,
+        IOrderUrgeRepository orderUrgeRepository
     )
     {
         _logger = logger;
@@ -97,11 +100,27 @@ public class TestController : BaseController
         _distributedLock = distributedLock;
         _wexClient = wexClient;
         _uowWex = uowWex;
+        _orderUrgeRepository = orderUrgeRepository;
     }
 
     [HttpGet("time")]
     public async Task<OpenResponse> GetTime()
     {
+        //var ourge = new OrderUrge
+        //{
+        //    Content = "fat cats ate fat rats"
+        //};
+
+        //await _orderUrgeRepository.AddAsync(ourge, HttpContext.RequestAborted);
+
+        //var sqlQuery =
+        //    "SELECT * FROM order_urge, to_tsquery('simple', @1) query WHERE TsVector @@ query ORDER BY score DESC";
+
+
+        //"UPDATE cargos SET tokens = setweight(to_tsvector('simple', $1), 'A') || setweight(to_tsvector('simple', $2), 'B') WHERE id = $3"
+
+        //_uow.Db.Ado.SqlQueryAsync<OrderUrge>("SELECT to_tsvector('fat cats ate fat rats') @@ to_tsquery('fat & rat')")
+
         //var tests = _uowWex.Db.Ado.SqlQuery<Test>("select * from view_telinfo_full where IsSynch=@IsSynch", new { IsSynch = 0 });
         //var a = _uowWex.Db.Ado.ExecuteCommand("update telinfo set IsSynch=1 where GUID=@CallId", new { CallId = "b1f97f3c-88b6-4f42-b8de-83ed448854b0" });
         //var rsp = await _wexClient.QueryTelsAsync(new QueryTelRequest {  }, HttpContext.RequestAborted);

src/Hotline.Api/config/appsettings.Development.json

@@ -54,7 +54,7 @@
     }
   },
   "DatabaseConfiguration": {
-    "ApplyDbMigrations": false,
+    "ApplyDbMigrations": true,
     "ApplySeed": false
   },
   "MqConfiguration": {

src/Hotline.Application/FlowEngine/WorkflowApplication.cs

@@ -255,7 +255,7 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
 
         var dto = new NextStepOptionDto { Handlers = handlers };
 
-        if (stepDefine.Properties.Contains(SysDicTypeConsts.OrderRedoReason))
+        if (stepDefine.Components.Contains(SysDicTypeConsts.OrderRedoReason))
         {
             var orderRedoReasons = await _systemDomainService.GetSysDicDataByCodeAsync(SysDicTypeConsts.OrderRedoReason, cancellationToken);
             dto.OrderRedoReasonOptions = orderRedoReasons.Select(d => new IdName(d.DicDataValue, d.DicDataName)).ToList();

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

@@ -0,0 +1,13 @@
+using Hotline.Orders;
+using Hotline.Repository.SqlSugar.DataPermissions;
+using SqlSugar;
+using XF.Domain.Dependency;
+
+namespace Hotline.Repository.SqlSugar.Orders;
+
+public class OrderUrgeRepository : BaseRepository<OrderUrge>, IOrderUrgeRepository, IScopeDependency
+{
+    public OrderUrgeRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
+    {
+    }
+}

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

@@ -49,7 +49,7 @@ namespace Hotline.Share.Dtos.FlowEngine
         /// <summary>
         /// 节点属性配置
         /// </summary>
-        public List<string> Properties { get; set; } = new();
+        public List<string> Components { get; set; } = new();
 
     }
 }

src/Hotline/FlowEngine/Definitions/StepBasic.cs

@@ -55,7 +55,7 @@ public class StepBasic
     public string? CountersignEndStepCode { get; set; }
 
     /// <summary>
-    /// 节点属性配置
+    /// 节点组件配置
     /// </summary>
-    public List<string> Properties { get; set; } = new();
+    public List<string> Components { get; set; } = new();
 }

src/Hotline/FlowEngine/Workflows/StepBasicEntity.cs

@@ -100,8 +100,8 @@ public abstract class StepBasicEntity : CreationEntity
     /// <summary>
     /// 节点属性配置
     /// </summary>
-    [SugarColumn(ColumnDataType = "json", IsJson = true)]
-    public List<string> Properties { get; set; } = new();
+    [SugarColumn(ColumnDataType = "json", IsJson = true, IsNullable = true)]
+    public List<string> Components { get; set; } = new();
 
     /// <summary>
     /// 扩展信息

src/Hotline/Orders/IOrderUrgeRepository.cs

@@ -0,0 +1,8 @@
+using XF.Domain.Repository;
+
+namespace Hotline.Orders;
+
+public interface IOrderUrgeRepository : IRepository<OrderUrge>
+{
+
+}

src/Hotline/Orders/OrderRedo.cs

@@ -1,4 +1,5 @@
-using Hotline.Share.Dtos;
+using System.ComponentModel;
+using Hotline.Share.Dtos;
 using Hotline.Share.Enums.Settings;
 using Hotline.Users;
 using SqlSugar;
@@ -6,7 +7,8 @@ using XF.Domain.Repository;
 
 namespace Hotline.Orders
 {
-    public class OrderRedo:CreationEntity
+    [Description("重办")]
+    public class OrderRedo : CreationEntity
     {
         /// <summary>
         /// 工单编号（冗余）
@@ -50,7 +52,7 @@ namespace Hotline.Orders
         /// </summary>
         [SugarColumn(ColumnDataType = "json", IsJson = true, IsNullable = true)]
         public List<string> FileIds { get; set; }
-        
+
 
         #region 一级部门
         /// <summary>
@@ -63,7 +65,7 @@ namespace Hotline.Orders
         /// 一级部门名称
         /// </summary>
         [SugarColumn(IsNullable = true)]
-        public string OrgLevelOneName { get; set;}
+        public string OrgLevelOneName { get; set; }
 
         #endregion
 

src/Hotline/Orders/OrderSupervise.cs

@@ -0,0 +1,9 @@
+using System.ComponentModel;
+
+namespace Hotline.Orders;
+
+[Description("督办")]
+public class OrderSupervise
+{
+
+}

src/Hotline/Orders/OrderUrge.cs

@@ -0,0 +1,15 @@
+using System.ComponentModel;
+using NpgsqlTypes;
+using SqlSugar;
+using XF.Domain.Repository;
+
+namespace Hotline.Orders;
+
+[Description("催办")]
+public class OrderUrge : CreationEntity
+{
+    public string Content { get; set; }
+
+    [SugarColumn(IsNullable = true, ColumnDataType = "tsvector")]
+    public NpgsqlTsVector? TsVector { get; set; }
+}