提交

username@email.com

2023-07-25 ded7ee4841b2b6006e00dde2da08b6cb6d81feed

 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))
@@ -966,7 +1021,7 @@
                }

                //销假必须三天以内
                if (leaveOff.StratTime.Value.Date < DateTime.Now.Date.AddDays(-3))
                if (leaveOff.EndTime.Value.Date < DateTime.Now.Date.AddDays(-4))
                {
                    resultEntity.Result = false;
                    resultEntity.Message = "请在72小时内进行销假处理，超过72小时无法提交";