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

OASystem/EntitySync/Program.cs

@@ -1,5 +1,6 @@
 using OASystem.Domain.Entities;
 using OASystem.Domain.Entities.Customer;
+using OASystem.Domain.Entities.Groups;
 using OASystem.Domain.Entities.System;
 using SqlSugar;
 
@@ -38,14 +39,27 @@ else
 db.DbMaintenance.CreateDatabase();
 db.CodeFirst.SetStringDefaultLength(50).BackupTable().InitTables(new Type[]
 {
-   //typeof(Sys_PageFunctionPermission)
-   //,typeof(Sys_SystemMenuAndFunction)
-   //,typeof(Sys_SystemMenuPermission)
-   //,typeof (Sys_JobPostAuthority)
-   //,typeof(Sys_UserAuthority)
-   typeof(Crm_CustomerCert),
-   typeof(Crm_CustomerCompany),
-   typeof(Crm_CustomerFile),
-   typeof(Crm_DeleClient)
+    //typeof(Sys_PageFunctionPermission)
+    //,typeof(Sys_SystemMenuAndFunction)
+    //,typeof(Sys_SystemMenuPermission)
+    //,typeof(Sys_JobPostAuthority)
+    //,typeof(Sys_UserAuthority)
+    //typeof(Crm_CustomerCert),
+    //typeof(Crm_CustomerCompany),
+    //typeof(Crm_CustomerFile),
+    //typeof(Crm_DeleClient)
+    //typeof(Crm_VisaCustomerCompany),
+    //typeof(Crm_VisaCustomerFamily),
+    //typeof(Crm_VisaCustomerSchool)
+    //typeof(Grp_AirInquiry),
+    //typeof(Grp_AirPrice),
+    //typeof(Grp_CreditCardPayment),
+    //typeof(Grp_DeleFile),
+    //typeof(Grp_DelegationInfo),
+    //typeof(Grp_DelegationJoinCustomer),
+    //typeof(Grp_DeleMeetingNeeds),
+    //typeof(Grp_HotelReservations),
+    //typeof(Grp_VisaProgress),
+    //typeof(Grp_DeleClientNeeds),
 });
 Console.WriteLine("数据库结构同步完成!");

OASystem/OASystem.Domain/Entities/Customer/Crm_VisaCustomerCompany.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.Customer
+{
+    /// <summary>
+    /// 客户工作经历表
+    /// </summary>
+    [SugarTable("Crm_VisaCustomerCompany")]
+    public class Crm_VisaCustomerCompany:EntityBase
+    {
+        /// <summary>
+        /// 客户表ID
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int DcId { get; set; }
+        /// <summary>
+        /// 公司名称
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string Company { get; set; }
+        /// <summary>
+        /// 公司地址
+        /// </summary>
+        [SugarColumn(IsNullable =true,ColumnDataType ="varchar(300)")]
+        public string CompanyAddress { get; set; }
+        /// <summary>
+        /// 公司电话
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        public string Phone { get; set; }
+        /// <summary>
+        /// 职务
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Job { get; set; }
+        /// <summary>
+        /// 主管名字
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        public string LeaderName { get; set; }
+        /// <summary>
+        /// 雇佣起始年月日
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime WorkStart { get; set; }
+        /// <summary>
+        /// 雇佣结束年月日
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime WorkEnd { get; set; }
+        /// <summary>
+        /// 工作职责及内容简述
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        public string WorkState { get; set; }
+    }
+}

OASystem/OASystem.Domain/Entities/Customer/Crm_VisaCustomerFamily.cs

@@ -0,0 +1,87 @@
+
+
+namespace OASystem.Domain.Entities.Customer
+{
+    /// <summary>
+    /// 客户家庭成员表
+    /// </summary>
+    [SugarTable("Crm_VisaCustomerFamily")]
+    public class Crm_VisaCustomerFamily:EntityBase
+    {
+        /// <summary>
+        /// 客户表ID
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int DcId { get; set; }
+        /// <summary>
+        /// 家庭成员称谓
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Appellation { get; set; }
+        /// <summary>
+        /// 家庭成员姓名
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Name { get; set; }
+        /// <summary>
+        /// 家庭成员出生日期
+        /// </summary>
+        [SugarColumn(IsNullable =true,ColumnDataType ="DateTime")]
+        public DateTime BirthDay { get; set; }
+        /// <summary>
+        /// 家庭成员出生地
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string BirthPlace { get; set; }
+        /// <summary>
+        /// 家庭成员政治面貌
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Politics { get; set; }
+        /// <summary>
+        /// 家庭成员工作单位
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(80)")]
+        public string Client { get; set; }
+        /// <summary>
+        /// 家庭地址
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(80)")]
+        public string Address { get; set; }
+        /// <summary>
+        /// 是否欧盟公民 0否1是
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsEu { get; set; }
+        /// <summary>
+        /// 拥有欧盟、欧洲经济区或瑞士公民身份的家庭成员姓名
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string NameSnd { get; set; }
+        /// <summary>
+        /// 拥有欧盟、欧洲经济区或瑞士公民身份的家庭成员生日
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime BirthDaySnd { get; set; }
+        /// <summary>
+        /// 拥有欧盟、欧洲经济区或瑞士公民身份的家庭成员国籍
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Nationality { get; set; }
+        /// <summary>
+        /// 拥有欧盟、欧洲经济区或瑞士公民身份的家庭成员旅行证件编号或身份证号码
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string IDCard { get; set; }
+        /// <summary>
+        /// 拥有欧盟、欧洲经济区或瑞士公民身份的家庭成员与申请人的关系
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Reletionship { get; set; }
+        /// <summary>
+        /// 家庭成员是否在美国
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsUSA { get; set; }
+    }
+}

OASystem/OASystem.Domain/Entities/Customer/Crm_VisaCustomerSchool.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Customer
+{
+    /// <summary>
+    /// 客户学历表
+    /// </summary>
+    [SugarTable("Crm_VisaCustomerSchool")]
+    public class Crm_VisaCustomerSchool:EntityBase
+    {
+        /// <summary>
+        /// 客户表ID
+        /// </summary>
+        [SugarColumn(IsNullable =true,ColumnDataType ="int")]
+        public int DcId { get; set; }
+        /// <summary>
+        /// 学校名称和学历
+        /// </summary>
+        [SugarColumn(IsNullable =true,ColumnDataType = "varchar(100)")]
+        public string School { get; set; }
+        /// <summary>
+        /// 学校地址
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(300)")]
+        public string Address { get; set; }
+        /// <summary>
+        /// 指导老师
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        public string Teacher { get; set; }
+        /// <summary>
+        /// 所学课程或专业名称
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Subject { get; set; }
+        /// <summary>
+        /// 就读起始日
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime StudyStart { get; set; }
+        /// <summary>
+        /// 就读结束日
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime StudyEnd { get; set; }
+    }
+}

OASystem/OASystem.Domain/Entities/Groups/Grp_AirInquiry.cs

@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Groups
+{
+    /// <summary>
+    /// 机票黑屏代码、询价表
+    /// </summary>
+    [SugarTable("Grp_AirInquiry")]
+    public class Grp_AirInquiry:EntityBase
+    {
+        /// <summary>
+        /// 团组Id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int DiId { get; set; }
+        /// <summary>
+        /// 黑屏代码
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
+        public string BlackCode { get; set; }
+        /// <summary>
+        /// 航段
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Routing { get; set; }
+        /// <summary>
+        /// 3U
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Carrier { get; set; }
+        /// <summary>
+        /// 航班号
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string FlightNo { get; set; }
+        /// <summary>
+        /// 航班出发日期
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime DepartDate { get; set; }
+        /// <summary>
+        /// 航班起飞时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime DepartTime { get; set; }
+        /// <summary>
+        /// 航班落地时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime ArrivalTime { get; set; }
+        /// <summary>
+        /// 头等舱单价（全价）
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10, 2)")]
+        public decimal FirstYPrice { get; set; }
+        /// <summary>
+        /// 头等舱单价（即时）
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10, 2)")]
+        public decimal FirstCabinPrice { get; set; }
+        /// <summary>
+        /// 头等舱单价（全价）
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10, 2)")]
+        public decimal BusinessYPrice { get; set; }
+        /// <summary>
+        /// 头等舱单价（即时）
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10, 2)")]
+        public decimal BusinessCabinPrice { get; set; }
+        /// <summary>
+        /// 经济舱单价（全价）
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10, 2)")]
+        public decimal YPrice { get; set; }
+        /// <summary>
+        /// 经济舱单价（即时）
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10, 2)")]
+        public decimal CabinPrice { get; set; }
+        /// <summary>
+        /// 业务人员查询时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "dateTime")]
+        public DateTime SearchDt { get; set; }
+    }
+}

OASystem/OASystem.Domain/Entities/Groups/Grp_AirPrice.cs

@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Groups
+{
+    /// <summary>
+    /// 机票费用录入表
+    /// </summary>
+    [SugarTable("Grp_AirPrice")]
+    public class Grp_AirPrice:EntityBase
+    {
+        /// <summary>
+        /// 团组Id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int DiId { get; set; }
+        /// <summary>
+        /// 机票黑屏代码、询价表Id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int AiId { get; set; }
+        /// <summary>
+        /// 舱位编码
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string CabinCode { get; set; }
+        /// <summary>
+        /// 出票前单人票价
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
+        public decimal SinglePrice { get; set; }
+        /// <summary>
+        /// 币种
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string SingleCurency { get; set; }
+        /// <summary>
+        /// 人数
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int Count { get; set; }
+        /// <summary>
+        /// 出票前总票价
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10, 2)")]
+        public decimal TotalPrice { get; set; }
+        /// <summary>
+        /// 币种
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string TotalCurency { get; set; }
+        /// <summary>
+        /// 是否值机0否1是
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsCheck { get; set; }
+        /// <summary>
+        /// 是否选座0否1是
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsSeat { get; set; }
+        /// <summary>
+        /// 是否购买行李0否1是
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsPackage { get; set; }
+        /// <summary>
+        /// 是否行李直挂0否1是
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsBag { get; set; }
+        /// <summary>
+        /// 报价说明0否1是
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        public string PriceRemark { get; set; }
+    }
+}

OASystem/OASystem.Domain/Entities/Groups/Grp_CreditCardPayment.cs

@@ -0,0 +1,201 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Groups
+{
+    /// <summary>
+    /// 付款信息表
+    /// </summary>
+    [SugarTable("Grp_CreditCardPayment")]
+    public class Grp_CreditCardPayment:EntityBase
+    {
+        /// <summary>
+        /// 支付方式
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int PayDId { get; set; }
+        /// <summary>
+        /// 消费方式
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(125)")]
+        public string ConsumptionPatterns { get; set; }
+        /// <summary>
+        /// 消费日期
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime ConsumptionDate { get; set; }
+        /// <summary>
+        /// 卡类型
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int CTDId { get; set; }
+        /// <summary>
+        /// 银行卡号
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(125)")]
+        public string BankNo { get; set; }
+        /// <summary>
+        /// 持卡人姓名
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(125)")]
+        public string CardholderName { get; set; }
+        /// <summary>
+        /// 付款金额
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10, 2)")]
+        public decimal PayMoney { get; set; }
+        /// <summary>
+        /// 付款币种 数据类型Id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int PaymentCurrency { get; set; }
+        /// <summary>
+        /// 当天汇率
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(MAX)")]
+        public string DayRate { get; set; }
+        /// <summary>
+        /// 公司银行卡号
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string CompanyBankNo { get; set; }
+        /// <summary>
+        /// 对方开户行
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(125)")]
+        public string OtherBankName { get; set; }
+        /// <summary>
+        /// 对方银行账号
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(125)")]
+        public string OtherSideNo { get; set; }
+        /// <summary>
+        /// 对方姓名
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(125)")]
+        public string OtherSideName { get; set; }
+        /// <summary>
+        /// 财务操作人 用户Id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public string MFOperator { get; set; }
+        /// <summary>
+        /// 财务操作时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime MFOperatorDate { get; set; }
+        /// <summary>
+        /// 部门经理是否审核 0否1是
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsAuditDM { get; set; }
+        /// <summary>
+        /// 部门经理审核人 用户Id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int AuditDMOperate { get; set; }
+        /// <summary>
+        /// 部门经理审核时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime AuditDMDate { get; set; }
+        /// <summary>
+        /// 财务部是否审核  0否1是
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsAuditMF { get; set; }
+        /// <summary>
+        /// 财务部审核人
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int AuditMFOperate { get; set; }
+        /// <summary>
+        /// 财务部审核时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime AuditMFDate { get; set; }
+        /// <summary>
+        /// 总经理是否审核  0否1是
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsAuditGM { get; set; }
+        /// <summary>
+        /// 总经理审核人
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int AuditGMOperate { get; set; }
+        /// <summary>
+        /// 总经理审核时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime AuditGMDate { get; set; }
+        /// <summary> 
+        /// 是否付款  0否1是
+        /// </summary> 
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsPay { get; set; }
+        /// <summary>
+        /// 团组外键编号
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int DIId { get; set; }
+        /// <summary>
+        /// 指向表外键编号
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int CId { get; set; }
+        /// <summary>
+        /// 指向标识 设置数据外键编号
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int CTable { get; set; }
+        /// <summary>
+        /// 此次付款百分比
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10, 2)")]
+        public decimal PayPercentage { get; set; }
+        /// <summary>
+        /// 此次付款金额
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10, 2)")]
+        public decimal PayThenMoney { get; set; }
+        /// <summary>
+        /// 上次付款百分比
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10, 2)")]
+        public decimal PayPercentageOld { get; set; }
+        /// <summary>
+        /// 上次付款金额
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10, 2)")]
+        public decimal PayThenMoneyOld { get; set; }
+        /// <summary>
+        /// 上次付款时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime UpdateDate { get; set; }
+        /// <summary>
+        /// 收款方
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Payee { get; set; }
+        /// <summary>
+        /// 人民币费用
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10, 2)")]
+        public decimal RMBPrice { get; set; }
+        /// <summary>
+        /// 费用标识
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string OrbitalPrivateTransfer { get; set; }
+        /// <summary>
+        /// 超出预算比例
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10, 2)")]
+        public decimal ExceedBudget { get; set; }
+    }
+}

OASystem/OASystem.Domain/Entities/Groups/Grp_DeleClientNeeds.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Groups
+{
+    /// <summary>
+    /// 团组公共需求表
+    /// </summary>
+    [SugarTable("Grp_DeleClientNeeds")]
+    public class Grp_DeleClientNeeds:EntityBase
+    {
+        /// <summary>
+        /// 团组表id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int DiId { get; set; }
+        /// <summary>
+        /// 酒店名称
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string HotelName { get; set; }
+        /// <summary>
+        /// 酒店地址
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
+        public string HotelAddress { get; set; }
+        /// <summary>
+        /// 酒店星级
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        public string HotelStarRank { get; set; }
+        /// <summary>
+        /// 酒店其他需求
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        public string HotelNeedRemark { get; set; }
+        /// <summary>
+        /// 客户喜好舱位
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string CabinName { get; set; }
+        /// <summary>
+        /// 飞机其他需求备注
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        public string CabinNeedRemark { get; set; }
+        /// <summary>
+        /// 类型表ID
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int CarType { get; set; }
+        /// <summary>
+        /// 车其他需求备注
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        public string CarNeedRemark { get; set; }
+        /// <summary>
+        /// 用餐需求备注
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        public string FoodNeedRemark { get; set; }
+    }
+}

OASystem/OASystem.Domain/Entities/Groups/Grp_DeleFile.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Groups
+{
+    /// <summary>
+    /// 团组附件表
+    /// </summary>
+    [SugarTable("Grp_DeleFile")]
+    public class Grp_DeleFile:EntityBase
+    {
+        /// <summary>
+        /// 团组Id
+        /// </summary>
+        [SugarColumn(IsNullable =true,ColumnDataType ="int")]
+        public int Diid { get; set; }
+        /// <summary>
+        /// 类别标识
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int Category { get; set; }
+        /// <summary>
+        /// 次级类别
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int Kind { get; set; }
+        /// <summary>
+        /// 文件名
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "Varchar(100)")]
+        public string FileName { get; set; }
+        /// <summary>
+        /// 文件路径
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "Varchar(100)")]
+        public string FilePath { get; set; }
+    }
+}

OASystem/OASystem.Domain/Entities/Groups/Grp_DeleMeetingNeeds.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.Groups
+{
+    /// <summary>
+    /// 团组会议需求表
+    /// </summary>
+    [SugarTable("Grp_DeleMeetingNeeds")]
+    public class Grp_DeleMeetingNeeds:EntityBase
+    {
+        /// <summary>
+        /// 团组公共需求表Id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int DeleClientNeedId { get; set; }
+        /// <summary>
+        /// 会议类型
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int MeetingType { get; set; }
+        /// <summary>
+        /// 开会时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime MeetingDt { get; set; }
+        /// <summary>
+        /// 开会时长
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string MeethingSeptal { get; set; }
+        /// <summary>
+        /// 参会人数
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int Person { get; set; }
+        /// <summary>
+        /// 会议金额预算
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string MeetingPrice { get; set; }
+        /// <summary>
+        /// 联系人
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        public string Contact { get; set; }
+        /// <summary>
+        /// 联系方式
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        public string Mobile { get; set; }
+        /// <summary>
+        /// 其他需求
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        public string NeedsChoose { get; set; }
+    }
+}

OASystem/OASystem.Domain/Entities/Groups/Grp_DelegationInfo.cs

@@ -0,0 +1,216 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Groups
+{
+    /// <summary>
+    /// 团组表
+    /// </summary>
+    [SugarTable("Grp_DelegationInfo")]
+    public class Grp_DelegationInfo:EntityBase
+    {
+        /// <summary>
+        /// 销售报价号
+        /// </summary>
+        [SugarColumn(IsNullable =true,ColumnDataType = "varchar(50)")]
+        public string SalesQuoteNo { get; set; }
+        /// <summary>
+        /// 销售日期
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime SalesDate { get; set; }
+        /// <summary>
+        /// 客户名称
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string ClientName { get; set; }
+        /// <summary>
+        /// 客户单位
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string ClientUnit { get; set; }
+        /// <summary>
+        /// 团组号
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string TourCode { get; set; }
+        /// <summary>
+        /// 团组名称
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string TeamName { get; set; }
+        /// <summary>
+        /// 团组类型Id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int TeamDid { get; set; }
+        /// <summary>
+        /// 出访时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime VisitDate { get; set; }
+        /// <summary>
+        /// 出团时间起
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime VisitStartDate { get; set; }
+        /// <summary>
+        /// 出团时间止
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime VisitEndDate { get; set; }
+        /// <summary>
+        /// 出访国家
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string VisitCountry { get; set; }
+        /// <summary>
+        /// 出访目的
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(300)")]
+        public string VisitPurpose { get; set; }
+        /// <summary>
+        /// 出访天数
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int VisitDays { get; set; }
+        /// <summary>
+        /// 出访人数
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int VisitPNumber { get; set; }
+        /// <summary>
+        /// 特殊需求
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        public string SpecialNeeds { get; set; }
+        /// <summary>
+        /// 其他需求
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        public string OtherNeeds { get; set; }
+        /// <summary>
+        /// 客户需求
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        public string ClientNeeds { get; set; }
+        /// <summary>
+        /// 状态标识
+        /// </summary>
+        [SugarColumn(IsNullable =true,ColumnDataType ="int")]
+        public int IsState { get; set; }
+        /// <summary>
+        /// 接团操作人
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int JietuanOperator { get; set; }
+        /// <summary>
+        /// 接团操作时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime JietuanTime { get; set; }
+        /// <summary>
+        /// 团信息操作人
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int GroupsOperator { get; set; }
+        /// <summary>
+        /// 团信息操作时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime GroupsTime { get; set; }
+        /// <summary>
+        /// 预算成本
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string BudgetCost { get; set; }
+        /// <summary>
+        /// 是否操作完成 0否1是
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsSure { get; set; }
+        /// <summary>
+        /// 预算成本时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime SureTime { get; set; }
+        /// <summary>
+        /// 手机号
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        public string TellPhone { get; set; }
+        /// <summary>
+        /// 团组客户级别
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string TeamLev { get; set; }
+        /// <summary>
+        /// 酒店投诉标识 0-未投诉1-已投诉
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int HotelComplain { get; set; }
+        /// <summary>
+        /// OP投诉标识 0-未投诉1-已投诉
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int OPComplain { get; set; }
+        /// <summary>
+        /// 签证投诉标识 0-未投诉1-已投诉
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int VisaComplain { get; set; }
+        /// <summary>
+        /// 商邀投诉标识 0-未投诉1-已投诉
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int OAComplain { get; set; }
+        /// <summary>
+        /// 机票投诉标识 0-未投诉1-已投诉
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int AirComplain { get; set; }
+        /// <summary>
+        /// 团组负责人
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Director { get; set; }
+        /// <summary>
+        /// 合同时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime TontractTime { get; set; }
+        /// <summary>
+        /// 支付款项（预付）
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string PaymentMoney { get; set; }
+        /// <summary>
+        /// 预付期限
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime PayDay { get; set; }
+        /// <summary>
+        /// 出国任务审批部门名称
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string CGRWSPBMMC { get; set; }
+        /// <summary>
+        /// 出国任务审批文号
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string CGRWSPWH { get; set; }
+        /// <summary>
+        /// 政治审查部门名称
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string ZZSCBMMC { get; set; }
+        /// <summary>
+        /// 政治审查部门审批文号
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string ZZSCSPWH { get; set; }
+    }
+}

OASystem/OASystem.Domain/Entities/Groups/Grp_DelegationJoinCustomer.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Groups
+{
+    /// <summary>
+    /// 团组与客户关联表
+    /// </summary>
+    [SugarTable("Grp_DelegationJoinCustomer")]
+    public class Grp_DelegationJoinCustomer:EntityBase
+    {
+        /// <summary>
+        /// 团组表id
+        /// </summary>
+        [SugarColumn(IsNullable =true,ColumnDataType ="int")]
+        public int DiId { get; set; }
+        /// <summary>
+        ///客户表Id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int DcId { get; set; }
+    }
+}

OASystem/OASystem.Domain/Entities/Groups/Grp_HotelReservations.cs

@@ -0,0 +1,202 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Groups
+{
+    /// <summary>
+    /// 酒店表
+    /// </summary>
+    [SugarTable("Grp_HotelReservations")]
+    public class Grp_HotelReservations:EntityBase
+    {
+        /// <summary>
+        /// 团组Id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int DIId { get; set; }
+        /// <summary>
+        /// 客人类型 数据类型字表Id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int GTId { get; set; }
+        /// <summary>
+        /// 入住卷号码
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string CheckNumber { get; set; }
+        /// <summary>
+        /// 预订网站数据类型字表Id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int ReservationsWebsite { get; set; }
+        /// <summary>
+        /// 预订号码
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string ReservationsNo { get; set; }
+        /// <summary>
+        /// 酒店确定编号
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string DetermineNo { get; set; }
+        /// <summary>
+        /// 所在城市
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string City { get; set; }
+        /// <summary>
+        /// 酒店名称
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string HotelName { get; set; }
+        /// <summary>
+        /// 酒店地址
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
+        public string HotelAddress { get; set; }
+        /// <summary>
+        /// 酒店电话
+        /// </summary>
+
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string HotelTel { get; set; }
+        /// <summary>
+        /// 酒店传真
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string HotelFax { get; set; }
+        /// <summary>
+        /// 客人姓名
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string GuestName { get; set; }
+        /// <summary>
+        /// 入住日期
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime CheckInDate { get; set; }
+        /// <summary>
+        /// 退房日期
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime CheckOutDate { get; set; }
+        /// <summary>
+        /// 实际金额
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10, 2)")]
+        public decimal Budget { get; set; }
+        /// <summary>
+        /// 预算币种 数据类型字表Id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int BudgetCurrency { get; set; }
+        /// <summary>
+        /// 单间数量
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int SingleRoomCount { get; set; }
+        /// <summary>
+        /// 单间单价
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10, 2)")]
+        public decimal SingleRoomPrice { get; set; }
+        /// <summary>
+        /// 双间数量
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int DoubleRoomCount { get; set; }
+        /// <summary>
+        /// 双间单价
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10, 2)")]
+        public decimal DoubleRoomPrice { get; set; }
+        /// <summary>
+        /// 套房数量
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int SuiteRoomCount { get; set; }
+        /// <summary>
+        /// 套房单价
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10, 2)")]
+        public decimal SuiteRoomPrice { get; set; }
+        /// <summary>
+        /// 其他房型数量
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int OtherRoomCount { get; set; }
+        /// <summary>
+        /// 其他房型单价
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10, 2)")]
+        public decimal OtherRoomPrice { get; set; }
+        /// <summary>
+        /// 佣金
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10, 2)")]
+        public decimal Commission { get; set; }
+        /// <summary>
+        /// 佣金币种
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")] 
+        public int CommissionCurrency { get; set; }
+        /// <summary>
+        /// 佣金标识0否 1是
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int CommissionMark { get; set; }
+        /// <summary>
+        /// 房间说明
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        public string RoomExplanation { get; set; }
+        /// <summary>
+        /// 附件
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        public string Attachment { get; set; }
+        /// <summary>
+        /// 信用卡金额
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10, 2)")]
+        public decimal CardPrice { get; set; }
+        /// <summary>
+        /// 确认标识信用卡金额 0：未刷(红色)  1:已刷(绿色)
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsCardPrice { get; set; }
+        /// <summary>
+        /// 早餐费
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10, 2)")]
+        public decimal breakfastPrice { get; set; }
+        /// <summary>
+        /// 是否由地接支付0否1是
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsOppay { get; set; }
+        /// <summary>
+        /// 是否住了单间0否1是
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsCboOne { get; set; }
+        /// <summary>
+        /// 是否住了双间0否1是
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsCboTwo { get; set; }
+        /// <summary>
+        /// 是否住了酒店套房0否1是
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsCboThree { get; set; }
+        /// <summary>
+        /// 是否住了其他房型0否1是
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsCboFour { get; set; }
+    }
+}

OASystem/OASystem.Domain/Entities/Groups/Grp_VisaProgress.cs

@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Groups
+{
+    /// <summary>
+    /// 签证进度表
+    /// </summary>
+    [SugarTable("Grp_VisaProgress")]
+    public class Grp_VisaProgress:EntityBase
+    {
+        /// <summary>
+        /// 团组表Id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int DiId { get; set; }
+        /// <summary>
+        /// 国家
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Country { get; set; }
+        /// <summary>
+        /// 收集资料
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string GetData { get; set; }
+        /// <summary>
+        /// 收集资料时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime GetDataTime { get; set; }
+        /// <summary>
+        /// 取护照
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string GetPassport { get; set; }
+        /// <summary>
+        /// 取护照时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime GetPassportTime { get; set; }
+        /// <summary>
+        /// 填资料
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string FillData { get; set; }
+        /// <summary>
+        /// 填资料时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime FillDataTime { get; set; }
+        /// <summary>
+        /// 送签
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string SendVisa { get; set; }
+        /// <summary>
+        /// 送签时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime SendVisaTime { get; set; }
+        /// <summary>
+        /// 出签
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string SignOut { get; set; }
+        /// <summary>
+        /// 出签时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime SignOutTime { get; set; }
+        /// <summary>
+        /// 归还护照
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string SendBackPassport { get; set; }
+        /// <summary>
+        /// 归还护照时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public string SendBackPassporTime { get; set; }
+        /// <summary>
+        /// 护照接收者
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string Receiver { get; set; }
+    }
+}

OASystem/OASystem.Domain/OASystem.Domain.csproj

@@ -17,7 +17,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Entities\Groups\" />
     <Folder Include="Entities\Resource\" />
   </ItemGroup>
 

OASystem/_Doc/OA2023数据字典.docx

@@ -1205,7 +1205,7 @@ Null
 公司名称
 
 CompanyAddress
-varchar(100)
+varchar(300)
 Null
 
 公司地址
@@ -1247,7 +1247,7 @@ Null
 工作职责及内容简述
 
 
-6) 客户工作经历表：Crm_VisaCustomerSchool（可挪用）
+6) 客户学历表：Crm_VisaCustomerSchool（可挪用）
                                    字段名
                                  类型长度
                                  字段属性
@@ -1267,7 +1267,7 @@ Null
 学校名称和学历
 
 Address
-varchar(100)
+varchar(300)
 Null
 
 学校地址
@@ -1329,7 +1329,7 @@ Null
 家庭成员出生日期
 
 BirthPlace
-varchar(50)
+varchar(100)
 Null
 
 家庭成员出生地
@@ -1528,12 +1528,6 @@ Null
 
 客户需求
 
-Remark
-varchar(500)
-Null
-
-备注
-
 IsState
 Int
 Null
@@ -1571,11 +1565,11 @@ Null
 预算成本
 
 IsSure
-varchar(50)
+Int
 Null
 
 是否操作完成
-
+0否1是
 SureTime
 DateTime
 Null
@@ -1583,7 +1577,7 @@ Null
 预算成本时间
 
 TellPhone
-varchar(50)
+varchar(20)
 Null
 
 手机号
@@ -1643,7 +1637,7 @@ Null
 支付款项（预付）
 
 PayDay
-
+dateTime
 Null
 
 预付期限
@@ -1731,13 +1725,13 @@ Null
 酒店名称
 
 HotelAddress
-varchar(100)
+varchar(200)
 Null
 
 酒店地址
 
 HotelStarRank
-varchar(100)
+varchar(20)
 Null
 
 酒店星级
@@ -1749,7 +1743,7 @@ Null
 酒店其他需求
 表单提交内容拼接
 CabinName
-varchar(500)
+varchar(100)
 Null
 
 客户喜好舱位
@@ -1793,7 +1787,7 @@ Null
 团组公共需求表Id
 团组公共需求表Id
 MeetingType
-varchar(50)
+Int
 Null
 
 会议类型
@@ -1840,12 +1834,6 @@ Null
 
 其他需求
 
-NeedsRemark
-varchar(500)
-Null
-
-其他备注
-
 
 
 6) 签证进度表：Grp_VisaProgress（挪用）
@@ -2002,37 +1990,37 @@ Null
 航班落地时间
 
 FirstYPrice
-decimal
+decimal(10, 2)
 Null
 
 头等舱单价
 （全价）
 FirstCabinPrice
-decimal
+decimal(10, 2)
 Null
 
 头等舱单价
 （即时）
 BusinessYPrice
-decimal
+decimal(10, 2)
 Null
 
 头等舱单价
 （全价）
 BusinessCabinPrice
-decimal
+decimal(10, 2)
 Null
 
 头等舱单价
 （即时）
 YPrice
-decimal
+decimal(10, 2)
 Null
 
 经济舱单价
 （全价）
 CabinPrice
-decimal
+decimal(10, 2)
 Null
 
 经济舱单价
@@ -2064,13 +2052,13 @@ Null
 机票黑屏代码、询价表Id
 机票黑屏代码、询价表Id
 CabinCode
-varchar(200)
+varchar(50)
 Null
 
 舱位编码
 
 SinglePrice
-decimal
+decimal(10, 2)
 Null
 
 出票前单人票价
@@ -2088,7 +2076,7 @@ Null
 人数
 
 TotalPrice
-decimal
+decimal(10, 2)
 Null
 
 出票前总票价
@@ -2139,239 +2127,456 @@ Null
                                     备注
 DIId
 Int
-Nul
+Null
 
 团组Id
 团组表Id
 GTId
 Int
-Nul
+Null
 
 客人类型
 数据类型字表Id
 CheckNumber
 varchar(50)
-Nul
+Null
 
 入住卷号码
 
 ReservationsWebsite
 Int
-Nul
+Null
 
 预订网站
 数据类型字表Id
 ReservationsNo
 varchar(50)
-Nul
+Null
 
 预订号码
 
 DetermineNo
 varchar(50)
-Nul
+Null
 
 酒店确定编号
 
 City
 varchar(50)
-Nul
+Null
 
 所在城市
 
 HotelName
 varchar(100)
-Nul
+Null
 
 酒店名称
 
 HotelAddress
-varchar(100)
-Nul
+varchar(200)
+Null
 
 酒店地址
 
 HotelTel
 varchar(50)
-Nul
+Null
 
 酒店电话
 
 HotelFax
 varchar(100)
-Nul
+Null
 
 酒店传真
 
 GuestName
 varchar(50)
-Nul
+Null
 
 客人姓名
 
 CheckInDate
 DateTime
-Nul
+Null
 
 入住日期
 
 CheckOutDate
 DateTime
-Nul
+Null
 
 退房日期
 
 Budget
-decimal
-Nul
+decimal(10, 2)
+Null
 
 实际金额
 
 BudgetCurrency
 Int
-Nul
+Null
 
 预算币种
 数据类型字表Id
 SingleRoomCount
 Int
-Nul
+Null
 
 单间数量
 
 SingleRoomPrice
-decimal
-Nul
+decimal(10, 2)
+Null
 
 单间单价
 
 DoubleRoomCount
 Int
-Nul
+Null
 
 双间数量
 
 DoubleRoomPrice
-decimal
-Nul
+decimal(10, 2)
+Null
 
 双间单价
 
 SuiteRoomCount
 Int
-Nul
+Null
 
 套房数量
 
 SuiteRoomPrice
-decimal
-Nul
+decimal(10, 2)
+Null
 
 套房单价
 
 OtherRoomCount
 Int
-Nul
+Null
 
 其他房型数量
 
 OtherRoomPrice
-decimal
-Nul
+decimal(10, 2)
+Null
 
 其他房型单价
 
 Commission
-decimal
-Nul
+decimal(10, 2)
+Null
 
 佣金
 
 CommissionCurrency
 Int
-Nul
+Null
 
 佣金币种
 数据类型字表Id
 CommissionMark
 Int
-Nul
+Null
 
 佣金标识
 0否 1是
 RoomExplanation
 varchar(500)
-Nul
+Null
 
 房间说明
 
 Attachment
 varchar(500)
-Nul
+Null
 
 附件
 
 CardPrice
-decimal
-Nul
+decimal(10, 2)
+Null
 
 信用卡金额
 
 IsCardPrice
 Int
-Nul
+Null
 
 确认标识信用卡金额
 0：未刷(红色)  1:已刷(绿色)
-Operator
-Int
-Nul
-
-操作人
-
-OperatorDate
-DateTime
-Nul
-
-操作时间
-
-breakfastPrice
-decimal
-Nul
+BreakfastPrice
+decimal(10, 2)
+Null
 
 早餐费
 
-isoppay
+IsOppay
 Int
-Nul
+Null
 
 是否由地接支付
 0否1是
-cboOne
+IsCboOne
 Int
-Nul
+Null
 
 是否住了单间
 0否1是
-cboTwo
+IsCboTwo
 Int
-Nul
+Null
 
 是否住了双间
 0否1是
-cboThree
+IsCboThree
 Int
-Nul
+Null
 
 是否住了酒店套房
 0否1是
-cboFour
+IsCboFour
 Int
-Nul
+Null
 
 是否住了其他房型
 0否1是
 
+10) 付款信息表：Grp_CreditCardPayment（挪用）
+                                   字段名
+                                 类型长度
+                                 字段属性
+                                 字段约束
+                                 字段描述
+                                    备注
+PayDId
+int
+Null
+
+支付方式
+数据类型Id
+ConsumptionPatterns
+varchar(125)
+Null
+
+消费方式
+
+ConsumptionDate
+DateTime
+Null
+
+消费日期
+
+CTDId
+int
+Null
+
+卡类型
+
+BankNo
+varchar(125)
+Null
+
+银行卡号
+
+CardholderName
+varchar(125)
+Null
+
+持卡人姓名
+
+PayMoney
+decimal(10, 2)
+Null
+
+付款金额
+
+PaymentCurrency
+int
+Null
+
+付款币种
+数据类型Id
+DayRate
+varchar(MAX)
+Null
+
+当天汇率
+
+CompanyBankNo
+varchar(100)
+Null
+
+公司银行卡号
+
+OtherBankName
+varchar(125)
+Null
+
+对方开户行
+
+OtherSideNo
+varchar(125)
+Null
+
+对方银行账号
+
+OtherSideName
+varchar(125)
+Null
+
+对方姓名
+
+MFOperator
+int
+Null
+
+财务操作人
+
+MFOperatorDate
+DateTime
+Null
+
+财务操作时间
+
+IsAuditDM
+int
+Null
+
+部门经理是否审核
+0否1是
+AuditDMOperate
+int
+Null
+
+部门经理审核人
+
+AuditDMDate
+DateTime
+Null
+
+部门经理审核时间
+
+IsAuditMF
+int
+Null
+
+财务部是否审核
+0否1是
+AuditMFOperate
+int
+Null
+
+财务部审核人
+
+AuditMFDate
+DateTime
+Null
+
+财务部审核时间
+
+IsAuditGM
+int
+Null
+
+总经理是否审核
+0否1是
+AuditGMOperate
+int
+Null
+
+总经理审核人
+
+AuditGMDate
+DateTime
+Null
+
+总经理审核时间
+
+IsPay
+int
+Null
+
+是否付款
+0否1是
+DIId
+int
+Null
+
+团组外键编号
+团组表Id
+CId
+int
+Null
+
+指向表外键编号
+指向表Id
+CTable
+int
+Null
+
+指向标识
+设置数据外键编号
+PayPercentage
+decimal(10, 2)
+Null
+
+此次付款百分比
+
+PayThenMoney
+decimal(10, 2)
+Null
+
+此次付款金额
+
+PayPercentageOld
+decimal(10, 2)
+Null
+
+上次付款百分比
+
+PayThenMoneyOld
+decimal(10, 2)
+Null
+
+上次付款金额
+
+UpdateDate
+DateTime
+Null
+
+上次付款时间
+
+Payee
+varchar(50)
+Null
+
+收款方
+
+RMBPrice
+decimal(10, 2)
+Null
+
+人民币费用
+
+OrbitalPrivateTransfer
+varchar(20)
+Null
+
+费用标识
+
+ExceedBudget
+decimal(10, 2)
+Null
+
+超出预算比例
+
 
 1. 资源板块
 1) 酒店数据表：Res_HotelData（挪用）