部分实体更新, 注释酒店详细信息， 修改酒店信息展示。

travelExport/DB.Context.cs

@@ -96,7 +96,6 @@ namespace travelExport
         public virtual DbSet<Grp_TourClientList> Grp_TourClientList { get; set; }
         public virtual DbSet<Grp_TravelList> Grp_TravelList { get; set; }
         public virtual DbSet<Grp_VisaFeeInfo> Grp_VisaFeeInfo { get; set; }
-        public virtual DbSet<Grp_VisaInfo> Grp_VisaInfo { get; set; }
         public virtual DbSet<Grp_VisaInfo0430171300> Grp_VisaInfo0430171300 { get; set; }
         public virtual DbSet<Grp_VisaProgress> Grp_VisaProgress { get; set; }
         public virtual DbSet<Grp_VisaProgressCustomer> Grp_VisaProgressCustomer { get; set; }
@@ -144,5 +143,7 @@ namespace travelExport
         public virtual DbSet<Grp_CreditCardPayment2> Grp_CreditCardPayment2 { get; set; }
         public virtual DbSet<Grp_InvertedListVisaCountry20240430114047> Grp_InvertedListVisaCountry20240430114047 { get; set; }
         public virtual DbSet<Res_OfficialActivities0426> Res_OfficialActivities0426 { get; set; }
+        public virtual DbSet<Grp_HotelInquiry> Grp_HotelInquiry { get; set; }
+        public virtual DbSet<Grp_VisaInfo> Grp_VisaInfo { get; set; }
     }
 }

travelExport/DB.edmx

@@ -4,7 +4,7 @@
   <edmx:Runtime>
     <!-- SSDL content -->
     <edmx:StorageModels>
-      <Schema Namespace="oa2023DBModel.Store" Provider="System.Data.SqlClient" ProviderManifestToken="2008" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
+    <Schema Namespace="oa2023DBModel.Store" Provider="System.Data.SqlClient" ProviderManifestToken="2008" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
         <EntityType Name="Air_TicketBlackCode">
           <Key>
             <PropertyRef Name="Id" />
@@ -806,6 +806,7 @@
           <Property Name="IsDel" Type="int" />
           <Property Name="SelectCheck" Type="nvarchar" MaxLength="1000" />
           <Property Name="PriceType" Type="int" />
+          <Property Name="PriceName" Type="nvarchar" MaxLength="200" />
         </EntityType>
         <EntityType Name="Grp_CarTouristGuideGroundReservationsContent">
           <Key>
@@ -1459,6 +1460,37 @@
           <Property Name="Remark" Type="varchar" MaxLength="500" />
           <Property Name="IsDel" Type="int" />
         </EntityType>
+        <EntityType Name="Grp_HotelInquiry">
+          <Key>
+            <PropertyRef Name="Id" />
+          </Key>
+          <Property Name="Id" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="DiId" Type="int" />
+          <Property Name="City" Type="varchar" MaxLength="50" />
+          <Property Name="Name" Type="varchar" MaxLength="100" />
+          <Property Name="Address" Type="varchar" MaxLength="200" />
+          <Property Name="SelectDt" Type="datetime" />
+          <Property Name="CheckInDate" Type="datetime" />
+          <Property Name="CheckOutDate" Type="datetime" />
+          <Property Name="SinglePrice" Type="decimal" Precision="10" Scale="2" />
+          <Property Name="SingleQuantity" Type="int" />
+          <Property Name="SingleCurrency" Type="int" />
+          <Property Name="DoublePrice" Type="decimal" Precision="10" Scale="2" />
+          <Property Name="DoubleQuantity" Type="int" />
+          <Property Name="DoubleCurrency" Type="int" />
+          <Property Name="SuitePrice" Type="decimal" Precision="10" Scale="2" />
+          <Property Name="SuiteQuantity" Type="int" />
+          <Property Name="SuiteCurrency" Type="int" />
+          <Property Name="OtherPrice" Type="decimal" Precision="10" Scale="2" />
+          <Property Name="OtherQuantity" Type="int" />
+          <Property Name="OtherCurrency" Type="int" />
+          <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="varchar" MaxLength="500" />
+          <Property Name="IsDel" Type="int" />
+        </EntityType>
         <EntityType Name="Grp_HotelReservations">
           <Key>
             <PropertyRef Name="Id" />
@@ -1886,6 +1918,7 @@
           <Property Name="DiId" Type="int" />
           <Property Name="IsChecked" Type="int" />
           <Property Name="CountryVisaFeeId" Type="int" />
+          <Property Name="OBType" Type="int" />
           <Property Name="AgencyFee" Type="decimal" Precision="10" Scale="2" />
           <Property Name="OtherFee" Type="decimal" Precision="10" Scale="2" />
           <Property Name="CreateUserId" Type="int" />
@@ -1910,7 +1943,7 @@
           <Property Name="VisaFreeNumber" Type="int" />
           <Property Name="CreateUserId" Type="int" />
           <Property Name="CreateTime" Type="datetime" />
-          <Property Name="DeleteTime" Type="int" />
+          <Property Name="DeleteTime" Type="varchar" MaxLength="30" />
           <Property Name="DeleteUserId" Type="int" />
           <Property Name="Remark" Type="text" />
           <Property Name="IsDel" Type="int" Nullable="false" />
@@ -2270,6 +2303,8 @@
           <Property Name="VisaPrice" Type="decimal" Precision="10" Scale="2" />
           <Property Name="VisaPriceDesc" Type="varchar" MaxLength="300" />
           <Property Name="VisaType" Type="varchar" MaxLength="50" />
+          <Property Name="GrandBusinessAgencyFee" Type="decimal" Precision="10" Scale="2" />
+          <Property Name="PettyBusinessAgencyFee" Type="decimal" Precision="10" Scale="2" />
           <Property Name="VisaTime" Type="varchar" MaxLength="50" />
           <Property Name="IsUrgent" Type="int" />
           <Property Name="UrgentTime" Type="varchar" MaxLength="50" />
@@ -2320,6 +2355,8 @@
           <Property Name="OtherInformation" Type="varchar" MaxLength="500" />
           <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="varchar" MaxLength="500" />
           <Property Name="IsDel" Type="int" />
         </EntityType>
@@ -2467,6 +2504,8 @@
           <Property Name="Id" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
           <Property Name="DiId" Type="int" />
           <Property Name="Type" Type="int" />
+          <Property Name="Country" Type="varchar" MaxLength="100" />
+          <Property Name="Area" Type="varchar" MaxLength="200" />
           <Property Name="Client" Type="varchar(max)" />
           <Property Name="Date" Type="varchar" MaxLength="120" />
           <Property Name="Time" Type="varchar" MaxLength="120" />
@@ -2475,6 +2514,8 @@
           <Property Name="Job" Type="varchar" MaxLength="50" />
           <Property Name="Tel" Type="varchar" MaxLength="120" />
           <Property Name="OfficialForm" Type="int" />
+          <Property Name="Field" Type="varchar" MaxLength="100" />
+          <Property Name="ReqSample" Type="varchar" MaxLength="500" />
           <Property Name="Setting" Type="varchar(max)" />
           <Property Name="Dresscode" Type="varchar" MaxLength="120" />
           <Property Name="Attendees" Type="varchar(max)" />
@@ -2818,6 +2859,7 @@
           <Property Name="WorkExperience" Type="varchar" MaxLength="500" />
           <Property Name="Certificate" Type="varchar" MaxLength="500" />
           <Property Name="HrAudit" Type="int" />
+          <Property Name="QiyeChatUserId" Type="varchar" MaxLength="200" />
           <Property Name="CreateUserId" Type="int" />
           <Property Name="CreateTime" Type="datetime" />
           <Property Name="DeleteUserId" Type="int" />
@@ -2891,6 +2933,7 @@
           <EntitySet Name="Grp_GroupCostParameter" EntityType="Self.Grp_GroupCostParameter" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="Grp_GroupsTaskAssignment" EntityType="Self.Grp_GroupsTaskAssignment" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="Grp_GuidesInfo" EntityType="Self.Grp_GuidesInfo" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="Grp_HotelInquiry" EntityType="Self.Grp_HotelInquiry" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="Grp_HotelReservations" EntityType="Self.Grp_HotelReservations" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="Grp_InsuranceCost" EntityType="Self.Grp_InsuranceCost" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="Grp_InvertedList" EntityType="Self.Grp_InvertedList" Schema="dbo" store:Type="Tables" />
@@ -3046,8 +3089,7 @@
     FROM [dbo].[Res_OfficialActivities0426] AS [Res_OfficialActivities0426]</DefiningQuery>
           </EntitySet>
         </EntityContainer>
-      </Schema>
-    </edmx:StorageModels>
+      </Schema></edmx:StorageModels>
     <!-- CSDL content -->
     <edmx:ConceptualModels>
       <Schema Namespace="oa2023DBModel" Alias="Self" annotation:UseStrongSpatialTypes="false" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm">
@@ -3852,6 +3894,7 @@
           <Property Name="IsDel" Type="Int32" />
           <Property Name="SelectCheck" Type="String" MaxLength="1000" FixedLength="false" Unicode="true" />
           <Property Name="PriceType" Type="Int32" />
+          <Property Name="PriceName" Type="String" MaxLength="200" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="Grp_CarTouristGuideGroundReservationsContent">
           <Key>
@@ -4869,27 +4912,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" />
-        </EntityType>
-        <EntityType Name="Grp_VisaInfo">
-          <Key>
-            <PropertyRef Name="Id" />
-          </Key>
-          <Property Name="Id" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="DIId" Type="Int32" />
-          <Property Name="VisaClient" Type="String" MaxLength="120" FixedLength="false" Unicode="false" />
-          <Property Name="VisaPrice" Type="Decimal" Precision="10" Scale="2" />
-          <Property Name="VisaCurrency" Type="Int32" />
-          <Property Name="IsThird" Type="Int32" />
-          <Property Name="PassengerType" Type="Int32" />
-          <Property Name="VisaNumber" Type="Int32" />
-          <Property Name="VisaFreeNumber" Type="Int32" />
-          <Property Name="CreateUserId" Type="Int32" />
-          <Property Name="CreateTime" Type="DateTime" Precision="3" />
-          <Property Name="DeleteTime" Type="Int32" />
-          <Property Name="DeleteUserId" Type="Int32" />
-          <Property Name="Remark" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
-          <Property Name="IsDel" Type="Int32" Nullable="false" />
-          <Property Name="visaDescription" Type="String" MaxLength="150" FixedLength="false" Unicode="true" />
+          <Property Name="OBType" Type="Int32" />
         </EntityType>
         <EntityType Name="Grp_VisaInfo0430171300">
           <Key>
@@ -5258,6 +5281,8 @@
           <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="GrandBusinessAgencyFee" Type="Decimal" Precision="10" Scale="2" />
+          <Property Name="PettyBusinessAgencyFee" Type="Decimal" Precision="10" Scale="2" />
         </EntityType>
         <EntityType Name="Res_GuidesInfo">
           <Key>
@@ -5297,6 +5322,8 @@
           <Property Name="CreateTime" Type="DateTime" Precision="3" />
           <Property Name="Remark" Type="String" MaxLength="500" FixedLength="false" Unicode="false" />
           <Property Name="IsDel" Type="Int32" />
+          <Property Name="DeleteUserId" Type="Int32" />
+          <Property Name="DeleteTime" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
         </EntityType>
         <EntityType Name="Res_InvitationOfficialActivityData">
           <Key>
@@ -5465,6 +5492,10 @@
           <Property Name="IsDel" Type="Int32" />
           <Property Name="IsSubmitApproval" Type="Int32" />
           <Property Name="IsPay" Type="Int32" />
+          <Property Name="Country" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="Area" Type="String" MaxLength="200" FixedLength="false" Unicode="false" />
+          <Property Name="Field" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="ReqSample" Type="String" MaxLength="500" FixedLength="false" Unicode="false" />
         </EntityType>
         <EntityType Name="Res_PositionEnglishComparison">
           <Key>
@@ -5767,6 +5798,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="QiyeChatUserId" Type="String" MaxLength="200" FixedLength="false" Unicode="false" />
         </EntityType>
         <EntityType Name="sysdiagrams">
           <Key>
@@ -5947,7 +5979,6 @@
           <EntitySet Name="Grp_TourClientList" EntityType="Self.Grp_TourClientList" />
           <EntitySet Name="Grp_TravelList" EntityType="Self.Grp_TravelList" />
           <EntitySet Name="Grp_VisaFeeInfo" EntityType="Self.Grp_VisaFeeInfo" />
-          <EntitySet Name="Grp_VisaInfo" EntityType="Self.Grp_VisaInfo" />
           <EntitySet Name="Grp_VisaInfo0430171300" EntityType="Self.Grp_VisaInfo0430171300" />
           <EntitySet Name="Grp_VisaProgress" EntityType="Self.Grp_VisaProgress" />
           <EntitySet Name="Grp_VisaProgressCustomer" EntityType="Self.Grp_VisaProgressCustomer" />
@@ -5995,7 +6026,61 @@
           <EntitySet Name="Grp_CreditCardPayment2" EntityType="Self.Grp_CreditCardPayment2" />
           <EntitySet Name="Grp_InvertedListVisaCountry20240430114047" EntityType="Self.Grp_InvertedListVisaCountry20240430114047" />
           <EntitySet Name="Res_OfficialActivities0426" EntityType="Self.Res_OfficialActivities0426" />
+          <EntitySet Name="Grp_HotelInquiry" EntityType="oa2023DBModel.Grp_HotelInquiry" />
+          <EntitySet Name="Grp_VisaInfo" EntityType="oa2023DBModel.Grp_VisaInfo" />
         </EntityContainer>
+        <EntityType Name="Grp_HotelInquiry">
+          <Key>
+            <PropertyRef Name="Id" />
+          </Key>
+          <Property Name="Id" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="DiId" Type="Int32" />
+          <Property Name="City" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="Name" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="Address" Type="String" MaxLength="200" FixedLength="false" Unicode="false" />
+          <Property Name="SelectDt" Type="DateTime" Precision="3" />
+          <Property Name="CheckInDate" Type="DateTime" Precision="3" />
+          <Property Name="CheckOutDate" Type="DateTime" Precision="3" />
+          <Property Name="SinglePrice" Type="Decimal" Precision="10" Scale="2" />
+          <Property Name="SingleQuantity" Type="Int32" />
+          <Property Name="SingleCurrency" Type="Int32" />
+          <Property Name="DoublePrice" Type="Decimal" Precision="10" Scale="2" />
+          <Property Name="DoubleQuantity" Type="Int32" />
+          <Property Name="DoubleCurrency" Type="Int32" />
+          <Property Name="SuitePrice" Type="Decimal" Precision="10" Scale="2" />
+          <Property Name="SuiteQuantity" Type="Int32" />
+          <Property Name="SuiteCurrency" Type="Int32" />
+          <Property Name="OtherPrice" Type="Decimal" Precision="10" Scale="2" />
+          <Property Name="OtherQuantity" Type="Int32" />
+          <Property Name="OtherCurrency" Type="Int32" />
+          <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="500" FixedLength="false" Unicode="false" />
+          <Property Name="IsDel" Type="Int32" />
+        </EntityType>
+        <EntityType Name="Grp_VisaInfo">
+          <Key>
+            <PropertyRef Name="Id" />
+          </Key>
+          <Property Name="Id" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="DIId" Type="Int32" />
+          <Property Name="VisaClient" Type="String" MaxLength="120" FixedLength="false" Unicode="false" />
+          <Property Name="VisaPrice" Type="Decimal" Precision="10" Scale="2" />
+          <Property Name="VisaCurrency" Type="Int32" />
+          <Property Name="IsThird" Type="Int32" />
+          <Property Name="PassengerType" Type="Int32" />
+          <Property Name="VisaNumber" Type="Int32" />
+          <Property Name="VisaFreeNumber" Type="Int32" />
+          <Property Name="CreateUserId" Type="Int32" />
+          <Property Name="CreateTime" Type="DateTime" Precision="3" />
+          <Property Name="DeleteTime" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
+          <Property Name="DeleteUserId" Type="Int32" />
+          <Property Name="Remark" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
+          <Property Name="IsDel" Type="Int32" Nullable="false" />
+          <Property Name="visaDescription" Type="String" MaxLength="150" FixedLength="false" Unicode="true" />
+        </EntityType>
       </Schema>
     </edmx:ConceptualModels>
     <!-- C-S mapping content -->
@@ -6811,6 +6896,7 @@
           <EntitySetMapping Name="Grp_CarTouristGuideGroundReservations">
             <EntityTypeMapping TypeName="oa2023DBModel.Grp_CarTouristGuideGroundReservations">
               <MappingFragment StoreEntitySet="Grp_CarTouristGuideGroundReservations">
+                <ScalarProperty Name="PriceName" ColumnName="PriceName" />
                 <ScalarProperty Name="Id" ColumnName="Id" />
                 <ScalarProperty Name="DiId" ColumnName="DiId" />
                 <ScalarProperty Name="Area" ColumnName="Area" />
@@ -7877,6 +7963,7 @@
           <EntitySetMapping Name="Grp_VisaFeeInfo">
             <EntityTypeMapping TypeName="oa2023DBModel.Grp_VisaFeeInfo">
               <MappingFragment StoreEntitySet="Grp_VisaFeeInfo">
+                <ScalarProperty Name="OBType" ColumnName="OBType" />
                 <ScalarProperty Name="Id" ColumnName="Id" />
                 <ScalarProperty Name="DiId" ColumnName="DiId" />
                 <ScalarProperty Name="IsChecked" ColumnName="IsChecked" />
@@ -7892,28 +7979,6 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="Grp_VisaInfo">
-            <EntityTypeMapping TypeName="oa2023DBModel.Grp_VisaInfo">
-              <MappingFragment StoreEntitySet="Grp_VisaInfo">
-                <ScalarProperty Name="Id" ColumnName="Id" />
-                <ScalarProperty Name="DIId" ColumnName="DIId" />
-                <ScalarProperty Name="VisaClient" ColumnName="VisaClient" />
-                <ScalarProperty Name="VisaPrice" ColumnName="VisaPrice" />
-                <ScalarProperty Name="VisaCurrency" ColumnName="VisaCurrency" />
-                <ScalarProperty Name="IsThird" ColumnName="IsThird" />
-                <ScalarProperty Name="PassengerType" ColumnName="PassengerType" />
-                <ScalarProperty Name="VisaNumber" ColumnName="VisaNumber" />
-                <ScalarProperty Name="VisaFreeNumber" ColumnName="VisaFreeNumber" />
-                <ScalarProperty Name="CreateUserId" ColumnName="CreateUserId" />
-                <ScalarProperty Name="CreateTime" ColumnName="CreateTime" />
-                <ScalarProperty Name="DeleteTime" ColumnName="DeleteTime" />
-                <ScalarProperty Name="DeleteUserId" ColumnName="DeleteUserId" />
-                <ScalarProperty Name="Remark" ColumnName="Remark" />
-                <ScalarProperty Name="IsDel" ColumnName="IsDel" />
-                <ScalarProperty Name="visaDescription" ColumnName="visaDescription" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
           <EntitySetMapping Name="Grp_VisaInfo0430171300">
             <EntityTypeMapping TypeName="oa2023DBModel.Grp_VisaInfo0430171300">
               <MappingFragment StoreEntitySet="Grp_VisaInfo0430171300">
@@ -8274,6 +8339,8 @@
           <EntitySetMapping Name="Res_CountryFeeCost">
             <EntityTypeMapping TypeName="oa2023DBModel.Res_CountryFeeCost">
               <MappingFragment StoreEntitySet="Res_CountryFeeCost">
+                <ScalarProperty Name="PettyBusinessAgencyFee" ColumnName="PettyBusinessAgencyFee" />
+                <ScalarProperty Name="GrandBusinessAgencyFee" ColumnName="GrandBusinessAgencyFee" />
                 <ScalarProperty Name="Id" ColumnName="Id" />
                 <ScalarProperty Name="VisaContinent" ColumnName="VisaContinent" />
                 <ScalarProperty Name="VisaCountry" ColumnName="VisaCountry" />
@@ -8323,6 +8390,8 @@
           <EntitySetMapping Name="Res_HotelData">
             <EntityTypeMapping TypeName="oa2023DBModel.Res_HotelData">
               <MappingFragment StoreEntitySet="Res_HotelData">
+                <ScalarProperty Name="DeleteTime" ColumnName="DeleteTime" />
+                <ScalarProperty Name="DeleteUserId" ColumnName="DeleteUserId" />
                 <ScalarProperty Name="Id" ColumnName="Id" />
                 <ScalarProperty Name="City" ColumnName="City" />
                 <ScalarProperty Name="Name" ColumnName="Name" />
@@ -8486,6 +8555,10 @@
           <EntitySetMapping Name="Res_OfficialActivities">
             <EntityTypeMapping TypeName="oa2023DBModel.Res_OfficialActivities">
               <MappingFragment StoreEntitySet="Res_OfficialActivities">
+                <ScalarProperty Name="ReqSample" ColumnName="ReqSample" />
+                <ScalarProperty Name="Field" ColumnName="Field" />
+                <ScalarProperty Name="Area" ColumnName="Area" />
+                <ScalarProperty Name="Country" ColumnName="Country" />
                 <ScalarProperty Name="Id" ColumnName="Id" />
                 <ScalarProperty Name="DiId" ColumnName="DiId" />
                 <ScalarProperty Name="Type" ColumnName="Type" />
@@ -8795,6 +8868,7 @@
           <EntitySetMapping Name="Sys_Users">
             <EntityTypeMapping TypeName="oa2023DBModel.Sys_Users">
               <MappingFragment StoreEntitySet="Sys_Users">
+                <ScalarProperty Name="QiyeChatUserId" ColumnName="QiyeChatUserId" />
                 <ScalarProperty Name="Id" ColumnName="Id" />
                 <ScalarProperty Name="CnName" ColumnName="CnName" />
                 <ScalarProperty Name="EnName" ColumnName="EnName" />
@@ -8944,6 +9018,60 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="Grp_HotelInquiry">
+            <EntityTypeMapping TypeName="oa2023DBModel.Grp_HotelInquiry">
+              <MappingFragment StoreEntitySet="Grp_HotelInquiry">
+                <ScalarProperty Name="IsDel" ColumnName="IsDel" />
+                <ScalarProperty Name="Remark" ColumnName="Remark" />
+                <ScalarProperty Name="DeleteTime" ColumnName="DeleteTime" />
+                <ScalarProperty Name="DeleteUserId" ColumnName="DeleteUserId" />
+                <ScalarProperty Name="CreateTime" ColumnName="CreateTime" />
+                <ScalarProperty Name="CreateUserId" ColumnName="CreateUserId" />
+                <ScalarProperty Name="OtherCurrency" ColumnName="OtherCurrency" />
+                <ScalarProperty Name="OtherQuantity" ColumnName="OtherQuantity" />
+                <ScalarProperty Name="OtherPrice" ColumnName="OtherPrice" />
+                <ScalarProperty Name="SuiteCurrency" ColumnName="SuiteCurrency" />
+                <ScalarProperty Name="SuiteQuantity" ColumnName="SuiteQuantity" />
+                <ScalarProperty Name="SuitePrice" ColumnName="SuitePrice" />
+                <ScalarProperty Name="DoubleCurrency" ColumnName="DoubleCurrency" />
+                <ScalarProperty Name="DoubleQuantity" ColumnName="DoubleQuantity" />
+                <ScalarProperty Name="DoublePrice" ColumnName="DoublePrice" />
+                <ScalarProperty Name="SingleCurrency" ColumnName="SingleCurrency" />
+                <ScalarProperty Name="SingleQuantity" ColumnName="SingleQuantity" />
+                <ScalarProperty Name="SinglePrice" ColumnName="SinglePrice" />
+                <ScalarProperty Name="CheckOutDate" ColumnName="CheckOutDate" />
+                <ScalarProperty Name="CheckInDate" ColumnName="CheckInDate" />
+                <ScalarProperty Name="SelectDt" ColumnName="SelectDt" />
+                <ScalarProperty Name="Address" ColumnName="Address" />
+                <ScalarProperty Name="Name" ColumnName="Name" />
+                <ScalarProperty Name="City" ColumnName="City" />
+                <ScalarProperty Name="DiId" ColumnName="DiId" />
+                <ScalarProperty Name="Id" ColumnName="Id" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="Grp_VisaInfo">
+            <EntityTypeMapping TypeName="oa2023DBModel.Grp_VisaInfo">
+              <MappingFragment StoreEntitySet="Grp_VisaInfo">
+                <ScalarProperty Name="visaDescription" ColumnName="visaDescription" />
+                <ScalarProperty Name="IsDel" ColumnName="IsDel" />
+                <ScalarProperty Name="Remark" ColumnName="Remark" />
+                <ScalarProperty Name="DeleteUserId" ColumnName="DeleteUserId" />
+                <ScalarProperty Name="DeleteTime" ColumnName="DeleteTime" />
+                <ScalarProperty Name="CreateTime" ColumnName="CreateTime" />
+                <ScalarProperty Name="CreateUserId" ColumnName="CreateUserId" />
+                <ScalarProperty Name="VisaFreeNumber" ColumnName="VisaFreeNumber" />
+                <ScalarProperty Name="VisaNumber" ColumnName="VisaNumber" />
+                <ScalarProperty Name="PassengerType" ColumnName="PassengerType" />
+                <ScalarProperty Name="IsThird" ColumnName="IsThird" />
+                <ScalarProperty Name="VisaCurrency" ColumnName="VisaCurrency" />
+                <ScalarProperty Name="VisaPrice" ColumnName="VisaPrice" />
+                <ScalarProperty Name="VisaClient" ColumnName="VisaClient" />
+                <ScalarProperty Name="DIId" ColumnName="DIId" />
+                <ScalarProperty Name="Id" ColumnName="Id" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
         </EntityContainerMapping>
       </Mapping>
     </edmx:Mappings>

travelExport/DB.edmx.diagram

@@ -76,7 +76,6 @@
         <EntityTypeShape EntityType="oa2023DBModel.Grp_TourClientList" Width="1.5" PointX="22.75" PointY="29.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_TravelList" Width="1.5" PointX="30.75" PointY="0.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_VisaFeeInfo" Width="1.5" PointX="30.75" PointY="5.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="oa2023DBModel.Grp_VisaInfo" Width="1.5" PointX="30.75" PointY="9.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_VisaInfo0430171300" Width="1.5" PointX="30.75" PointY="14.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_VisaProgress" Width="1.5" PointX="14.75" PointY="30.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_VisaProgressCustomer" Width="1.5" PointX="16.75" PointY="30.75" IsExpanded="true" />
@@ -124,6 +123,8 @@
         <EntityTypeShape EntityType="oa2023DBModel.Grp_CreditCardPayment2" Width="1.5" PointX="2.75" PointY="38.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_InvertedListVisaCountry20240430114047" Width="1.5" PointX="38.75" PointY="3.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Res_OfficialActivities0426" Width="1.5" PointX="4.75" PointY="38.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="oa2023DBModel.Grp_HotelInquiry" Width="1.5" PointX="29.375" PointY="38.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Grp_VisaInfo" Width="1.5" PointX="39.375" PointY="7.75" />
       </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>

travelExport/Grp_CarTouristGuideGroundReservations.cs

@@ -38,5 +38,6 @@ namespace travelExport
         public Nullable<int> IsDel { get; set; }
         public string SelectCheck { get; set; }
         public Nullable<int> PriceType { get; set; }
+        public string PriceName { get; set; }
     }
 }

travelExport/Grp_HotelInquiry.cs

@@ -0,0 +1,44 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Grp_HotelInquiry
+    {
+        public int Id { get; set; }
+        public Nullable<int> DiId { get; set; }
+        public string City { get; set; }
+        public string Name { get; set; }
+        public string Address { get; set; }
+        public Nullable<System.DateTime> SelectDt { get; set; }
+        public Nullable<System.DateTime> CheckInDate { get; set; }
+        public Nullable<System.DateTime> CheckOutDate { get; set; }
+        public Nullable<decimal> SinglePrice { get; set; }
+        public Nullable<int> SingleQuantity { get; set; }
+        public Nullable<int> SingleCurrency { get; set; }
+        public Nullable<decimal> DoublePrice { get; set; }
+        public Nullable<int> DoubleQuantity { get; set; }
+        public Nullable<int> DoubleCurrency { get; set; }
+        public Nullable<decimal> SuitePrice { get; set; }
+        public Nullable<int> SuiteQuantity { get; set; }
+        public Nullable<int> SuiteCurrency { get; set; }
+        public Nullable<decimal> OtherPrice { get; set; }
+        public Nullable<int> OtherQuantity { get; set; }
+        public Nullable<int> OtherCurrency { 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; }
+    }
+}

travelExport/Grp_VisaFeeInfo.cs

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

travelExport/Grp_VisaInfo.cs

@@ -25,7 +25,7 @@ namespace travelExport
         public Nullable<int> VisaFreeNumber { get; set; }
         public Nullable<int> CreateUserId { get; set; }
         public Nullable<System.DateTime> CreateTime { get; set; }
-        public Nullable<int> DeleteTime { get; set; }
+        public string DeleteTime { get; set; }
         public Nullable<int> DeleteUserId { get; set; }
         public string Remark { get; set; }
         public int IsDel { get; set; }

travelExport/Home.cs

@@ -512,7 +512,7 @@ namespace travelExport
 19:00 入住酒店休息；";
                             }
 
-                            string[] traffic = new string[] { "飞机", "汽车" };
+                            string[] traffic = new string[] { "汽车", "飞机" };
                             if (!isMoreTraffic)
                             {
                                 traffic = new string[] { "汽车", "" };
@@ -648,6 +648,8 @@ namespace travelExport
                         //邀请公务资料
                         var listgwzl = db.Grp_InvitationOfficialActivities.Where(x => x.DiId == diid && x.IsDel == 0).ToList();
 
+                        Grp_HotelReservations lastHotel = null;
+
                         foreach (var item in timeArr)
                         {
                             string trip = string.Empty;
@@ -1016,7 +1018,7 @@ namespace travelExport
                                     };
                                 }
                                 trip += $"{end_Object.City}\r\n";
-                                trip += @"08:00 早餐于酒店；
+                                trip += $@"08:00 早餐于酒店；{(lastHotel != null? $"（酒店名称：{lastHotel.HotelName}）":"")}
 09:00 公务活动；
 10:30 公务活动；
 12:00 午餐于当地餐厅；
@@ -1047,7 +1049,7 @@ namespace travelExport
                                 }
                             }
 
-                            string[] traffic = new string[] { "飞机", "汽车" };
+                            string[] traffic = new string[] { "汽车", "飞机" };
                             if (!isMoreTraffic)
                             {
                                 traffic = new string[] { "汽车", "" };
@@ -1062,13 +1064,17 @@ namespace travelExport
                                     if (htTime <= Convert.ToDateTime(item)
                                      && htTimeOut > Convert.ToDateTime(item))
                                     {
-                                        trip += "\r\n00:00 乘车前往酒店";
-                                        trip += "\r\n00:00 抵达酒店办理入住手续";
+                                        lastHotel = h;
+
+                                        #region 酒店详细信息
+                                        //trip += "\r\n00:00 乘车前往酒店";
+                                        //trip += "\r\n00:00 抵达酒店办理入住手续";
 
-                                        trip = trip + "\r\n"
-                                        + "          酒店名称：" + h.HotelName + "\r\n"
-                                        + "          酒店地址：" + h.HotelAddress + "\r\n"
-                                        + "          酒店电话：" + h.HotelTel + "      酒店传真：" + (string.IsNullOrWhiteSpace(h.HotelFax) ? "-" : h.HotelFax);
+                                        //trip = trip + "\r\n"
+                                        //+ "          酒店名称：" + h.HotelName + "\r\n"
+                                        //+ "          酒店地址：" + h.HotelAddress + "\r\n"
+                                        //+ "          酒店电话：" + h.HotelTel + "      酒店传真：" + (string.IsNullOrWhiteSpace(h.HotelFax) ? "-" : h.HotelFax);
+                                        #endregion
                                     }
                                 }
                             }

travelExport/Res_CountryFeeCost.cs

@@ -36,5 +36,7 @@ namespace travelExport
         public string DeleteTime { get; set; }
         public string Remark { get; set; }
         public Nullable<int> IsDel { get; set; }
+        public Nullable<decimal> GrandBusinessAgencyFee { get; set; }
+        public Nullable<decimal> PettyBusinessAgencyFee { get; set; }
     }
 }

travelExport/Res_HotelData.cs

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

travelExport/Res_OfficialActivities.cs

@@ -40,5 +40,9 @@ namespace travelExport
         public Nullable<int> IsDel { get; set; }
         public Nullable<int> IsSubmitApproval { get; set; }
         public Nullable<int> IsPay { get; set; }
+        public string Country { get; set; }
+        public string Area { get; set; }
+        public string Field { get; set; }
+        public string ReqSample { get; set; }
     }
 }

travelExport/Sys_Users.cs

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

travelExport/travelExport.csproj

@@ -160,6 +160,12 @@
     <Compile Include="Fin_ProceedsReceived.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
+    <Compile Include="Grp_HotelInquiry.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Grp_VisaInfo.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
     <Compile Include="Home.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -301,9 +307,6 @@
     <Compile Include="Grp_VisaFeeInfo.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
-    <Compile Include="Grp_VisaInfo.cs">
-      <DependentUpon>DB.tt</DependentUpon>
-    </Compile>
     <Compile Include="Grp_VisaInfo0430171300.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>