提交

username@email.com

2021-08-24 63f97a810a8dcd213f4624533aa52f7bc2647d49

 zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs

@@ -292,8 +292,8 @@
            ViewData["ActionInfo"] = actionlist;

            ViewBag.dept = _hrDeptService.GetList().Select(x => new { code = x.Id, label = x.DeptName }).ToList();
            ViewBag.stime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.ToString("yyyy-MM-dd");
            ViewBag.etime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd"); 
            ViewBag.stime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.ToString("yyyy-MM");
            ViewBag.etime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM"); 

            return View();
        }
@@ -330,8 +330,8 @@
            ViewData["ActionInfo"] = actionlist;

            //ViewBag.dept = _hrDeptService.GetList().Select(x => new { code = x.Id, label = x.DeptName }).ToList();
            ViewBag.stime = new DateTime(DateTime.Now.Year,1,1).ToString("yyyy-MM-dd");
            ViewBag.etime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd");
            ViewBag.stime =DateTime.Now.ToString("yyyy-MM");
            ViewBag.etime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM");

            ViewBag.UserId = UserId;

@@ -349,9 +349,13 @@
            //自动确认
            //_hrSalaryService.AutoCheck();

            if (string.IsNullOrEmpty(search.searchDate))
            if (string.IsNullOrEmpty(search.searchDatestart))
            {
                search.searchDate = new DateTime(DateTime.Now.Year, 1, 1).ToString("yyyy-MM-dd") + "|" + DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd");
                search.searchDatestart = DateTime.Now.ToString("yyyy-MM");
            }
            if (string.IsNullOrEmpty(search.searchDateend))
            {
                search.searchDate = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM");
            }

            return new JsonResult(_hrSalaryService.SearchByPagingFinish(search));