提交

username@email.com

2021-08-17 1eaeeb1efd83e7b0b04cdb1bdc1076e839bfebfe

 zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs

@@ -310,7 +310,53 @@

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

        #endregion



        #region 工资查询

        public IActionResult SearchIndexRenshi(string UserId)
        {
            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;

            //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.UserId = UserId;

            return View();
        }

        /// <summary>
        /// 列表内容
        /// </summary>
        /// <param name="search"></param>
        /// <returns></returns>
        public IActionResult GetSearchListRenshi(HrSalaryDTOSearch search)
        {

            //自动确认
            //_hrSalaryService.AutoCheck();

            if (string.IsNullOrEmpty(search.searchDate))
            {
                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");
            }

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

        #endregion
    }
}