diff --git a/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs b/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs
index 7e53423..1cef93e 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs
@@ -56,13 +56,24 @@ namespace CoreCms.Net.Web.WebApi.Controllers
private readonly ICoreCmsSettingServices _coreCmsSettingServices;
private readonly IToolsServices _toolsServices;
-
+ private readonly ISQReservationsServices _SQReservationsServices;
+ private readonly ISQRoomsServices _SQRoomsServices;
+ private readonly ISysDictionaryDataServices _sysDictionaryDataServices;
+ private readonly ISysDictionaryServices _sysDictionaryServices;
+ private readonly ISQReservationParticipantsServices _SQReservationParticipantsServices;
///
/// 构造函数
///
public CommonController(ICoreCmsSettingServices settingServices
, ICoreCmsAreaServices areaServices
- , IWebHostEnvironment webHostEnvironment, ICoreCmsServiceDescriptionServices serviceDescriptionServices, ICoreCmsSettingServices coreCmsSettingServices, IToolsServices toolsServices)
+ , IWebHostEnvironment webHostEnvironment, ICoreCmsServiceDescriptionServices serviceDescriptionServices, ICoreCmsSettingServices coreCmsSettingServices,
+ IToolsServices toolsServices,
+ ISQReservationsServices SQReservationsServices,
+ ISQRoomsServices SQRoomsServices,
+ ISysDictionaryDataServices sysDictionaryDataServices,
+ ISysDictionaryServices sysDictionaryServices,
+ ISQReservationParticipantsServices SQReservationParticipantsServices
+ )
{
_webHostEnvironment = webHostEnvironment;
_serviceDescriptionServices = serviceDescriptionServices;
@@ -70,6 +81,12 @@ namespace CoreCms.Net.Web.WebApi.Controllers
_toolsServices = toolsServices;
_settingServices = settingServices;
_areaServices = areaServices;
+ _SQReservationsServices = SQReservationsServices;
+ _SQRoomsServices = SQRoomsServices;
+ _sysDictionaryDataServices = sysDictionaryDataServices;
+ _sysDictionaryServices = sysDictionaryServices;
+ _SQReservationParticipantsServices = SQReservationParticipantsServices;
+
}
@@ -108,6 +125,23 @@ namespace CoreCms.Net.Web.WebApi.Controllers
//var entId = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.EntId); //客服ID
var userAgreementId = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.UserAgreementId).ObjectToInt(3); //用户协议
var privacyPolicyId = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.PrivacyPolicyId).ObjectToInt(4); //隐私政策
+
+
+ var dic = await _sysDictionaryServices.QueryListByClauseAsync(it => !it.deleted, it => it.sortNumber
+ , OrderByType.Asc);
+ var dicData = await _sysDictionaryDataServices.QueryListByClauseAsync(it => !it.deleted);
+ var options = new List