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

LR-20210131IOQH\Administrator

2021-06-27 3262eb334953a1b208aa4a50584442a3804912d9

 zhengcaioa/Services/HrSalaryService.cs

@@ -178,7 +178,7 @@
                        }
                    }

                    updatepltRole.Islock = "Q";
                    updatepltRole.Islock = "H";
                    updatepltRole.Modifier = dto.Modifier;
                    updatepltRole.Modifytime =DateTime.Now;
                    var count= _context.SaveChanges();
@@ -546,6 +546,26 @@
            return list;
        }



        /// <summary>
        /// 获取所有有效角色
        /// </summary>
        /// <returns></returns>
        public HrSalaryDTO GetListByUser(string Userid, int year, int month)
        {


            var listPosition = _context.HrSalaries.Where(r => r.RecStatus == "A" && r.Userid == Userid && r.Year == year && r.Month == month).FirstOrDefault();

            HrSalaryDTO hrSalaryDTO = null;
            if (listPosition != null)
            {
                hrSalaryDTO = _mapper.Map<HrSalaryDTO>(listPosition);
            }

            return hrSalaryDTO;
        }
        /// <summary>
        /// 工资核对
        /// </summary>
@@ -558,7 +578,7 @@
            var entity = (from a in _context.HrSalaries
                          join b in _context.PltUsers on a.Userid equals b.Id
                          join c in _context.HrDepts on b.DeptId equals c.Id
                          where a.RecStatus=="A" && a.Userid == userid && a.Year == year && a.Month==month
                          where a.RecStatus=="A" && a.Islock!="D" && a.Userid == userid && a.Year == year && a.Month==month
                          select new HrSalaryDTO()
                          {
                              Id = a.Id,
@@ -799,5 +819,17 @@
            data.LoadData(searchEntity, rolelist);
            return data;
        }

        public void AutoCheck()
        {
            try
            {
                var salary = _context.Database.ExecuteSqlRaw("update [hr_salary] set islock='Q',[modifier]='e4c93811-b9b1-4998-89f5-c416ebab0c07',modifytime=getdate() where islock = 'H' and DATEDIFF(hh,[modifytime], getdate()) > 72");
            }
            catch (Exception)
            {
                throw;
            }
        }
    }
}