Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa

username@email.com

2021-08-10 35fca917f82c446ef69aa5235351db0fc36cd7ae

 zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs

@@ -69,7 +69,7 @@
        /// <returns></returns>
        public IActionResult GetList(HrSalaryDTOSearch search)
        {
            _hrSalaryService.AutoCheck();
            //_hrSalaryService.AutoCheck();

            return new JsonResult(_hrSalaryService.SearchSalaryByPaging(search));
        }
@@ -85,6 +85,22 @@
            if (!string.IsNullOrEmpty(id))
            {
                dto = _hrSalaryService.Get(id);
            }
            if(!dto.Jiangjin.HasValue)
            {
                dto.Jiangjin = 0;
            }
            if (!dto.Bufagongzi.HasValue)
            {
                dto.Bufagongzi = 0;
            }
            if (!dto.Peichang.HasValue)
            {
                dto.Peichang = 0;
            }
            if (!dto.Jiucuo.HasValue)
            {
                dto.Jiucuo = 0;
            }
            ViewData.Model = dto;
            return View();
@@ -172,8 +188,8 @@
                var  salaryDTO  = _hrSalaryService.Get(salaryId);
                    dto = new HrSalaryAppeal();
                    dto.salary_id = salaryId;
                    dto.Year = salaryDTO.Year;
                    dto.Month = salaryDTO.Month;
                    dto.year = salaryDTO.Year;
                    dto.month = salaryDTO.Month;
                dto.createrName = curentuser.UserName;
                dto.tittle = "工资申诉（" + curentuser.UserName + "）";
            }
@@ -290,7 +306,7 @@
        public IActionResult GetSearchList(HrSalaryDTOSearch search)
        {
            //自动确认
            _hrSalaryService.AutoCheck();
            //_hrSalaryService.AutoCheck();

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