倒推表下载

签证描述调整

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -10866,15 +10866,31 @@ namespace OASystem.API.Controllers
             dic.Add("SQQZtime", info1.SendVisaDt.ConvertToDatetime());
 
             string sqqzRemark = "";
-            foreach (var item in info1.VisaCountryData)
+            if (info1.VisaCountryData.Count > 0)
             {
-                sqqzRemark += $"{item.Country}，";
-            }
+                string countryStr = "";
+                string countryDesc = "";
+                foreach (var item in info1.VisaCountryData)
+                {
+                    countryStr += $"{item.Country}、";
+                    countryDesc += $"{item.Country}签证{item.VisaDay}个工作日,";
+                }
+
+                if (countryStr.Length > 0)
+                {
+                    countryStr = countryStr.Substring(0, countryStr.Length - 1);
+                }
+
+                if (countryDesc.Length > 0)
+                {
+                    countryDesc = countryDesc.Substring(0, countryDesc.Length - 1);
+                }
+
+
+                sqqzRemark = $"申请{countryStr}签证;{countryDesc}";
 
-            if (sqqzRemark.Length > 0)
-            {
-                sqqzRemark = sqqzRemark.Substring(0, sqqzRemark.Length - 1);
             }
+            
 
             dic.Add("SQQZRemark", sqqzRemark);
 

OASystem/OASystem.Domain/Entities/Groups/Grp_GroupCost.cs

@@ -127,11 +127,11 @@ namespace OASystem.Domain.Entities.Groups
             set { tgn = value; }
         }
 
+
+        decimal tgof;
         /// <summary>
         /// 导游超时费用
         /// </summary>
-        decimal tgof;
-
         [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
         public decimal TGOF
         {