工作没有交接完成的，不允许核准工资

username@email.com

2021-08-30 55fb4752a6aa7d19ffbe2b24204b8b21dae7e868

工作没有交接完成的，不允许核准工资

删除流程

 zhengcaioa/Services/AdmPieceCheckService.cs

@@ -130,7 +130,7 @@

                        

                         join k in _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A")
                         join k in _context.PltUsers.Where(x => x.RecStatus == "A")
                 on a.UserId equals k.Id
                 into ksssss
                         from kkk in ksssss.DefaultIfEmpty()

 zhengcaioa/Services/HrSalaryService.cs

@@ -106,6 +106,15 @@
                var updatepltRole = _context.HrSalaries.Where(c=>c.Id==dto.Id).SingleOrDefault();
                if(updatepltRole!=null)
                {
                    //如果有未完成的工作交接，不能核准工资
                 var admAskJiaojies  =  _context.AdmAskJiaojies.Where(x => x.Creater == updatepltRole.Userid &&  x.RecStatus == "A" && x.ShenpiStatus == "D").ToList();
                    if(admAskJiaojies!=null && admAskJiaojies.Count > 0)
                    {
                        resultEntity.Result = false;
                        resultEntity.Message = "有未完成的工作交接，不能核准工资";
                        return resultEntity;
                    }

                    //更新电话费用状态
                    var sim = _context.SimCost.Where(c => c.bill_year == updatepltRole.Year && c.bill_month <= updatepltRole.Month && c.user_id == updatepltRole.Userid && c.status == "0").ToList();
                    if(sim!=null)

 zhengcaioa/Services/UserService.cs

@@ -29,7 +29,7 @@

        public  PltUser login(string user_sn, string password)
        {
            var user = _context.PltUsers.Where(x => (x.UserSn == user_sn || x.Phone == user_sn ) && x.Password == password && x.RecStatus == "A").FirstOrDefault();
            var user = _context.PltUsers.Where(x => (x.UserSn == user_sn || x.Phone == user_sn ) && x.Password == password && x.RecStatus == "A" && x.Zhiwustatus == "A" ).FirstOrDefault();
            
            return user;
        }

 zhengcaioa/Services/WfRunProcessService.cs

@@ -287,6 +287,18 @@
                        model20.Modifier = userid;
                        model20.Modifytime = DateTime.Now;
                        break;
                    case "21":
                        var model21 = _context.AdmAskCiZhis.Find(model.DanjuId);
                        model21.RecStatus = "D";
                        model21.Modifier = userid;
                        model21.Modifytime = DateTime.Now;
                        break;
                    case "22":
                        var model22 = _context.AdmAskJiaojies.Find(model.DanjuId);
                        model22.RecStatus = "D";
                        model22.Modifier = userid;
                        model22.Modifytime = DateTime.Now;
                        break;
                    default:
                        break;
                }