酒店接口修改

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -3559,7 +3559,7 @@ namespace OASystem.API.Controllers
         }
 
         /// <summary>
-        /// region 文件上传  可以带参数
+        /// region 文件上传
         /// </summary>
         /// <param name="file"></param>
         /// <returns></returns>
@@ -3621,13 +3621,15 @@ namespace OASystem.API.Controllers
                 string filePath = "";
                 var fileDir = AppSettingsHelper.Get("GrpFileBasePath");
                 // 返回与指定虚拟路径相对应的物理路径即绝对路径
-                int id = 0;
+                //int id = 0;
                 filePath = fileDir + "/酒店费用录入相关文件/" + dto.fileName;
                 // 删除该文件
                 System.IO.File.Delete(filePath);
-                id = await _sqlSugar.Updateable<Grp_HotelReservations>().Where(a => a.Id == dto.Id).SetColumns(a => new Grp_HotelReservations { Attachment = "" }).ExecuteCommandAsync();
-
-                if (id != 0)
+                var result = await _sqlSugar.Updateable<Grp_HotelReservations>().Where(a => a.Id == dto.Id && a.IsDel==0).SetColumns(a => new Grp_HotelReservations()
+                {
+                    Attachment = "",
+                }).ExecuteCommandAsync();
+                if (result != 0)
                 {
                     return Ok(JsonView(true, "成功！"));
                 }
@@ -3818,7 +3820,7 @@ namespace OASystem.API.Controllers
 
                         var fileDir = AppSettingsHelper.Get("WordBasePath")+ strFileName;
                         doc.Save(fileDir);
-                        string Url = AppSettingsHelper.Get("WordBaseUrl") + "Office/Word" + strFileName;
+                        string Url = AppSettingsHelper.Get("WordBaseUrl") + "Office/Word/" + strFileName;
                         return Ok(JsonView(true, "成功！", Url));
 
                         //保存为doc，并打开 

OASystem/OASystem.Infrastructure/Repositories/Groups/HotelPriceRepository.cs

@@ -164,9 +164,16 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         else if (item.IsAuditGM == 1) item.IsAuditGMStr = "已通过";
                         else if (item.IsAuditGM == 2) item.IsAuditGMStr = "未通过";
                         else if (item.IsAuditGM == 3) item.IsAuditGMStr = "自动审核";
+                        if (!string.IsNullOrWhiteSpace(item.CheckInDate))
+                        {
+                            item.CheckInDate = DateTime.Parse(item.CheckInDate).ToString("yyyy-MM-dd");
+                        }
+                        if (!string.IsNullOrWhiteSpace(item.CheckOutDate))
+                        {
+                            item.CheckOutDate = DateTime.Parse(item.CheckOutDate).ToString("yyyy-MM-dd");
+                        }
 
-                        item.CheckInDate=DateTime.Parse(item.CheckInDate).ToString("yyyy-MM-dd");
-                        item.CheckOutDate = DateTime.Parse(item.CheckOutDate).ToString("yyyy-MM-dd");
+                        
 
                     }
                     return result = new Result() { Code = 0, Msg = "查询成功！", Data = hotelDataList };
@@ -190,8 +197,14 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         else if (item.IsAuditGM == 1) item.IsAuditGMStr = "已通过";
                         else if (item.IsAuditGM == 2) item.IsAuditGMStr = "未通过";
                         else if (item.IsAuditGM == 3) item.IsAuditGMStr = "自动审核";
-                        item.CheckInDate = DateTime.Parse(item.CheckInDate).ToString("yyyy-MM-dd");
-                        item.CheckOutDate = DateTime.Parse(item.CheckOutDate).ToString("yyyy-MM-dd");
+                        if (!string.IsNullOrWhiteSpace(item.CheckInDate))
+                        {
+                            item.CheckInDate = DateTime.Parse(item.CheckInDate).ToString("yyyy-MM-dd");
+                        }
+                        if (!string.IsNullOrWhiteSpace(item.CheckOutDate))
+                        {
+                            item.CheckOutDate = DateTime.Parse(item.CheckOutDate).ToString("yyyy-MM-dd");
+                        }
                     }
                     string CountSql = string.Format(@"Select COUNT(1) as Count From (	
                                                         Select h.Id,s1.Name as GuestType,h.ReservationsNo,h.HotelName,h.CheckInDate,
@@ -244,9 +257,15 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 {
                     Sys_SetData GTId = _sqlSugar.Queryable<Sys_SetData>().First(a => a.IsDel == 0 && a.Id == hotelReservationsById.GTId);
                     if (GTId != null) _hotelReservations.GtIdStr = GTId.Name;
+                    if (!string.IsNullOrWhiteSpace(_hotelReservations.CheckInDate))
+                    {
+                        _hotelReservations.CheckInDate = Convert.ToDateTime(hotelReservationsById.CheckInDate).ToString("yyyy-MM-dd");
+                    }
+                    if (!string.IsNullOrWhiteSpace(_hotelReservations.CheckOutDate))
+                    {
+                        _hotelReservations.CheckOutDate = Convert.ToDateTime(hotelReservationsById.CheckOutDate).ToString("yyyy-MM-dd");
+                    }
                     
-                    _hotelReservations.CheckInDate=Convert.ToDateTime(hotelReservationsById.CheckInDate).ToString("yyyy-MM-dd");
-                    _hotelReservations.CheckOutDate = Convert.ToDateTime(hotelReservationsById.CheckOutDate).ToString("yyyy-MM-dd");
 
                     Sys_SetData GovernmentRentCurrencyStr = _sqlSugar.Queryable<Sys_SetData>().First(a => a.IsDel == 0 && a.Id == hotelReservationsById.GovernmentRentCurrency);
                     if (GovernmentRentCurrencyStr != null) _hotelReservations.GovernmentRentCurrencyStr = GovernmentRentCurrencyStr.Name;