username@email.com
2021-07-23 00446e5e764fd57ea0f28b30921f4a5daa60c890
zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
@@ -222,46 +222,47 @@
            else
            {
                admAskLeaveDTO.CreaterName = curentuser.UserName;
                admAskLeaveDTO.Tittle = "请假申请(" + curentuser.UserName +")";
            }
                admAskLeaveDTO.Tittle = "请假申请(" + curentuser.UserName + ")";
            if (!string.IsNullOrWhiteSpace(StratTimeName))
            {
                DateTime StratTimeName1;
                if(DateTime.TryParse(StratTimeName, out StratTimeName1))
                if (!string.IsNullOrWhiteSpace(StratTimeName))
                {
                    admAskLeaveDTO.StratTimeName = StratTimeName1.AddHours(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
                    DateTime StratTimeName1;
                    if (DateTime.TryParse(StratTimeName, out StratTimeName1))
                    {
                        admAskLeaveDTO.StratTimeName = StratTimeName1.AddHours(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
                    }
                }
                else
                {
                    admAskLeaveDTO.StratTimeName = DateTime.Now.Date.AddHours(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
                }
            }
            else
            {
                admAskLeaveDTO.StratTimeName =DateTime.Now.Date.AddHours(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
            }
            if (!string.IsNullOrWhiteSpace(EndTimeName))
            {
                DateTime EndTimeName1;
                if (DateTime.TryParse(EndTimeName, out EndTimeName1))
                if (!string.IsNullOrWhiteSpace(EndTimeName))
                {
                    admAskLeaveDTO.EndTimeName = EndTimeName1.AddHours(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
                    DateTime EndTimeName1;
                    if (DateTime.TryParse(EndTimeName, out EndTimeName1))
                    {
                        admAskLeaveDTO.EndTimeName = EndTimeName1.AddHours(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
                    }
                }
                else
                {
                    admAskLeaveDTO.EndTimeName = DateTime.Now.Date.AddHours(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
                }
                AdmAskLeaveDTO admAsk = jisianChecktime(DateTime.Parse(admAskLeaveDTO.StratTimeName), DateTime.Parse(admAskLeaveDTO.EndTimeName));
                admAskLeaveDTO.LaveDay = admAsk.LaveDay;
                admAskLeaveDTO.LavehHour = admAsk.LavehHour;
            }
            else
            {
                admAskLeaveDTO.EndTimeName = DateTime.Now.Date.AddHours(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
            }
            AdmAskLeaveDTO admAsk = jisianChecktime(DateTime.Parse(admAskLeaveDTO.StratTimeName), DateTime.Parse(admAskLeaveDTO.EndTimeName));
            admAskLeaveDTO.LaveDay = admAsk.LaveDay;
            admAskLeaveDTO.LavehHour = admAsk.LavehHour;
            ViewData.Model = admAskLeaveDTO;
@@ -796,7 +797,7 @@
            {
                askLeaveOffDTO.CreaterName = curentuser.UserName;
                askLeaveOffDTO.Tittle = "销假申请(" + curentuser.UserName +")";
            }
@@ -832,7 +833,7 @@
                askLeaveOffDTO.EndTimeName = DateTime.Now.Date.AddHours(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
            }
            }
            ResultDataEntity<SysAttachmentDTO> results = new ResultDataEntity<SysAttachmentDTO>();
            if (!string.IsNullOrEmpty(id))
            {