1.酒店预订-->预订成本 excel 删除为0的列 优化

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -10505,7 +10505,7 @@ namespace OASystem.API.Controllers
 
             #region 删除指定行
 
-            bool singleDel = true, doubleDel = true, suiteDel = true, otherDel = true, zcDel = true, dsDel = true, cssDel = true, remarkDel = true;
+            bool singleDel = true, doubleDel = true, suiteDel = true, otherDel = true, zcDel = true, dsDel = true, cssDel = true,cpDel=true, remarkDel = true;
             int singleIndex = dt.Columns["SingleRoomPrice"].Ordinal,
                 doubleIndex = dt.Columns["DoubleRoomPrice"].Ordinal,
                 suiteIndex = dt.Columns["SuiteRoomPrice"].Ordinal,
@@ -10513,6 +10513,7 @@ namespace OASystem.API.Controllers
                 zcIndex = dt.Columns["BreakfastPrice"].Ordinal,
                 dsIndex = dt.Columns["GovernmentRent"].Ordinal,
                 cssIndex = dt.Columns["CityTax"].Ordinal,
+                cpIndex = dt.Columns["ConsumptionPatterns"].Ordinal,
                 remarkIndex = dt.Columns["Remark"].Ordinal;
             //删除指定列
             foreach (DataRow item in dt.Rows)
@@ -10549,22 +10550,26 @@ namespace OASystem.API.Controllers
 
                 string cssStr = item["CityTax"].ToString();
                 bool containsDigitButNotZero7 = !cssStr.StartsWith("0") && Regex.IsMatch(cssStr, @"[1-9]");
-                if (!containsDigitButNotZero7) cssDel = false;
+                if (containsDigitButNotZero7) cssDel = false;
+
+
+                string cpStr = item["ConsumptionPatterns"].ToString();
+                if (!string.IsNullOrEmpty(cpStr)) cpDel = false;
 
                 string remarkStr = item["Remark"].ToString();
                 if (!string.IsNullOrEmpty(remarkStr)) remarkDel = false;
 
             }
-            //singleDel = true,doubleDel = true, suiteDel = true,otherDel = true,zcDel = true,dsDel = true,cssDel = true;
-            int delColumn = 0;
-            if (singleDel) { DeleteColumn(serverPath, singleIndex - delColumn); delColumn++; }
-            if (doubleDel) { DeleteColumn(serverPath, doubleIndex - delColumn); delColumn++; }
-            if (suiteDel) { DeleteColumn(serverPath, suiteIndex - delColumn); delColumn++; }
-            if (otherDel) { DeleteColumn(serverPath, otherIndex - delColumn); delColumn++; }
-            if (zcDel) { DeleteColumn(serverPath, zcIndex - delColumn); delColumn++; }
-            if (dsDel) { DeleteColumn(serverPath, dsIndex - delColumn); delColumn++; }
-            if (cssDel) { DeleteColumn(serverPath, cssIndex - delColumn); delColumn++; }
-            if (remarkDel) { DeleteColumn(serverPath, remarkIndex - delColumn); delColumn++; }
+
+            DeleteColumn(serverPath, remarkIndex, remarkDel);
+            DeleteColumn(serverPath, cpIndex, cpDel);
+            DeleteColumn(serverPath, dsIndex, dsDel);
+            DeleteColumn(serverPath, cssIndex, cssDel);
+            DeleteColumn(serverPath, zcIndex, zcDel);
+            DeleteColumn(serverPath, otherIndex, otherDel);
+            DeleteColumn(serverPath, suiteIndex, suiteDel);
+            DeleteColumn(serverPath, doubleIndex, doubleDel);
+            DeleteColumn(serverPath, singleIndex, singleDel);
             #endregion
             //只保留第一个表格
             DeleteSheet(serverPath);
@@ -10579,7 +10584,7 @@ namespace OASystem.API.Controllers
         /// <param name="columnIndex"></param>
         /// <param name="totalColumns"></param>
         /// <param name="sheetName"></param>
-        private void DeleteColumn(string file, int columnIndex)
+        private void DeleteColumn(string file, int columnIndex,bool isDel)
         {
 
             Aspose.Cells.Workbook wb = new Aspose.Cells.Workbook(file);
@@ -10588,8 +10593,11 @@ namespace OASystem.API.Controllers
            
             if (sheet1 != null)
             {
-                Cells cells = sheet1.Cells;
-                cells.DeleteColumn(columnIndex);
+                if (isDel)
+                {
+                    Cells cells = sheet1.Cells;
+                    cells.DeleteColumn(columnIndex);
+                }
             }
             wb.Save(file);
         }

OASystem/OASystem.Domain/ViewModels/Groups/HotelReservationsByDiIdView.cs

@@ -443,6 +443,9 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public string PayTypeName { get; set; }
 
+        /// <summary>
+        /// 支付时间
+        /// </summary>
         public string PayTime { get; set; }
 
         /// <summary>