Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/EntitySync/Program.cs

@@ -1,6 +1,7 @@
 using OASystem.Domain.Entities;
 using OASystem.Domain.Entities.Customer;
 using OASystem.Domain.Entities.Groups;
+using OASystem.Domain.Entities.Resource;
 using OASystem.Domain.Entities.System;
 using SqlSugar;
 
@@ -61,5 +62,9 @@ db.CodeFirst.SetStringDefaultLength(50).BackupTable().InitTables(new Type[]
     //typeof(Grp_HotelReservations),
     //typeof(Grp_VisaProgress),
     //typeof(Grp_DeleClientNeeds),
+    typeof(Res_AirCompany),
+    typeof(Res_AirTicketAgent),
+    typeof(Res_HotelData),
+    typeof(Res_ThreeCode)
 });
 Console.WriteLine("数据库结构同步完成!");

OASystem/OASystem.Domain/Entities/Resource/Res_AirCompany.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Resource
+{
+    /// <summary>
+    /// 航司缩写资料表
+    /// </summary>
+    [SugarTable("Res_AirCompany")]
+    public class Res_AirCompany:EntityBase
+    {
+        /// <summary>
+        /// 缩写
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string ShortCode { get; set; }
+        /// <summary>
+        /// 中文名
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string CnName { get; set; }
+        /// <summary>
+        /// 英文名
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string EnName { get; set; }
+    }
+}

OASystem/OASystem.Domain/Entities/Resource/Res_AirTicketAgent.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Resource
+{
+    /// <summary>
+    /// 代理出票合作方资料表
+    /// </summary>
+    [SugarTable("Res_AirTicketAgent")]
+    public class Res_AirTicketAgent:EntityBase
+    {
+        /// <summary>
+        /// 代理商名称
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string Name { get; set; }
+        /// <summary>
+        /// 代理商账户
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string Account { get; set; }
+        /// <summary>
+        /// 代理商银行
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string Bank { get; set; }
+    }
+}

OASystem/OASystem.Domain/Entities/Resource/Res_HotelData.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Resource
+{
+    /// <summary>
+    /// 酒店数据表
+    /// </summary>
+    [SugarTable("Res_HotelData")]
+    public class Res_HotelData:EntityBase
+    {
+        /// <summary>
+        /// 所在城市
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string City { get; set; }
+        /// <summary>
+        /// 酒店名称
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string Name { get; set; }
+        /// <summary>
+        /// 酒店星级
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string Level { get; set; }
+        /// <summary>
+        /// 酒店地址
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string Address { get; set; }
+        /// <summary>
+        /// 酒店电话
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        public string Tel { get; set; }
+        /// <summary>
+        /// 酒店传真
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Fax { get; set; }
+        /// <summary>
+        /// 联系人
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Contact { get; set; }
+        /// <summary>
+        /// 联系方式
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        public string ContactPhone { get; set; }
+        /// <summary>
+        /// 酒店其他信息
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        public string OtherInformation { get; set; }
+    }
+}

OASystem/OASystem.Domain/Entities/Resource/Res_ThreeCode.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Resource
+{
+    /// <summary>
+    /// 三字码资料表
+    /// </summary>
+    [SugarTable("Res_ThreeCode")]
+    public class Res_ThreeCode:EntityBase
+    {
+        /// <summary>
+        /// 三字码
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        public string Three { get; set; }
+        /// <summary>
+        /// 四字码
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        public string Four { get; set; }
+        /// <summary>
+        /// 国家
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string Country { get; set; }
+        /// <summary>
+        /// 城市
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string City { get; set; }
+        /// <summary>
+        /// 机场
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string AirPort { get; set; }
+        /// <summary>
+        /// 机场英文名
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string AirPort_En { get; set; }
+    }
+}

OASystem/OASystem.Domain/OASystem.Domain.csproj

@@ -16,8 +16,4 @@
     <PackageReference Include="SqlSugarCore" Version="5.1.3.32" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Entities\Resource\" />
-  </ItemGroup>
-
 </Project>

OASystem/_Doc/OA2023数据字典.docx

@@ -2648,12 +2648,6 @@ Null
                                  字段约束
                                  字段描述
                                     备注
-Id
-Int
-Not Null
-PK
-主键ID
-自增长、唯一
 Name
 Varchar（100）
 Null
@@ -2699,33 +2693,7 @@ Null
 英文名
 
 
-4) 航司缩写资料表：航司缩写资料表：Res_AirCompany（挪用）
-                                   字段名
-                                 类型长度
-                                 字段属性
-                                 字段约束
-                                 字段描述
-                                    备注
-ShortCode
-Varchar（100）
-Null
-
-缩写
-
-CnName
-Varchar（100）
-Null
-
-中文名
-
-EnName
-Varchar（100）
-Null
-
-英文名
-
-
-5) 三字码资料表：Res_ThreeCode（挪用）
+4) 三字码资料表：Res_ThreeCode（挪用）
                                    字段名
                                  类型长度
                                  字段属性