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

LR-20210131IOQH\Administrator

2021-06-10 56e5ef90ee97e296014b4faf6863315ad0c2ace4

 zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs

@@ -21,14 +21,16 @@
        private readonly IAdmSigninService _signinService;
        private readonly ISysAttachmentService _sysAttachmentService;
        private readonly IAdmAttendanceRuleService _attendanceRuleService;
        private readonly ILiaotianService _liaotianService;
        [CheckLogin]
        public SigninController(ILogger<SigninController> logger, IAdmSigninService signinService, ISysAttachmentService sysAttachmentService
            , IAdmAttendanceRuleService attendanceRuleService)
            , IAdmAttendanceRuleService attendanceRuleService, ILiaotianService liaotianService)
        {
            _logger = logger;
            _signinService = signinService;
            _sysAttachmentService = sysAttachmentService;
            _attendanceRuleService = attendanceRuleService;
            _liaotianService = liaotianService;
        }

        #region 考勤签到打卡
@@ -195,19 +197,61 @@
        }
        #endregion
        #region 请假与销假
         public IActionResult AskLeave(string signinId)
         public IActionResult AskLeave(string id="", DateTime? StratTimeName = null, DateTime? EndTimeName = null)
        {
            ViewBag.SigninId = signinId;
            AdmAskLeaveDTO admAskLeaveDTO = _signinService.GetAskLeave(signinId);
            if (admAskLeaveDTO.StratTime.Equals(DateTime.MinValue))

            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;

            AdmAttendanceRuleDTO admAttendanceRuleDTO = _attendanceRuleService.Get("");

            AdmAskLeaveDTO admAskLeaveDTO = new AdmAskLeaveDTO();
            if (!string.IsNullOrEmpty(id))
            {
                admAskLeaveDTO.StratTime = DateTime.Now;
                admAskLeaveDTO = _signinService.GetAskLeave(id);

                admAskLeaveDTO.StratTimeName = admAskLeaveDTO.StratTime.Value.ToString("yyyy-MM-dd HH:mm");
                admAskLeaveDTO.EndTimeName = admAskLeaveDTO.EndTime.Value.ToString("yyyy-MM-dd HH:mm");
            }
            if (admAskLeaveDTO.EndTime.Equals(DateTime.MinValue))
            else
            {
                admAskLeaveDTO.EndTime = DateTime.Now;
                admAskLeaveDTO.CreaterName = curentuser.UserName;
                admAskLeaveDTO.Tittle = "请假申请（" + curentuser.UserName +"）";
            }



            if (StratTimeName.HasValue)
            {
                admAskLeaveDTO.StratTimeName = StratTimeName.Value.AddHours(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
            }

            if (EndTimeName.HasValue)
            {
                admAskLeaveDTO.EndTimeName = EndTimeName.Value.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;

            ResultDataEntity<SysAttachmentDTO> results = new ResultDataEntity<SysAttachmentDTO>();
            if (!string.IsNullOrEmpty(id))
            {
                SysAttachmentDTOSearch searchEntity = new SysAttachmentDTOSearch();
                searchEntity.page = 1;
                searchEntity.rows = 1000;
                searchEntity.AttObj = "AskLeave";
                searchEntity.AttObjid = id;
                results = _sysAttachmentService.SearchByPaging(searchEntity);
            }
            ViewBag.attachment = results;

            ViewData["Lavetype"] = _liaotianService.GetSYScode("ADM_AskLeave", "Lavetype");

            return View();
        }

@@ -219,6 +263,8 @@
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
            admAsk.RecStatus = "A";
            //未挂审批流，提交直接通过
            admAsk.ShenpiStatus = "A";
            if (String.IsNullOrEmpty(admAsk.Id))
            {
                admAsk.Creater = curentuser.Id;
@@ -229,39 +275,451 @@
                admAsk.Modifier = curentuser.Id;
                admAsk.Modifytime = DateTime.Now;
            }
            ResultEntity resultEntity = new ResultEntity();
            resultEntity.Result = false;
            using (TransactionScope scope = new TransactionScope())
            {
                resultEntity = _signinService.SaveAskLeave(admAsk);
                if (resultEntity.Result == false)
                {
                    return JsonConvert.SerializeObject(resultEntity);
                }

             ResultEntity resultEntity = _signinService.SaveAskLeave(admAsk);
                string[] Filepaths = admAsk.Filepath;

                if (Filepaths != null && Filepaths.Length > 0)
                {
                    for (int i = 0; i < Filepaths.Length; i++)
                    {
                        if (string.IsNullOrEmpty(admAsk.attachmentid[i]))
                        {
                            SysAttachmentDTO sysAttachmentDTO = new SysAttachmentDTO();
                            //sysAttachmentDTO.Id = 
                            sysAttachmentDTO.AttObj = "AskLeave";
                            sysAttachmentDTO.AttObjid = admAsk.Id;
                            sysAttachmentDTO.Filefullname = admAsk.Filefullname[i];
                            sysAttachmentDTO.Filepath = admAsk.Filepath[i];
                            sysAttachmentDTO.Creater = curentuser.Id;
                            sysAttachmentDTO.Modifier = curentuser.Id;
                            sysAttachmentDTO.Createtime = DateTime.Now;
                            sysAttachmentDTO.Modifytime = sysAttachmentDTO.Createtime;

                            resultEntity = _sysAttachmentService.save(sysAttachmentDTO);
                            if (resultEntity.Result == false)
                            {
                                return JsonConvert.SerializeObject(resultEntity);
                            }
                        }

                    }


                }
                scope.Complete();
            }
               

            return JsonConvert.SerializeObject(resultEntity);
             
        }
        public IActionResult AskLeaveOff(string signinId)


        [CheckLogin]
        [HttpPost]
        public string Checktime(DateTime StratTime, DateTime EndTime)
        {
            ViewBag.SigninId = signinId;
            AdmAskLeaveOffDTO admAskLeaveOffDTO = _signinService.GetAskLeaveOff(signinId);
            if (admAskLeaveOffDTO.StratTime.Equals(DateTime.MinValue))
            ResultEntity<AdmAskLeaveDTO> resultEntity = new ResultEntity<AdmAskLeaveDTO>();
            
            if (EndTime<= StratTime)
            {
                admAskLeaveOffDTO.StratTime = DateTime.Now;
                resultEntity.Result = false;
                resultEntity.Message = "开始时间不能大于结束时间";
                return JsonConvert.SerializeObject(resultEntity);
            }
            if (admAskLeaveOffDTO.EndTime.Equals(DateTime.MinValue))

            AdmAskLeaveDTO admAsk = jisianChecktime( StratTime, EndTime);
            resultEntity.Result = true;
            resultEntity.DataInfo = admAsk;


            return JsonConvert.SerializeObject(resultEntity);

        }

        public AdmAskLeaveDTO jisianChecktime(DateTime StratTime, DateTime EndTime)
        {
            //string dateDiff = null;
            AdmAttendanceRuleDTO admAttendanceRuleDTO =  _attendanceRuleService.Get("");

            var admAttendanceRulesDtlDTOs = _attendanceRuleService.GetDtlList("");

            var jiejiari = admAttendanceRulesDtlDTOs.Where(x=>x.Name== "jiejiari").ToList();

            var tiaoxiuri = admAttendanceRulesDtlDTOs.Where(x => x.Name == "tiaoxiuri").ToList();

            //每天的考勤时间点
            string[] WorkingStart = admAttendanceRuleDTO.WorkingStart.Split('.');
            int WorkingStarthour = int.Parse(WorkingStart[0]);
            int WorkingStartmin = int.Parse(WorkingStart[1]);

            string[] WorkingEnd = admAttendanceRuleDTO.WorkingEnd.Split('.');
            int WorkingEndhour = int.Parse(WorkingEnd[0]);
            int WorkingEndmin = int.Parse(WorkingEnd[1]);



            string[] OffworkStart = admAttendanceRuleDTO.OffworkStart.Split('.');
            int OffworkStarthour = int.Parse(OffworkStart[0]);
            int OffworkStartmin = int.Parse(OffworkStart[1]);

            string[] OffworkEnd = admAttendanceRuleDTO.OffworkEnd.Split('.');
            int OffworkEndhour = int.Parse(OffworkEnd[0]);
            int OffworkEndmin = int.Parse(OffworkEnd[1]);

            //请假开始时间上班时间
            DateTime StratTimeWorkingStart = StratTime.Date.AddHours(WorkingStarthour).AddMinutes(WorkingStartmin);

            DateTime StratTimeWorkingEnd = StratTime.Date.AddHours(WorkingEndhour).AddMinutes(WorkingEndmin);

            DateTime StratTimeOffworkStart = StratTime.Date.AddHours(OffworkStarthour).AddMinutes(OffworkStartmin);

            DateTime StratTimeOffworkEnd = StratTime.Date.AddHours(OffworkEndhour).AddMinutes(OffworkEndmin);


            //请假结束时间上班时间

            DateTime EndTimeWorkingStart = EndTime.Date.AddHours(WorkingStarthour).AddMinutes(WorkingStartmin);

            DateTime EndTimeWorkingEnd = EndTime.Date.AddHours(WorkingEndhour).AddMinutes(WorkingEndmin);

            DateTime EndTimeOffworkStart = EndTime.Date.AddHours(OffworkStarthour).AddMinutes(OffworkStartmin);

            DateTime EndTimeOffworkEnd = EndTime.Date.AddHours(OffworkEndhour).AddMinutes(OffworkEndmin);

            //上班时间

            TimeSpan shangwu = StratTimeWorkingEnd.Subtract(StratTimeWorkingStart);

            TimeSpan xiawu = StratTimeOffworkEnd.Subtract(StratTimeOffworkStart);




            int shangbanshijian = shangwu.Hours * 60 + shangwu.Minutes + xiawu.Hours * 60 + xiawu.Minutes;


            int LavehTime = 0;
            TimeSpan ts = EndTime.Subtract(StratTime);
            for(int i=0;i<= ts.Days;i++)
            {
                admAskLeaveOffDTO.EndTime = DateTime.Now;
                if (i == 0)
                {
                    //是否上班日期
                    if ((int)StratTime.Date.DayOfWeek >= admAttendanceRuleDTO.WeekStart && (int)StratTime.Date.DayOfWeek <= admAttendanceRuleDTO.WeekEnd)
                    {
                        //是否节假日
                        if (jiejiari.Exists(x => x.ValueStart <= StratTime.Date && x.ValueStart >= StratTime.Date))
                        {

                            LavehTime += 0;
                        }
                        else
                        {



                            if (StratTime <= StratTimeWorkingStart)
                            {
                                LavehTime += shangbanshijian;
                            }
                            else if (StratTime <= StratTimeWorkingEnd)
                            {
                                TimeSpan shangwu1 = StratTimeWorkingEnd.Subtract(StratTime);

                                TimeSpan xiawu1 = StratTimeOffworkEnd.Subtract(StratTimeOffworkStart);


                                LavehTime += shangwu1.Hours * 60 + shangwu1.Minutes + xiawu1.Hours * 60 + xiawu1.Minutes;
                            }
                            else if (StratTime <= StratTimeOffworkStart)
                            {


                                TimeSpan xiawu1 = StratTimeOffworkEnd.Subtract(StratTimeOffworkStart);


                                LavehTime += xiawu1.Hours * 60 + xiawu1.Minutes;
                            }
                            else if (StratTime <= StratTimeOffworkEnd)
                            {
                                TimeSpan xiawu1 = StratTimeOffworkEnd.Subtract(StratTime);


                                LavehTime += xiawu1.Hours * 60 + xiawu1.Minutes;

                            }



                        }
                    }
                    else
                    {

                        //是否调休日  调休日需要上班
                        if (tiaoxiuri.Exists(x => x.ValueStart <= StratTime.Date && x.ValueStart >= StratTime.Date))
                        {
                            if (StratTime <= StratTimeWorkingStart)
                            {
                                LavehTime += shangbanshijian;
                            }
                            else if (StratTime <= StratTimeWorkingEnd)
                            {
                                TimeSpan shangwu1 = StratTimeWorkingEnd.Subtract(StratTime);

                                TimeSpan xiawu1 = StratTimeOffworkEnd.Subtract(StratTimeOffworkStart);


                                LavehTime += shangwu1.Hours * 60 + shangwu1.Minutes + xiawu1.Hours * 60 + xiawu1.Minutes;
                            }
                            else if (StratTime <= StratTimeOffworkStart)
                            {


                                TimeSpan xiawu1 = StratTimeOffworkEnd.Subtract(StratTimeOffworkStart);


                                LavehTime += xiawu1.Hours * 60 + xiawu1.Minutes;
                            }
                            else if (StratTime <= StratTimeOffworkEnd)
                            {
                                TimeSpan xiawu1 = StratTimeOffworkEnd.Subtract(StratTime);


                                LavehTime += xiawu1.Hours * 60 + xiawu1.Minutes;

                            }
                        }
                        else
                        {
                            LavehTime += 0;
                        }
                    }
                }

                if(i == ts.Days)
                {
                    //是否上班日期
                    if ((int)EndTime.Date.DayOfWeek >= admAttendanceRuleDTO.WeekStart && (int)EndTime.Date.DayOfWeek <= admAttendanceRuleDTO.WeekEnd)
                    {
                        //是否节假日
                        if (jiejiari.Exists(x => x.ValueStart <= EndTime.Date && x.ValueStart >= EndTime.Date))
                        {

                            LavehTime += 0;
                        }
                        else
                        {



                            if ( EndTime >= EndTimeOffworkEnd)
                            {
                                LavehTime += shangbanshijian;
                            }
                            else if (EndTime >= EndTimeOffworkStart)
                            {
                                TimeSpan shangwu1 = EndTimeWorkingEnd.Subtract(EndTimeWorkingStart);

                                TimeSpan xiawu1 = EndTime.Subtract(EndTimeOffworkStart);


                                LavehTime += shangwu1.Hours * 60 + shangwu1.Minutes + xiawu1.Hours * 60 + xiawu1.Minutes;
                            }
                            else if (EndTime >= EndTimeWorkingEnd)
                            {

                          

                                TimeSpan xiawu1 = EndTimeWorkingEnd.Subtract(EndTimeWorkingStart);


                                LavehTime += xiawu1.Hours * 60 + xiawu1.Minutes;
                            }
                            else if (EndTime >= EndTimeWorkingStart)
                            {
                                TimeSpan xiawu1 = EndTime.Subtract(EndTimeWorkingStart);


                                LavehTime += xiawu1.Hours * 60 + xiawu1.Minutes;

                            }



                        }
                    }
                    else
                    {

                        //是否调休日  调休日需要上班
                        if (tiaoxiuri.Exists(x => x.ValueStart <= EndTime.Date && x.ValueStart >= EndTime.Date))
                        {
                            if (EndTime >= EndTimeOffworkEnd)
                            {
                                LavehTime += shangbanshijian;
                            }
                            else if (EndTime >= EndTimeOffworkStart)
                            {
                                TimeSpan shangwu1 = EndTimeWorkingEnd.Subtract(EndTimeWorkingStart);

                                TimeSpan xiawu1 = EndTime.Subtract(EndTimeOffworkStart);


                                LavehTime += shangwu1.Hours * 60 + shangwu1.Minutes + xiawu1.Hours * 60 + xiawu1.Minutes;
                            }
                            else if (EndTime >= EndTimeWorkingEnd)
                            {



                                TimeSpan xiawu1 = EndTimeWorkingEnd.Subtract(EndTimeWorkingStart);


                                LavehTime += xiawu1.Hours * 60 + xiawu1.Minutes;
                            }
                            else if (EndTime >= EndTimeWorkingStart)
                            {
                                TimeSpan xiawu1 = EndTime.Subtract(EndTimeWorkingStart);


                                LavehTime += xiawu1.Hours * 60 + xiawu1.Minutes;

                            }
                        }
                        else
                        {
                            LavehTime += 0;
                        }
                    }
                }


                if(i != 0 && i != ts.Days)
                {
                    DateTime dateTimenow = StratTime.AddDays(i).Date;
                    //是否上班日期
                    if ((int)dateTimenow.Date.DayOfWeek >= admAttendanceRuleDTO.WeekStart && (int)dateTimenow.Date.DayOfWeek <= admAttendanceRuleDTO.WeekEnd)
                    {
                        //是否假期 假期不上班
                        if (jiejiari.Exists(x => x.ValueStart <= dateTimenow.Date && x.ValueStart >= dateTimenow.Date))
                        {
                            LavehTime += 0;
                        }
                        else
                        {
                            LavehTime += shangbanshijian;
                        }
                    }
                    else
                    {

                        //是否调休日  调休日需要上班
                        if (tiaoxiuri.Exists(x => x.ValueStart <= StratTime.Date && x.ValueStart >= StratTime.Date))
                        {
                            LavehTime += shangbanshijian;
                        }
                        else
                        {
                            LavehTime += 0;
                        }
                    }
                }


                if(ts.Days == 0)
                {
                    LavehTime -= shangbanshijian;
                }
               
            }


          



             
            //dateDiff = ts.Days.ToString() + "天"
            //        + ts.Hours.ToString() + "小时"
            //        + ts.Minutes.ToString() + "分钟"
            //        + ts.Seconds.ToString() + "秒";

            //string ssss  = (EndTime - StratTime).ToString();

            AdmAskLeaveDTO admAsk = new AdmAskLeaveDTO();
            admAsk.LaveDay = (int)(LavehTime/shangbanshijian);
            int  lefthour = (int)(LavehTime % shangbanshijian);

            admAsk.LavehHour = lefthour / 60;
            if (lefthour % 60>0)
            {
                admAsk.LavehHour += 1;
            }

            return admAsk;
        }

        public IActionResult AskLeaveOff(string id = "", DateTime? StratTimeName = null, DateTime? EndTimeName = null)
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;

            AdmAttendanceRuleDTO admAttendanceRuleDTO = _attendanceRuleService.Get("");


            AdmAskLeaveOffDTO askLeaveOffDTO = new AdmAskLeaveOffDTO();
            if (!string.IsNullOrEmpty(id))
            {
                askLeaveOffDTO = _signinService.GetAskLeaveOff(id);
                askLeaveOffDTO.StratTimeName =askLeaveOffDTO.StratTime.Value.ToString("yyyy-MM-dd HH:mm") ;
                askLeaveOffDTO.EndTimeName = askLeaveOffDTO.EndTime.Value.ToString("yyyy-MM-dd HH:mm");
            }
            else
            {
                askLeaveOffDTO.CreaterName = curentuser.UserName;
                askLeaveOffDTO.Tittle = "销假申请（" + curentuser.UserName +"）";
            }





            if (StratTimeName.HasValue)
            {
                askLeaveOffDTO.StratTimeName = StratTimeName.Value.AddHours(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
            }

            if (EndTimeName.HasValue)
            {
                askLeaveOffDTO.EndTimeName = EndTimeName.Value.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(signinId))
            if (!string.IsNullOrEmpty(id))
            {
                SysAttachmentDTOSearch searchEntity = new SysAttachmentDTOSearch();
                searchEntity.page = 1;
                searchEntity.rows = 1000;
                searchEntity.AttObj = "AskLeaveOff";
                searchEntity.AttObjid = signinId;
                searchEntity.AttObjid = id;
                results = _sysAttachmentService.SearchByPaging(searchEntity);
            }
            ViewBag.attachment = results;

            ViewData["Lavetype"] = _liaotianService.GetSYScode("ADM_AskLeaveOff", "Lavetype");


            ViewData.Model = admAskLeaveOffDTO;
            ViewData.Model = askLeaveOffDTO;
            return View();
        }

@@ -270,6 +728,8 @@
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
            leaveOff.RecStatus = "A";
            //未挂审批流，提交直接通过
            leaveOff.ShenpiStatus = "A";
            if (String.IsNullOrEmpty(leaveOff.Id))
            {
                leaveOff.Creater = curentuser.Id;
@@ -277,34 +737,50 @@
            }
            leaveOff.Modifier = curentuser.Id;
            leaveOff.Modifytime = DateTime.Now;

            ResultEntity resultEntity = _signinService.SaveAskLeaveOff(leaveOff);
            string[] Filepaths = leaveOff.Filepath;

            if(Filepaths!=null&& Filepaths.Length > 0)
            ResultEntity resultEntity = new ResultEntity();
            resultEntity.Result = false;
            using (TransactionScope scope = new TransactionScope())
            {
                for(int i=0;i< Filepaths.Length; i++)
                resultEntity = _signinService.SaveAskLeaveOff(leaveOff);
                if(resultEntity.Result == false)
                {
                    if (string.IsNullOrEmpty(leaveOff.attachmentid[i]))
                    {
                        SysAttachmentDTO sysAttachmentDTO = new SysAttachmentDTO();
                        //sysAttachmentDTO.Id = 
                        sysAttachmentDTO.AttObj = "AskLeaveOff";
                        sysAttachmentDTO.AttObjid = leaveOff.SigninId;
                        sysAttachmentDTO.Filefullname = leaveOff.Filefullname[i];
                        sysAttachmentDTO.Filepath = leaveOff.Filepath[i];
                        sysAttachmentDTO.Creater = curentuser.Id;
                        sysAttachmentDTO.Modifier = curentuser.Id;
                        sysAttachmentDTO.Createtime = DateTime.Now;
                        sysAttachmentDTO.Modifytime = sysAttachmentDTO.Createtime;
                    return JsonConvert.SerializeObject(resultEntity);
                }
                string[] Filepaths = leaveOff.Filepath;

                        resultEntity = _sysAttachmentService.save(sysAttachmentDTO);
                if (Filepaths != null && Filepaths.Length > 0)
                {
                    for (int i = 0; i < Filepaths.Length; i++)
                    {
                        if (string.IsNullOrEmpty(leaveOff.attachmentid[i]))
                        {
                            SysAttachmentDTO sysAttachmentDTO = new SysAttachmentDTO();
                            //sysAttachmentDTO.Id = 
                            sysAttachmentDTO.AttObj = "AskLeaveOff";
                            sysAttachmentDTO.AttObjid = leaveOff.Id;
                            sysAttachmentDTO.Filefullname = leaveOff.Filefullname[i];
                            sysAttachmentDTO.Filepath = leaveOff.Filepath[i];
                            sysAttachmentDTO.Creater = curentuser.Id;
                            sysAttachmentDTO.Modifier = curentuser.Id;
                            sysAttachmentDTO.Createtime = DateTime.Now;
                            sysAttachmentDTO.Modifytime = sysAttachmentDTO.Createtime;

                            resultEntity = _sysAttachmentService.save(sysAttachmentDTO);
                            if (resultEntity.Result == false)
                            {
                                return JsonConvert.SerializeObject(resultEntity);
                            }
                        }

                    }
                  


                }

               
                scope.Complete();
            }

             

            

@@ -330,6 +806,22 @@
            ResultEntity resultEntity = new ResultEntity();
            dto.Holiday = "1";
            dto.Rest = "1";
            if (dto.WorkingStart.IndexOf(".") < 0)
            {
                dto.WorkingStart += ".00";
            }
            if (dto.WorkingEnd.IndexOf(".") < 0)
            {
                dto.WorkingEnd += ".00";
            }
            if (dto.OffworkStart.IndexOf(".") < 0)
            {
                dto.OffworkStart += ".00";
            }
            if (dto.OffworkEnd.IndexOf(".") < 0)
            {
                dto.OffworkEnd += ".00";
            }
            resultEntity.Result = false;
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
@@ -355,8 +847,8 @@
                    {
                        AdmAttendanceRulesDtlDTO admAttendanceRulesDtlDTO = new AdmAttendanceRulesDtlDTO();
                        admAttendanceRulesDtlDTO.Pid = dto.Id;
                        admAttendanceRulesDtlDTO.ValueStart = dto.holiday_s[i];
                        admAttendanceRulesDtlDTO.ValueEnd = dto.holiday_e[i];
                        admAttendanceRulesDtlDTO.ValueStart = DateTime.Parse(dto.holiday_s[i]);
                        admAttendanceRulesDtlDTO.ValueEnd = DateTime.Parse(dto.holiday_e[i]);
                        admAttendanceRulesDtlDTO.Name = "jiejiari";
                        admAttendanceRulesDtlDTO.RecStatus = "A";
                        admAttendanceRulesDtlDTO.Creater = curentuser.Id;
@@ -373,8 +865,8 @@
                    {
                        AdmAttendanceRulesDtlDTO admAttendanceRulesDtlDTO = new AdmAttendanceRulesDtlDTO();
                        admAttendanceRulesDtlDTO.Pid = dto.Id;
                        admAttendanceRulesDtlDTO.ValueStart = dto.rest_s[i];
                        admAttendanceRulesDtlDTO.ValueEnd = dto.rest_e[i];
                        admAttendanceRulesDtlDTO.ValueStart = DateTime.Parse(  dto.rest_s[i]);
                        admAttendanceRulesDtlDTO.ValueEnd = DateTime.Parse(dto.rest_e[i]);
                        admAttendanceRulesDtlDTO.Name = "tiaoxiuri";
                        admAttendanceRulesDtlDTO.RecStatus = "A";
                        admAttendanceRulesDtlDTO.Creater = curentuser.Id;