username@email.com
2021-06-10 c888afad7b611e6341b8e733eff5e651ae82695b
zhengcaioa/Services/AdmSigninService.cs
@@ -251,11 +251,20 @@
                if (string.IsNullOrEmpty(admAsk.Id))
                {
                    ask.Id = Guid.NewGuid().ToString();
                    admAsk.Id = ask.Id;
                    _context.AdmAskLeaves.Add(ask);                  
                }
                else
                {
                    var entity = _context.AdmAskLeaves.Find(admAsk.Id);
                    entity.SigninId = admAsk.SigninId;
                    entity.StratPoint = admAsk.StratPoint;
                    entity.EndPoint = admAsk.EndPoint;
                    entity.ShenpiStatus = admAsk.ShenpiStatus;
                    entity.CreaterName = admAsk.CreaterName;
                    entity.Tittle = admAsk.Tittle;
                    entity.LaveDay = admAsk.LaveDay;
                    entity.LavehHour = admAsk.LavehHour;
                    entity.Remark = admAsk.Remark;
@@ -294,6 +303,14 @@
                else
                {
                    var entity = _context.AdmAskLeaveOffs.Find(leaveOff.Id);
                    entity.SigninId = leaveOff.SigninId;
                    entity.StratPoint = leaveOff.StratPoint;
                    entity.EndPoint = leaveOff.EndPoint;
                    entity.ShenpiStatus = leaveOff.ShenpiStatus;
                    entity.CreaterName = leaveOff.CreaterName;
                    entity.Tittle = leaveOff.Tittle;
                    entity.MedicalRecord = leaveOff.MedicalRecord;                    
                    entity.Remark = leaveOff.Remark;
                    entity.Lavetype = leaveOff.Lavetype;
@@ -316,9 +333,9 @@
            return resultEntity;
        }
        public AdmAskLeaveDTO GetAskLeave(string signinId)
        public AdmAskLeaveDTO GetAskLeave(string Id)
        {
            AdmAskLeave entity =  _context.AdmAskLeaves.Where(e => e.RecStatus == "A" && e.SigninId == signinId).FirstOrDefault();
            AdmAskLeave entity =  _context.AdmAskLeaves.Where(e => e.RecStatus == "A" && e.Id == Id).FirstOrDefault();
            if (entity == null)
            {
                entity = new AdmAskLeave();
@@ -328,9 +345,9 @@
        }
       
        public AdmAskLeaveOffDTO GetAskLeaveOff(string signinId)
        public AdmAskLeaveOffDTO GetAskLeaveOff(string Id)
        {
            AdmAskLeaveOff entity = _context.AdmAskLeaveOffs.Where(e => e.RecStatus == "A" && e.SigninId == signinId).FirstOrDefault();
            AdmAskLeaveOff entity = _context.AdmAskLeaveOffs.Where(e => e.RecStatus == "A" && e.Id == Id ).FirstOrDefault();
            if (entity == null)
            {
                entity = new AdmAskLeaveOff();