提交

username@email.com

2023-02-14 0fdfaa5b08721e14c41cd89f63bbf2b7ac84691f

 zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs

@@ -522,17 +522,22 @@
                                }
                                else
                                {
                                    if (dateBiJiaoDTOs[i].StartTime > dateBiJiaoDTOs[i - 1].EndTime)
                                    {
                                        kuanggong = true;
                                        break;
                                    }
                                    else if (dateBiJiaoDTOs[i].EndTime > dateBiJiaoDTOs[i - 1].EndTime)
                                    //if (dateBiJiaoDTOs[i].StartTime > dateBiJiaoDTOs[i - 1].EndTime)
                                    //{
                                    //    //kuanggong = true;
                                    //    break;
                                    //}
                                    //else 
                                    if (dateBiJiaoDTOs[i].EndTime > dateBiJiaoDTOs[i - 1].EndTime)
                                    {
                                        endttime = dateBiJiaoDTOs[i].EndTime;
                                    }
                                    if (!starttime.HasValue)
                                    {
                                        starttime = dateBiJiaoDTOs[i].StartTime;
                                    }
                                }
                                if (endttime>= StratTimeWorkingEnd)
                                if (endttime >= StratTimeWorkingEnd && starttime.HasValue)
                                {
                                    break;
                                }
@@ -643,17 +648,22 @@
                                }
                                else
                                {
                                    if (dateBiJiaoDTOs[i].StartTime > dateBiJiaoDTOs[i - 1].EndTime)
                                    {
                                        kuanggong = true;
                                        break;
                                    }
                                    else if (dateBiJiaoDTOs[i].EndTime > dateBiJiaoDTOs[i - 1].EndTime)
                                    //if (dateBiJiaoDTOs[i].StartTime > dateBiJiaoDTOs[i - 1].EndTime)
                                    //{
                                    //    //kuanggong = true;
                                    //    break;
                                    //}
                                    //else 
                                    if (dateBiJiaoDTOs[i].EndTime > dateBiJiaoDTOs[i - 1].EndTime)
                                    {
                                        endttime = dateBiJiaoDTOs[i].EndTime;
                                    }
                                    if (!starttime.HasValue)
                                    {
                                        starttime = dateBiJiaoDTOs[i].StartTime;
                                    }
                                }
                                if (endttime >= StratTimeOffworkEnd)
                                if (endttime >= StratTimeOffworkEnd && starttime.HasValue)
                                {
                                    break;
                                }
@@ -980,14 +990,19 @@
                                    }
                                    else
                                    {
                                        if (dateBiJiaoDTOs[i].StartTime > dateBiJiaoDTOs[i - 1].EndTime)
                                        {
                                            kuanggong = true;
                                            break;
                                        }
                                        else if (dateBiJiaoDTOs[i].EndTime > dateBiJiaoDTOs[i - 1].EndTime)
                                        //if (dateBiJiaoDTOs[i].StartTime > dateBiJiaoDTOs[i - 1].EndTime)
                                        //{
                                        //    //kuanggong = true;
                                        //    break;
                                        //}
                                        //else 
                                        if (dateBiJiaoDTOs[i].EndTime > dateBiJiaoDTOs[i - 1].EndTime)
                                        {
                                            endttime = dateBiJiaoDTOs[i].EndTime;
                                        }
                                        if (!starttime.HasValue)
                                        {
                                            starttime = dateBiJiaoDTOs[i].StartTime;
                                        }
                                    }
                                }
@@ -1097,15 +1112,20 @@
                                    }
                                    else
                                    {
                                        if (dateBiJiaoDTOs[i].StartTime > dateBiJiaoDTOs[i - 1].EndTime)
                                        {
                                            kuanggong = true;
                                            break;
                                        }
                                        else if (dateBiJiaoDTOs[i].EndTime > dateBiJiaoDTOs[i - 1].EndTime)
                                        //if (dateBiJiaoDTOs[i].StartTime > dateBiJiaoDTOs[i - 1].EndTime)
                                        //{
                                        //    //kuanggong = true;
                                        //    break;
                                        //}
                                        //else 
                                        if (dateBiJiaoDTOs[i].EndTime > dateBiJiaoDTOs[i - 1].EndTime)
                                        {
                                            endttime = dateBiJiaoDTOs[i].EndTime;
                                        }
                                        if (!starttime.HasValue)
                                        {
                                            starttime = dateBiJiaoDTOs[i].StartTime;
                                        }
                                    }
                                }
                                if (kuanggong)