From 09f3459982382e4a7cf52a7f459728887648aa30 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 19 十二月 2022 12:19:44 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs | 68 +++++++++++++++++++++++++++++++++-
1 files changed, 66 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs b/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
index 23467c6..61c2aed 100644
--- a/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
@@ -25,10 +25,12 @@
private readonly IWfRunProcessService _wfRunProcessService;
private readonly IWfHistoryService _wfHistoryService;
private readonly IWfNeeddeelService _wfNeeddeelService;
+ private readonly IPltPageService _pltPageService;
[CheckLogin]
public SigninController(ILogger<SigninController> logger, IAdmSigninService signinService, ISysAttachmentService sysAttachmentService
, IAdmAttendanceRuleService attendanceRuleService, ILiaotianService liaotianService, IWfRunProcessService wfRunProcessService
- , IWfHistoryService wfHistoryService, IWfNeeddeelService wfNeeddeelService)
+ , IWfHistoryService wfHistoryService, IWfNeeddeelService wfNeeddeelService
+ , IPltPageService pltPageService)
{
_logger = logger;
_signinService = signinService;
@@ -38,6 +40,7 @@
_wfRunProcessService = wfRunProcessService;
_wfHistoryService = wfHistoryService;
_wfNeeddeelService = wfNeeddeelService;
+ _pltPageService = pltPageService;
}
#region 鑰冨嫟绛惧埌鎵撳崱
@@ -201,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"));
@@ -1030,6 +1088,12 @@
#region 鑰冨嫟瑙勫垯
public IActionResult AttendanceRule()
{
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/Signin/AttendanceRule/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
+
AdmAttendanceRuleDTO admAttendanceRuleDTO = _attendanceRuleService.Get("");
admAttendanceRuleDTO.admAttendanceRulesDtlDTOs = _attendanceRuleService.GetDtlList("");
--
Gitblit v1.9.1