3、桌面程序同步添加黑屏代码段选项

4、桌面程序部分逻辑优化重写
5、桌面程序到达机场时间优化
6、桌面程序前一天日期处理
7、桌面程序最后日期处理

travelExport/Air_TicketBlackCode.cs

@@ -29,5 +29,6 @@ namespace travelExport
         public string DeleteTime { get; set; }
         public string Remark { get; set; }
         public Nullable<int> IsDel { get; set; }
+        public string Title { get; set; }
     }
 }

travelExport/Crm_NewClientData.cs

@@ -42,5 +42,7 @@ namespace travelExport
         public string DeleteTime { get; set; }
         public string Remark { get; set; }
         public Nullable<int> IsDel { get; set; }
+        public Nullable<int> LastUpdateUserId { get; set; }
+        public Nullable<System.DateTime> LastUpdateTime { get; set; }
     }
 }

travelExport/Crm_TableOperationRecord.cs

@@ -25,5 +25,17 @@ namespace travelExport
         public string DeleteTime { get; set; }
         public string Remark { get; set; }
         public Nullable<int> IsDel { get; set; }
+        public string Status { get; set; }
+        public string RemoteIp { get; set; }
+        public string Location { get; set; }
+        public string browser { get; set; }
+        public string Os { get; set; }
+        public Nullable<long> Elapsed { get; set; }
+        public string RequestParam { get; set; }
+        public string ReturnResult { get; set; }
+        public string UpdatePreData { get; set; }
+        public string UpdateBefData { get; set; }
+        public string RequestUrl { get; set; }
+        public string DeviceType { get; set; }
     }
 }

travelExport/DB.edmx

@@ -18,6 +18,7 @@
           <Property Name="NowPrice" Type="varchar" MaxLength="200" />
           <Property Name="BCPrice" Type="decimal" Precision="10" Scale="2" />
           <Property Name="ECPrice" Type="decimal" Precision="10" Scale="2" />
+          <Property Name="Title" Type="nvarchar" MaxLength="200" />
           <Property Name="CreateUserId" Type="int" />
           <Property Name="CreateTime" Type="datetime" />
           <Property Name="DeleteUserId" Type="int" />
@@ -469,6 +470,8 @@
           <Property Name="DeleteTime" Type="nvarchar" MaxLength="30" />
           <Property Name="Remark" Type="nvarchar(max)" />
           <Property Name="IsDel" Type="int" />
+          <Property Name="LastUpdateUserId" Type="int" />
+          <Property Name="LastUpdateTime" Type="datetime" />
         </EntityType>
         <!--生成过程中发现错误:
 警告 6002: 表/视图“OA2023DB.dbo.Crm_NewClientData_Encryption”未定义主键。已推断出该键，并将定义创建为只读的表/视图。-->
@@ -520,6 +523,18 @@
           <Property Name="DeleteTime" Type="varchar" MaxLength="30" />
           <Property Name="Remark" Type="varchar" MaxLength="500" />
           <Property Name="IsDel" Type="int" />
+          <Property Name="Status" Type="varchar" MaxLength="100" />
+          <Property Name="RemoteIp" Type="varchar" MaxLength="100" />
+          <Property Name="Location" Type="varchar" MaxLength="150" />
+          <Property Name="browser" Type="varchar" MaxLength="100" />
+          <Property Name="Os" Type="varchar" MaxLength="100" />
+          <Property Name="Elapsed" Type="bigint" />
+          <Property Name="RequestParam" Type="text" />
+          <Property Name="ReturnResult" Type="text" />
+          <Property Name="UpdatePreData" Type="text" />
+          <Property Name="UpdateBefData" Type="text" />
+          <Property Name="RequestUrl" Type="varchar" MaxLength="100" />
+          <Property Name="DeviceType" Type="varchar" MaxLength="50" />
         </EntityType>
         <EntityType Name="Crm_VisaCustomerCompany">
           <Key>
@@ -1998,6 +2013,22 @@
           <Property Name="DeleteTime" Type="varchar" MaxLength="30" />
           <Property Name="Remark" Type="varchar" MaxLength="500" />
           <Property Name="IsDel" Type="int" />
+          <Property Name="AirTicketDt" Type="varchar" MaxLength="30" />
+          <Property Name="IsAirTicket" Type="int" />
+          <Property Name="AirTicketRemark" Type="varchar" MaxLength="300" />
+          <Property Name="HotelDt" Type="varchar" MaxLength="30" />
+          <Property Name="IsHotel" Type="int" />
+          <Property Name="HotelRemark" Type="varchar" MaxLength="300" />
+          <Property Name="IsSelectedAirportd" Type="bit" />
+          <Property Name="IsSelectedApprovalData" Type="bit" />
+          <Property Name="IsSelectedIssueApproval" Type="bit" />
+          <Property Name="IsSelectedVisaInfo" Type="bit" />
+          <Property Name="IsSelectedSendVisa" Type="bit" />
+          <Property Name="IsSelectedIssueVisa" Type="bit" />
+          <Property Name="IsSelectedAirTicket" Type="bit" />
+          <Property Name="IsSelectedHotel" Type="bit" />
+          <Property Name="IsSelectedPreTripMeeting" Type="bit" />
+          <Property Name="IsSelectedAirportdDropOff" Type="bit" />
         </EntityType>
         <EntityType Name="Grp_InvertedListVisaCountry">
           <Key>
@@ -2762,6 +2793,8 @@
           <Property Name="DeleteTime" Type="varchar" MaxLength="30" />
           <Property Name="Remark" Type="text" />
           <Property Name="IsDel" Type="int" />
+          <Property Name="LastUpdateUserId " Type="int" />
+          <Property Name="LastUpdateTime " Type="datetime" />
         </EntityType>
         <EntityType Name="Res_CarGuides">
           <Key>
@@ -2922,6 +2955,8 @@
           <Property Name="DeleteTime" Type="varchar" MaxLength="30" />
           <Property Name="Remark" Type="nvarchar(max)" />
           <Property Name="IsDel" Type="int" />
+          <Property Name="LastUpdateUserId " Type="int" />
+          <Property Name="LastUpdateTime" Type="datetime" />
         </EntityType>
         <!--生成过程中发现错误:
 警告 6002: 表/视图“OA2023DB.dbo.Res_InvitationOfficialActivityData_Data”未定义主键。已推断出该键，并将定义创建为只读的表/视图。-->
@@ -3037,13 +3072,14 @@
           <Property Name="StrainScore" Type="nvarchar" MaxLength="50" />
           <Property Name="LocalAndChineseScore" Type="nvarchar" MaxLength="50" />
           <Property Name="StaffType" Type="int" />
-          <Property Name="LastUpdate" Type="datetime" />
+          <Property Name="LastUpdateTime" Type="datetime" />
           <Property Name="CreateUserId" Type="int" />
           <Property Name="CreateTime" Type="datetime" />
           <Property Name="DeleteUserId" Type="int" />
           <Property Name="DeleteTime" Type="varchar" MaxLength="30" />
           <Property Name="Remark" Type="nvarchar(max)" />
           <Property Name="IsDel" Type="int" />
+          <Property Name="LastUpdateUserId" Type="int" />
         </EntityType>
         <EntityType Name="Res_MediaSuppliers">
           <Key>
@@ -3238,6 +3274,8 @@
           <Property Name="DeleteTime" Type="varchar" MaxLength="30" />
           <Property Name="Remark" Type="nvarchar(max)" />
           <Property Name="IsDel" Type="int" />
+          <Property Name="LastUpdateUserId" Type="int" />
+          <Property Name="LastUpdateTime" Type="datetime" />
         </EntityType>
         <!--生成过程中发现错误:
 警告 6002: 表/视图“OA2023DB.dbo.Res_TranslatorLibrary_Encryption”未定义主键。已推断出该键，并将定义创建为只读的表/视图。-->
@@ -4021,13 +4059,14 @@
     [Res_LocalGuideData].[StrainScore] AS [StrainScore], 
     [Res_LocalGuideData].[LocalAndChineseScore] AS [LocalAndChineseScore], 
     [Res_LocalGuideData].[StaffType] AS [StaffType], 
-    [Res_LocalGuideData].[LastUpdate] AS [LastUpdate], 
+    [Res_LocalGuideData].[LastUpdateTime] AS [LastUpdateTime], 
     [Res_LocalGuideData].[CreateUserId] AS [CreateUserId], 
     [Res_LocalGuideData].[CreateTime] AS [CreateTime], 
     [Res_LocalGuideData].[DeleteUserId] AS [DeleteUserId], 
     [Res_LocalGuideData].[DeleteTime] AS [DeleteTime], 
     [Res_LocalGuideData].[Remark] AS [Remark], 
-    [Res_LocalGuideData].[IsDel] AS [IsDel]
+    [Res_LocalGuideData].[IsDel] AS [IsDel], 
+    [Res_LocalGuideData].[LastUpdateUserId] AS [LastUpdateUserId]
     FROM [dbo].[Res_LocalGuideData] AS [Res_LocalGuideData]</DefiningQuery>
           </EntitySet>
           <EntitySet Name="Res_OfficialActivities0426" EntityType="Self.Res_OfficialActivities0426" store:Type="Tables" store:Schema="dbo">
@@ -4187,6 +4226,7 @@
           <Property Name="DeleteTime" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
           <Property Name="Remark" Type="String" MaxLength="500" FixedLength="false" Unicode="false" />
           <Property Name="IsDel" Type="Int32" />
+          <Property Name="Title" Type="String" MaxLength="200" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="Bus_ConfItem">
           <Key>
@@ -4485,6 +4525,8 @@
           <Property Name="DeleteTime" Type="String" MaxLength="30" FixedLength="false" Unicode="true" />
           <Property Name="Remark" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
           <Property Name="IsDel" Type="Int32" />
+          <Property Name="LastUpdateUserId" Type="Int32" />
+          <Property Name="LastUpdateTime" Type="DateTime" Precision="3" />
         </EntityType>
         <EntityType Name="Crm_TableOperationRecord">
           <Key>
@@ -4501,6 +4543,18 @@
           <Property Name="DeleteTime" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
           <Property Name="Remark" Type="String" MaxLength="500" FixedLength="false" Unicode="false" />
           <Property Name="IsDel" Type="Int32" />
+          <Property Name="Status" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="RemoteIp" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="Location" Type="String" MaxLength="150" FixedLength="false" Unicode="false" />
+          <Property Name="browser" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="Os" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="Elapsed" Type="Int64" />
+          <Property Name="RequestParam" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
+          <Property Name="ReturnResult" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
+          <Property Name="UpdatePreData" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
+          <Property Name="UpdateBefData" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
+          <Property Name="RequestUrl" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="DeviceType" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
         </EntityType>
         <EntityType Name="Crm_VisaCustomerCompany">
           <Key>
@@ -5647,6 +5701,22 @@
           <Property Name="DeleteTime" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
           <Property Name="Remark" Type="String" MaxLength="500" FixedLength="false" Unicode="false" />
           <Property Name="IsDel" Type="Int32" />
+          <Property Name="AirTicketDt" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
+          <Property Name="IsAirTicket" Type="Int32" />
+          <Property Name="AirTicketRemark" Type="String" MaxLength="300" FixedLength="false" Unicode="false" />
+          <Property Name="HotelDt" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
+          <Property Name="IsHotel" Type="Int32" />
+          <Property Name="HotelRemark" Type="String" MaxLength="300" FixedLength="false" Unicode="false" />
+          <Property Name="IsSelectedAirportd" Type="Boolean" />
+          <Property Name="IsSelectedApprovalData" Type="Boolean" />
+          <Property Name="IsSelectedIssueApproval" Type="Boolean" />
+          <Property Name="IsSelectedVisaInfo" Type="Boolean" />
+          <Property Name="IsSelectedSendVisa" Type="Boolean" />
+          <Property Name="IsSelectedIssueVisa" Type="Boolean" />
+          <Property Name="IsSelectedAirTicket" Type="Boolean" />
+          <Property Name="IsSelectedHotel" Type="Boolean" />
+          <Property Name="IsSelectedPreTripMeeting" Type="Boolean" />
+          <Property Name="IsSelectedAirportdDropOff" Type="Boolean" />
         </EntityType>
         <EntityType Name="Grp_InvertedListVisaCountry">
           <Key>
@@ -6152,6 +6222,8 @@
           <Property Name="DeleteTime" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
           <Property Name="Remark" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
           <Property Name="IsDel" Type="Int32" />
+          <Property Name="LastUpdateUserId_" Type="Int32" />
+          <Property Name="LastUpdateTime_" Type="DateTime" Precision="3" />
         </EntityType>
         <EntityType Name="Res_CarGuides">
           <Key>
@@ -6312,6 +6384,8 @@
           <Property Name="DeleteTime" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
           <Property Name="Remark" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
           <Property Name="IsDel" Type="Int32" />
+          <Property Name="LastUpdateUserId_" Type="Int32" />
+          <Property Name="LastUpdateTime" Type="DateTime" Precision="3" />
         </EntityType>
         <EntityType Name="Res_ItemDetail">
           <Key>
@@ -6389,13 +6463,14 @@
           <Property Name="StrainScore" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
           <Property Name="LocalAndChineseScore" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
           <Property Name="StaffType" Type="Int32" />
-          <Property Name="LastUpdate" Type="DateTime" Precision="3" />
           <Property Name="CreateUserId" Type="Int32" />
           <Property Name="CreateTime" Type="DateTime" Precision="3" />
           <Property Name="DeleteUserId" Type="Int32" />
           <Property Name="DeleteTime" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
           <Property Name="Remark" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
           <Property Name="IsDel" Type="Int32" />
+          <Property Name="LastUpdateTime" Type="DateTime" Precision="3" />
+          <Property Name="LastUpdateUserId" Type="Int32" />
         </EntityType>
         <EntityType Name="Res_Memo">
           <Key>
@@ -7576,6 +7651,8 @@
           <Property Name="DeleteTime" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
           <Property Name="Remark" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
           <Property Name="IsDel" Type="Int32" />
+          <Property Name="LastUpdateUserId" Type="Int32" />
+          <Property Name="LastUpdateTime" Type="DateTime" Precision="3" />
         </EntityType>
         <EntityType Name="Sys_Cities">
           <Key>
@@ -7942,6 +8019,7 @@
           <EntitySetMapping Name="Air_TicketBlackCode">
             <EntityTypeMapping TypeName="oa2023DBModel.Air_TicketBlackCode">
               <MappingFragment StoreEntitySet="Air_TicketBlackCode">
+                <ScalarProperty Name="Title" ColumnName="Title" />
                 <ScalarProperty Name="Id" ColumnName="Id" />
                 <ScalarProperty Name="DiId" ColumnName="DiId" />
                 <ScalarProperty Name="LeaveCode" ColumnName="LeaveCode" />
@@ -8238,6 +8316,8 @@
           <EntitySetMapping Name="Crm_NewClientData">
             <EntityTypeMapping TypeName="oa2023DBModel.Crm_NewClientData">
               <MappingFragment StoreEntitySet="Crm_NewClientData">
+                <ScalarProperty Name="LastUpdateTime" ColumnName="LastUpdateTime" />
+                <ScalarProperty Name="LastUpdateUserId" ColumnName="LastUpdateUserId" />
                 <ScalarProperty Name="Id" ColumnName="Id" />
                 <ScalarProperty Name="Number" ColumnName="Number" />
                 <ScalarProperty Name="Lvlid" ColumnName="Lvlid" />
@@ -8272,6 +8352,18 @@
           <EntitySetMapping Name="Crm_TableOperationRecord">
             <EntityTypeMapping TypeName="oa2023DBModel.Crm_TableOperationRecord">
               <MappingFragment StoreEntitySet="Crm_TableOperationRecord">
+                <ScalarProperty Name="DeviceType" ColumnName="DeviceType" />
+                <ScalarProperty Name="RequestUrl" ColumnName="RequestUrl" />
+                <ScalarProperty Name="UpdateBefData" ColumnName="UpdateBefData" />
+                <ScalarProperty Name="UpdatePreData" ColumnName="UpdatePreData" />
+                <ScalarProperty Name="ReturnResult" ColumnName="ReturnResult" />
+                <ScalarProperty Name="RequestParam" ColumnName="RequestParam" />
+                <ScalarProperty Name="Elapsed" ColumnName="Elapsed" />
+                <ScalarProperty Name="Os" ColumnName="Os" />
+                <ScalarProperty Name="browser" ColumnName="browser" />
+                <ScalarProperty Name="Location" ColumnName="Location" />
+                <ScalarProperty Name="RemoteIp" ColumnName="RemoteIp" />
+                <ScalarProperty Name="Status" ColumnName="Status" />
                 <ScalarProperty Name="Id" ColumnName="Id" />
                 <ScalarProperty Name="TableName" ColumnName="TableName" />
                 <ScalarProperty Name="PortType" ColumnName="PortType" />
@@ -9436,6 +9528,22 @@
           <EntitySetMapping Name="Grp_InvertedList">
             <EntityTypeMapping TypeName="oa2023DBModel.Grp_InvertedList">
               <MappingFragment StoreEntitySet="Grp_InvertedList">
+                <ScalarProperty Name="IsSelectedAirportdDropOff" ColumnName="IsSelectedAirportdDropOff" />
+                <ScalarProperty Name="IsSelectedPreTripMeeting" ColumnName="IsSelectedPreTripMeeting" />
+                <ScalarProperty Name="IsSelectedHotel" ColumnName="IsSelectedHotel" />
+                <ScalarProperty Name="IsSelectedAirTicket" ColumnName="IsSelectedAirTicket" />
+                <ScalarProperty Name="IsSelectedIssueVisa" ColumnName="IsSelectedIssueVisa" />
+                <ScalarProperty Name="IsSelectedSendVisa" ColumnName="IsSelectedSendVisa" />
+                <ScalarProperty Name="IsSelectedVisaInfo" ColumnName="IsSelectedVisaInfo" />
+                <ScalarProperty Name="IsSelectedIssueApproval" ColumnName="IsSelectedIssueApproval" />
+                <ScalarProperty Name="IsSelectedApprovalData" ColumnName="IsSelectedApprovalData" />
+                <ScalarProperty Name="IsSelectedAirportd" ColumnName="IsSelectedAirportd" />
+                <ScalarProperty Name="HotelRemark" ColumnName="HotelRemark" />
+                <ScalarProperty Name="IsHotel" ColumnName="IsHotel" />
+                <ScalarProperty Name="HotelDt" ColumnName="HotelDt" />
+                <ScalarProperty Name="AirTicketRemark" ColumnName="AirTicketRemark" />
+                <ScalarProperty Name="IsAirTicket" ColumnName="IsAirTicket" />
+                <ScalarProperty Name="AirTicketDt" ColumnName="AirTicketDt" />
                 <ScalarProperty Name="Id" ColumnName="Id" />
                 <ScalarProperty Name="DiId" ColumnName="DiId" />
                 <ScalarProperty Name="ApprovalDataDt" ColumnName="ApprovalDataDt" />
@@ -9973,6 +10081,8 @@
           <EntitySetMapping Name="Res_CarData">
             <EntityTypeMapping TypeName="oa2023DBModel.Res_CarData">
               <MappingFragment StoreEntitySet="Res_CarData">
+                <ScalarProperty Name="LastUpdateTime_" ColumnName="LastUpdateTime " />
+                <ScalarProperty Name="LastUpdateUserId_" ColumnName="LastUpdateUserId " />
                 <ScalarProperty Name="Id" ColumnName="Id" />
                 <ScalarProperty Name="UnitArea" ColumnName="UnitArea" />
                 <ScalarProperty Name="UnitName" ColumnName="UnitName" />
@@ -10138,6 +10248,8 @@
           <EntitySetMapping Name="Res_InvitationOfficialActivityData">
             <EntityTypeMapping TypeName="oa2023DBModel.Res_InvitationOfficialActivityData">
               <MappingFragment StoreEntitySet="Res_InvitationOfficialActivityData">
+                <ScalarProperty Name="LastUpdateTime" ColumnName="LastUpdateTime" />
+                <ScalarProperty Name="LastUpdateUserId_" ColumnName="LastUpdateUserId " />
                 <ScalarProperty Name="Id" ColumnName="Id" />
                 <ScalarProperty Name="Country" ColumnName="Country" />
                 <ScalarProperty Name="City" ColumnName="City" />
@@ -10230,6 +10342,8 @@
           <EntitySetMapping Name="Res_LocalGuideData">
             <EntityTypeMapping TypeName="oa2023DBModel.Res_LocalGuideData">
               <MappingFragment StoreEntitySet="Res_LocalGuideData">
+                <ScalarProperty Name="LastUpdateUserId" ColumnName="LastUpdateUserId" />
+                <ScalarProperty Name="LastUpdateTime" ColumnName="LastUpdateTime" />
                 <ScalarProperty Name="Id" ColumnName="Id" />
                 <ScalarProperty Name="UnitArea" ColumnName="UnitArea" />
                 <ScalarProperty Name="UnitName" ColumnName="UnitName" />
@@ -10248,7 +10362,6 @@
                 <ScalarProperty Name="StrainScore" ColumnName="StrainScore" />
                 <ScalarProperty Name="LocalAndChineseScore" ColumnName="LocalAndChineseScore" />
                 <ScalarProperty Name="StaffType" ColumnName="StaffType" />
-                <ScalarProperty Name="LastUpdate" ColumnName="LastUpdate" />
                 <ScalarProperty Name="CreateUserId" ColumnName="CreateUserId" />
                 <ScalarProperty Name="CreateTime" ColumnName="CreateTime" />
                 <ScalarProperty Name="DeleteUserId" ColumnName="DeleteUserId" />
@@ -11311,6 +11424,8 @@
           <EntitySetMapping Name="Res_TranslatorLibrary">
             <EntityTypeMapping TypeName="oa2023DBModel.Res_TranslatorLibrary">
               <MappingFragment StoreEntitySet="Res_TranslatorLibrary">
+                <ScalarProperty Name="LastUpdateTime" ColumnName="LastUpdateTime" />
+                <ScalarProperty Name="LastUpdateUserId" ColumnName="LastUpdateUserId" />
                 <ScalarProperty Name="IsDel" ColumnName="IsDel" />
                 <ScalarProperty Name="Remark" ColumnName="Remark" />
                 <ScalarProperty Name="DeleteTime" ColumnName="DeleteTime" />

travelExport/DB.edmx.diagram

@@ -4,7 +4,7 @@
   <edmx:Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx">
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
-      <Diagram DiagramId="91f6a5e0dba8427eaab843fafdcdde0b" Name="Diagram1" ZoomLevel="54">
+      <Diagram DiagramId="91f6a5e0dba8427eaab843fafdcdde0b" Name="Diagram1" ZoomLevel="93">
         <EntityTypeShape EntityType="oa2023DBModel.Air_TicketBlackCode" Width="1.5" PointX="0.75" PointY="0.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Bus_ConfItem" Width="1.5" PointX="2.75" PointY="0.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Bus_ConfItemList" Width="1.5" PointX="4.75" PointY="0.75" IsExpanded="true" />

travelExport/Grp_InvertedList.cs

@@ -50,5 +50,21 @@ namespace travelExport
         public string DeleteTime { get; set; }
         public string Remark { get; set; }
         public Nullable<int> IsDel { get; set; }
+        public string AirTicketDt { get; set; }
+        public Nullable<int> IsAirTicket { get; set; }
+        public string AirTicketRemark { get; set; }
+        public string HotelDt { get; set; }
+        public Nullable<int> IsHotel { get; set; }
+        public string HotelRemark { get; set; }
+        public Nullable<bool> IsSelectedAirportd { get; set; }
+        public Nullable<bool> IsSelectedApprovalData { get; set; }
+        public Nullable<bool> IsSelectedIssueApproval { get; set; }
+        public Nullable<bool> IsSelectedVisaInfo { get; set; }
+        public Nullable<bool> IsSelectedSendVisa { get; set; }
+        public Nullable<bool> IsSelectedIssueVisa { get; set; }
+        public Nullable<bool> IsSelectedAirTicket { get; set; }
+        public Nullable<bool> IsSelectedHotel { get; set; }
+        public Nullable<bool> IsSelectedPreTripMeeting { get; set; }
+        public Nullable<bool> IsSelectedAirportdDropOff { get; set; }
     }
 }

travelExport/Home.Designer.cs

@@ -39,6 +39,7 @@
             this.airCheckbox = new System.Windows.Forms.CheckBox();
             this.hotelCheckbox = new System.Windows.Forms.CheckBox();
             this.gwCheckbox = new System.Windows.Forms.CheckBox();
+            this.SublevelComboBox = new System.Windows.Forms.ComboBox();
             this.SuspendLayout();
             // 
             // comb_Delegation
@@ -46,7 +47,7 @@
             this.comb_Delegation.FormattingEnabled = true;
             this.comb_Delegation.Location = new System.Drawing.Point(13, 12);
             this.comb_Delegation.Name = "comb_Delegation";
-            this.comb_Delegation.Size = new System.Drawing.Size(472, 20);
+            this.comb_Delegation.Size = new System.Drawing.Size(216, 20);
             this.comb_Delegation.TabIndex = 0;
             // 
             // btnImport
@@ -90,7 +91,7 @@
             // airLable
             // 
             this.airLable.AutoSize = true;
-            this.airLable.Location = new System.Drawing.Point(159, 74);
+            this.airLable.Location = new System.Drawing.Point(168, 65);
             this.airLable.Name = "airLable";
             this.airLable.Size = new System.Drawing.Size(95, 12);
             this.airLable.TabIndex = 5;
@@ -100,7 +101,7 @@
             // hotelLable
             // 
             this.hotelLable.AutoSize = true;
-            this.hotelLable.Location = new System.Drawing.Point(159, 99);
+            this.hotelLable.Location = new System.Drawing.Point(168, 90);
             this.hotelLable.Name = "hotelLable";
             this.hotelLable.Size = new System.Drawing.Size(95, 12);
             this.hotelLable.TabIndex = 6;
@@ -109,7 +110,7 @@
             // gwLabel
             // 
             this.gwLabel.AutoSize = true;
-            this.gwLabel.Location = new System.Drawing.Point(159, 124);
+            this.gwLabel.Location = new System.Drawing.Point(168, 115);
             this.gwLabel.Name = "gwLabel";
             this.gwLabel.Size = new System.Drawing.Size(95, 12);
             this.gwLabel.TabIndex = 7;
@@ -118,7 +119,7 @@
             // airCheckbox
             // 
             this.airCheckbox.AutoSize = true;
-            this.airCheckbox.Location = new System.Drawing.Point(0, 73);
+            this.airCheckbox.Location = new System.Drawing.Point(9, 64);
             this.airCheckbox.Name = "airCheckbox";
             this.airCheckbox.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
             this.airCheckbox.Size = new System.Drawing.Size(132, 16);
@@ -129,7 +130,7 @@
             // hotelCheckbox
             // 
             this.hotelCheckbox.AutoSize = true;
-            this.hotelCheckbox.Location = new System.Drawing.Point(24, 98);
+            this.hotelCheckbox.Location = new System.Drawing.Point(33, 89);
             this.hotelCheckbox.Name = "hotelCheckbox";
             this.hotelCheckbox.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
             this.hotelCheckbox.Size = new System.Drawing.Size(108, 16);
@@ -140,7 +141,7 @@
             // gwCheckbox
             // 
             this.gwCheckbox.AutoSize = true;
-            this.gwCheckbox.Location = new System.Drawing.Point(24, 124);
+            this.gwCheckbox.Location = new System.Drawing.Point(33, 115);
             this.gwCheckbox.Name = "gwCheckbox";
             this.gwCheckbox.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
             this.gwCheckbox.Size = new System.Drawing.Size(108, 16);
@@ -148,11 +149,20 @@
             this.gwCheckbox.Text = "公务是否有数据";
             this.gwCheckbox.UseVisualStyleBackColor = true;
             // 
+            // SublevelComboBox
+            // 
+            this.SublevelComboBox.FormattingEnabled = true;
+            this.SublevelComboBox.Location = new System.Drawing.Point(275, 12);
+            this.SublevelComboBox.Name = "SublevelComboBox";
+            this.SublevelComboBox.Size = new System.Drawing.Size(210, 20);
+            this.SublevelComboBox.TabIndex = 11;
+            // 
             // Home
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(497, 256);
+            this.Controls.Add(this.SublevelComboBox);
             this.Controls.Add(this.gwCheckbox);
             this.Controls.Add(this.hotelCheckbox);
             this.Controls.Add(this.airCheckbox);
@@ -185,6 +195,7 @@
         private System.Windows.Forms.CheckBox airCheckbox;
         private System.Windows.Forms.CheckBox hotelCheckbox;
         private System.Windows.Forms.CheckBox gwCheckbox;
+        private System.Windows.Forms.ComboBox SublevelComboBox;
     }
 }
 

travelExport/Res_CarData.cs

@@ -41,5 +41,7 @@ namespace travelExport
         public string DeleteTime { get; set; }
         public string Remark { get; set; }
         public Nullable<int> IsDel { get; set; }
+        public Nullable<int> LastUpdateUserId_ { get; set; }
+        public Nullable<System.DateTime> LastUpdateTime_ { get; set; }
     }
 }

travelExport/Res_InvitationOfficialActivityData.cs

@@ -43,5 +43,7 @@ namespace travelExport
         public string DeleteTime { get; set; }
         public string Remark { get; set; }
         public Nullable<int> IsDel { get; set; }
+        public Nullable<int> LastUpdateUserId_ { get; set; }
+        public Nullable<System.DateTime> LastUpdateTime { get; set; }
     }
 }

travelExport/Res_LocalGuideData.cs

@@ -32,12 +32,13 @@ namespace travelExport
         public string StrainScore { get; set; }
         public string LocalAndChineseScore { get; set; }
         public Nullable<int> StaffType { get; set; }
-        public Nullable<System.DateTime> LastUpdate { get; set; }
         public Nullable<int> CreateUserId { get; set; }
         public Nullable<System.DateTime> CreateTime { get; set; }
         public Nullable<int> DeleteUserId { get; set; }
         public string DeleteTime { get; set; }
         public string Remark { get; set; }
         public Nullable<int> IsDel { get; set; }
+        public Nullable<System.DateTime> LastUpdateTime { get; set; }
+        public Nullable<int> LastUpdateUserId { get; set; }
     }
 }

travelExport/Res_TranslatorLibrary.cs

@@ -33,5 +33,7 @@ namespace travelExport
         public string DeleteTime { get; set; }
         public string Remark { get; set; }
         public Nullable<int> IsDel { get; set; }
+        public Nullable<int> LastUpdateUserId { get; set; }
+        public Nullable<System.DateTime> LastUpdateTime { get; set; }
     }
 }