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

username@email.com

2021-06-28 76430b83e28b43122886c1cd8a9fb1cd61040d22

 zhengcaioa/Services/HrSalaryService.cs

@@ -101,6 +101,13 @@
                var updatepltRole = _context.HrSalaries.Where(c=>c.Id==dto.Id).SingleOrDefault();
                if(updatepltRole!=null)
                {
                    //更新电话费用状态
                    var sim = _context.SimCost.Where(c => c.bill_year == dto.Year && c.bill_month <= dto.Month && c.user_id == dto.Userid && c.status == "0").ToList();
                    foreach(var item in sim)
                    {
                        item.status = "1";
                    }

                    var user = _context.PltUsers.Where(c => c.Id == updatepltRole.Userid).SingleOrDefault();

                    updatepltRole.Jiangjin = dto.Jiangjin;
@@ -178,7 +185,7 @@
                        }
                    }

                    updatepltRole.Islock = "Q";
                    updatepltRole.Islock = "H";
                    updatepltRole.Modifier = dto.Modifier;
                    updatepltRole.Modifytime =DateTime.Now;
                    var count= _context.SaveChanges();
@@ -578,7 +585,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,
@@ -819,5 +826,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;
            }
        }
    }
}