From 15eb82df2d6ec539e9d4245bfe08d531e8eb6379 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期日, 27 四月 2025 14:33:26 +0800
Subject: [PATCH] 修改培训订单占多个座位
---
zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs | 99 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 77 insertions(+), 22 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs b/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
index bac4408..f02eaeb 100644
--- a/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
@@ -204,9 +204,64 @@
search.userId = curentuser.Id;
return JsonConvert.SerializeObject(_signinService.SearchByPaging(search));
}
+
+
+
+ /// <summary>
+ /// 鎴戠殑鑰冨嫟璁板綍
+ /// </summary>
+ /// <returns></returns>
+ [CheckLogin]
+ public IActionResult SigninAll(string id)
+ {
+ JArray jar = new JArray();
+ for (var i = 1; i <= 12; i++)
+ {
+ var jo = string.Format("\"code\":{0}, \"label\":\"{1}鏈圽" ", i, i);
+ jar.Add(JObject.Parse("{" + jo + "}"));
+
+ }
+ ViewBag.month = jar;
+ JArray Year = new JArray();
+ for (var i = -1; i < 2; i++)
+ {
+ var jo = string.Format("\"code\":{0}, \"label\":\"{0}骞碶" ", DateTime.Now.Year + i);
+ Year.Add(JObject.Parse("{" + jo + "}"));
+ }
+ ViewBag.year = Year;
+ ViewBag.userid = id;
+ List<ActionEntity> actionlist = new List<ActionEntity>();
+ ActionEntity actionEntity = new ActionEntity();
+ actionEntity.OpenType = 0;
+ actionEntity.ActionUrl = "";
+ actionEntity.ActionFun = "Search";
+ actionEntity.PageIco = "fa fa-search";
+ actionEntity.ActionName = "鏌ヨ";
+ actionlist.Add(actionEntity);
+ ViewData["ActionInfo"] = actionlist;
+
+ return View();
+ }
+
+
+
+ /// <summary>
+ /// 鍙栧緱鑰冨嫟璁板綍
+ /// </summary>
+ /// <returns></returns>
+
+ [CheckLogin]
+ public string GetSigninListAll(AdmSignInDTOSearch search)
+ {
+ //var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ //search.userId = curentuser.Id;
+ return JsonConvert.SerializeObject(_signinService.SearchByPaging(search));
+ }
+
+
#endregion
#region 璇峰亣涓庨攢鍋�
- public IActionResult AskLeave(string id="", string StratTimeName = "", string EndTimeName = "")
+ public IActionResult AskLeave(string id="", string StratTimeName = "", string EndTimeName = "")
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -345,21 +400,21 @@
if(admAsk.Step == "鎻愪氦")
{
//璇峰亣鏃堕棿涓嶈兘閲嶅彔
- var qingjia = _signinService.GetAskLeaveChongdie(curentuser.Id, admAsk.StratTime.Value, admAsk.EndTime.Value);
- if (qingjia.Count > 0)
- {
- resultEntity.Result = false;
- resultEntity.Message = "璇ユ椂闂存宸茬粡鏈夎鍋囷紒";
- return JsonConvert.SerializeObject(resultEntity);
- }
+ //var qingjia = _signinService.GetAskLeaveChongdie(curentuser.Id, admAsk.StratTime.Value, admAsk.EndTime.Value);
+ // if (qingjia.Count > 0)
+ // {
+ // resultEntity.Result = false;
+ // resultEntity.Message = "璇ユ椂闂存宸茬粡鏈夎鍋囷紒";
+ // return JsonConvert.SerializeObject(resultEntity);
+ // }
- //璇峰亣瓒呰繃涓夊ぉ锛屽繀椤绘彁鍓嶄笁澶╀互涓婅鍋囷紒
- if (admAsk.LaveDay.Value >= 3 && admAsk.StratTime.Value.Date < DateTime.Now.Date.AddDays(3))
- {
- resultEntity.Result = false;
- resultEntity.Message = "璇峰亣瓒呰繃涓夊ぉ锛屽繀椤绘彁鍓嶄笁澶╀互涓婅鍋囷紒";
- return JsonConvert.SerializeObject(resultEntity);
- }
+ ////璇峰亣瓒呰繃涓夊ぉ锛屽繀椤绘彁鍓嶄笁澶╀互涓婅鍋囷紒
+ // if (admAsk.LaveDay.Value >= 3 && admAsk.StratTime.Value.Date < DateTime.Now.Date.AddDays(3))
+ // {
+ // resultEntity.Result = false;
+ // resultEntity.Message = "璇峰亣瓒呰繃涓夊ぉ锛屽繀椤绘彁鍓嶄笁澶╀互涓婅鍋囷紒";
+ // return JsonConvert.SerializeObject(resultEntity);
+ // }
//璇峰亣瓒呰繃涓冨ぉ锛屽繀椤绘彁鍓嶄竷澶╀互涓婅鍋囷紒
if (admAsk.LaveDay.Value >= 7 && admAsk.StratTime.Value.Date < DateTime.Now.Date.AddDays(7))
@@ -965,13 +1020,13 @@
return JsonConvert.SerializeObject(resultEntity);
}
- //閿�鍋囧繀椤讳笁澶╀互鍐�
- if (leaveOff.StratTime.Value.Date < DateTime.Now.Date.AddDays(-3))
- {
- resultEntity.Result = false;
- resultEntity.Message = "璇峰湪72灏忔椂鍐呰繘琛岄攢鍋囧鐞嗭紝瓒呰繃72灏忔椂鏃犳硶鎻愪氦";
- return JsonConvert.SerializeObject(resultEntity);
- }
+ ////閿�鍋囧繀椤讳笁澶╀互鍐�
+ //if (leaveOff.EndTime.Value.Date < DateTime.Now.Date.AddDays(-4))
+ //{
+ // resultEntity.Result = false;
+ // resultEntity.Message = "璇峰湪72灏忔椂鍐呰繘琛岄攢鍋囧鐞嗭紝瓒呰繃72灏忔椂鏃犳硶鎻愪氦";
+ // return JsonConvert.SerializeObject(resultEntity);
+ //}
}
using (TransactionScope scope = new TransactionScope())
--
Gitblit v1.9.1