Merge branch 'master' of http://git.fwt.com/Hotline/hotline

src/Hotline.Api/Controllers/HomeController.cs

@@ -74,8 +74,8 @@ public class HomeController : BaseController
         db.DbMaintenance.CreateDatabase();
         db.CodeFirst.InitTables<Blacklist,Call,CallDetail,CallRecord,TelHold>();
         db.CodeFirst.InitTables<Ivr, IvrCategory, Tel, TelGroup, TelRest>();
-        db.CodeFirst.InitTables<Knowledge, KnowledgeApply, KnowledgePV, KnowledgeStandard, KnowledgeTemp>();
-        db.CodeFirst.InitTables<KnowledgeType, Orders.Order, TempOrder, OrgUser>();
+        db.CodeFirst.InitTables<Knowledge, KnowledgeApply, KnowledgePv, KnowledgeStandard, KnowledgeTemp>();
+        db.CodeFirst.InitTables<KnowledgeType, Orders.Order, OrderTemporary, OrgUser>();
         db.CodeFirst.InitTables<SystemAuthority, SystemButton, SystemDataAuthority, SystemDataTable, SystemMenu>();
         db.CodeFirst.InitTables<SystemOrganize, SystemSetting, SystemSettingGroup, UserFastMenu>();
         db.CodeFirst.InitTables<User, Work>();

src/Hotline/KnowledgeBase/Knowledge.cs

@@ -77,19 +77,19 @@ public class Knowledge : FullStateEntity
     /// <summary>
     /// 附件
     /// </summary>
-    [SugarColumn(ColumnDataType = "varchar(4000)", IsJson = true)]
+    [SugarColumn(ColumnDataType = "varchar(1000)", IsJson = true)]
     public List<string> Additions { get; set; }
 
     /// <summary>
     /// 关联知识申请
     /// </summary>
-    [SugarColumn(ColumnDataType = "varchar(4000)", IsJson = true)]
+    [SugarColumn(ColumnDataType = "varchar(2000)", IsJson = true)]
     public List<string> Applies { get; set; }
 
     /// <summary>
     /// 关联知识
     /// </summary>
-    [SugarColumn(ColumnDataType = "varchar(4000)", IsJson = true)]
+    [SugarColumn(ColumnDataType = "varchar(2000)", IsJson = true)]
     public List<string> Knowledges { get; set; }
 
 }

src/Hotline/KnowledgeBase/KnowledgePV.cs

@@ -5,7 +5,7 @@ namespace Hotline.KnowledgeBase;
 /// <summary>
 /// PV
 /// </summary>
-public class KnowledgePV : CreationEntity
+public class KnowledgePv : CreationEntity
 {
     public string KnowledgeId { get; set; }
 }

src/Hotline/Orders/Order.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Intrinsics.X86;
-using System.Text;
-using System.Threading.Tasks;
-using Hotline.Share.Enums.Order;
+using Hotline.Share.Enums.Order;
 using SqlSugar;
 using XF.Domain.Repository;
 
@@ -15,92 +9,92 @@ namespace Hotline.Orders
     /// </summary>
     public partial class Order : FullStateEntity
     {
-        //#region 来电信息
+        #region 来电信息
 
-        ///// <summary>
-        ///// 来源渠道
-        ///// </summary>
-        //public EChannel Channel { get; set; }
+        /// <summary>
+        /// 来源渠道
+        /// </summary>
+        public EChannel Channel { get; set; }
 
-        ///// <summary>
-        ///// 来电/信人姓名
-        ///// </summary>
-        //public string FromName { get; set; }
+        /// <summary>
+        /// 来电/信人姓名
+        /// </summary>
+        public string FromName { get; set; }
 
-        ///// <summary>
-        ///// 来电/信人性别
-        ///// </summary>
-        //public EGender FromGender { get; set; }
+        /// <summary>
+        /// 来电/信人性别
+        /// </summary>
+        public EGender FromGender { get; set; }
 
-        ///// <summary>
-        ///// 来电/信人身份
-        ///// </summary>
-        //public EFromStatus FromStatus { get; set; }
+        /// <summary>
+        /// 来电/信人身份
+        /// </summary>
+        public EFromStatus FromStatus { get; set; }
 
-        ///// <summary>
-        ///// 证件类型
-        ///// </summary>
-        //public ELicenceType? Licence { get; set; }
+        /// <summary>
+        /// 证件类型
+        /// </summary>
+        public ELicenceType? Licence { get; set; }
 
-        ///// <summary>
-        ///// 证件号码
-        ///// </summary>
-        //public string? LicenceNo { get; set; }
+        /// <summary>
+        /// 证件号码
+        /// </summary>
+        public string? LicenceNo { get; set; }
 
-        ///// <summary>
-        ///// 年龄段
-        ///// </summary>
-        //public EAgeRange? AgeRange { get; set; }
+        /// <summary>
+        /// 年龄段
+        /// </summary>
+        public EAgeRange? AgeRange { get; set; }
 
-        ///// <summary>
-        ///// 联系电话，null表示无需联系
-        ///// </summary>
-        //public string? Contact { get; set; }
+        /// <summary>
+        /// 联系电话，null表示无需联系
+        /// </summary>
+        public string? Contact { get; set; }
 
-        ///// <summary>
-        ///// 是否接受短信，勾选校验手机号
-        ///// </summary>
-        //public bool AcceptSms { get; set; }
+        /// <summary>
+        /// 是否接受短信，勾选校验手机号
+        /// </summary>
+        public bool AcceptSms { get; set; }
 
-        ///// <summary>
-        ///// 工作单位(当“来电/信人身份”为“企业”时必填，其他情况非必填)
-        ///// </summary>
-        //public string? Company { get; set; }
+        /// <summary>
+        /// 工作单位(当“来电/信人身份”为“企业”时必填，其他情况非必填)
+        /// </summary>
+        public string? Company { get; set; }
 
-        //#endregion
+        #endregion
 
-        //#region 诉求信息
+        #region 诉求信息
 
-        ///// <summary>
-        ///// 工单编码（202201010001）
-        ///// </summary>
-        //public string No { get; set; }
+        /// <summary>
+        /// 工单编码（202201010001）
+        /// </summary>
+        public string No { get; set; }
 
-        ///// <summary>
-        ///// 工单类型
-        ///// </summary>
-        //public EOrderType OrderType { get; set; }
+        /// <summary>
+        /// 工单类型
+        /// </summary>
+        public EOrderType OrderType { get; set; }
 
-        ///// <summary>
-        ///// 受理类型
-        ///// </summary>
-        //public EAcceptType AcceptType { get; set; }
+        /// <summary>
+        /// 受理类型
+        /// </summary>
+        public EAcceptType AcceptType { get; set; }
 
-        ///// <summary>
-        ///// 紧急程度
-        ///// </summary>
-        //public EEmergencyLevel EmergencyLevel { get; set; } = EEmergencyLevel.Normal;
+        /// <summary>
+        /// 紧急程度
+        /// </summary>
+        public EEmergencyLevel EmergencyLevel { get; set; } = EEmergencyLevel.Normal;
 
-        //public string Title { get; set; }
+        public string Title { get; set; }
 
-        //public string HotspotId { get; set; }
-        //public string Hotspot { get; set; }
-        //public string HotspotSpliceName { get; set; }
+        public string HotspotId { get; set; }
+        public string Hotspot { get; set; }
+        public string HotspotSpliceName { get; set; }
 
-        ///// <summary>
-        ///// 事发时间
-        ///// </summary>
-        //public DateTime? IncidentTime { get; set; }
+        /// <summary>
+        /// 事发时间
+        /// </summary>
+        public DateTime? IncidentTime { get; set; }
 
         ///// <summary>
         ///// 事发地址
@@ -111,10 +105,10 @@ namespace Hotline.Orders
         ///// <summary>
         ///// 附件
         ///// </summary>
-        //[SugarColumn(ColumnDataType = "longtext", IsJson = true)]
+        //[SugarColumn(ColumnDataType = "varchar(4000)", IsJson = true)]
         //public List<string> Additions { get; set; } = new();
 
-        //#endregion
+        #endregion
     }
 
     public class Position

src/Hotline/Orders/TempOrder.cs → src/Hotline/Orders/OrderTemporary.cs

@@ -3,7 +3,7 @@
 /// <summary>
 /// 工单草稿
 /// </summary>
-public class TempOrder : Order
+public class OrderTemporary : Order
 {
 
 }

src/XF.Domain/Entities/IDataPermission.cs

@@ -4,6 +4,7 @@ namespace XF.Domain.Entities
     public interface IDataPermission
     {
         string OrgId { get; }
+
         string AutoOrgCode { get; }
 
         string CreateUserId { get; }