daysettings

src/Hotline.Api/Controllers/OrderController.cs

@@ -16,6 +16,7 @@ using MapsterMapper;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using System.Runtime.CompilerServices;
 using XF.Domain.Authentications;
 using XF.Domain.Exceptions;
 using XF.Domain.Extensions;
@@ -307,4 +308,15 @@ public class OrderController : BaseController
         return rsp;
     }
 
+
+
+
+    public async Task<PagedDto<PublishDto>> CanPublishOrder([FromQuery] QueryOrderPublishDto dto)
+    {
+
+
+        return null;
+    }
+
+
 }

src/Hotline.Api/Controllers/SettingController.cs

@@ -106,9 +106,9 @@ namespace Hotline.Api.Controllers
         /// <returns></returns>
         [Permission(EPermission.DaySetings)]
         [HttpGet("getdaysettings-month/{month}")]
-        public async Task<List<DaySetting>> GetDaySettingsByMonth(int month)
+        public async Task<List<DaySetting>> GetDaySettingsByMonth(int year,int month)
         {
-            return await _daysettingRepository.GetDaySettingsByMonth(month);
+            return await _daysettingRepository.GetDaySettingsByMonth(year,month);
         }
 
         /// <summary>

src/Hotline.Repository.SqlSugar/System/DaySettingRepository.cs

@@ -23,9 +23,9 @@ namespace Hotline.Repository.SqlSugar.System
         }
 
 
-        public async Task<List<DaySetting>> GetDaySettingsByMonth(int month)
+        public async Task<List<DaySetting>> GetDaySettingsByMonth(int year,int month)
         {
-            return await Db.Queryable<DaySetting>().Where(x => x.Day.Month == month).ToListAsync();
+            return await Db.Queryable<DaySetting>().Where(x => x.Day.Year == year && x.Day.Month == month).ToListAsync();
         }
 
     }

src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -321,4 +321,18 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public OrderReportDto OrderReport { get; set; }
     }
+
+
+    public class PublishDto:OrderDto
+    {
+        /// <summary>
+        /// 发布范围
+        /// </summary>
+        public EPublishState PublishState { get; set; }
+
+        /// <summary>
+        /// 整理内容
+        /// </summary>
+        public string ArrangeContent { get; set; }
+    }
 }

src/Hotline.Share/Dtos/Order/QueryOrderDto.cs

@@ -78,4 +78,9 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public List<EOrderStatus> Statuses { get; set; } = new();
     }
+
+    public record QueryOrderPublishDto : PagedRequest
+    {
+        
+    }
 }

src/Hotline/Orders/OrderPublished.cs

@@ -25,11 +25,6 @@ public class OrderPublished : CreationEntity
     [SugarColumn(ColumnDataType = "varchar(2000)")]
     public string ArrangeContent { get; set; }
 
-    /// <summary>
-    /// 查询密码
-    /// </summary>
-    public string CheckPassword { get; set; }
-
     /// <summary>
     /// 已发布工单
     /// </summary>

src/Hotline/Settings/TimeLimits/IDaySettingRepository.cs

@@ -6,6 +6,6 @@ namespace Hotline.Settings.TimeLimits
     {
         Task<bool> IsWorkDay(DateTime date);
 
-        Task<List<DaySetting>> GetDaySettingsByMonth(int month);
+        Task<List<DaySetting>> GetDaySettingsByMonth(int year,int month);
     }
 }