高压看板修复bug

wwwroot/main/Procedure/testHighPressure/HighPressureKanban.ashx

@@ -42,15 +42,58 @@ public class SmallKanban : IHttpHandler
                 string EndTime = string.Empty;
                 //注浆时间
                 string zujiangTime= string.Empty;
+                //当前时间大于6点
                 if (time >= new DateTime(time.Year, time.Month, time.Day, 6, 0, 0))
                 {
+                    //起始时间
                     StartTime = new DateTime(time.Year, time.Month, time.Day, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
-                    EndTime = time.Day== DateTime.DaysInMonth(time.Year, time.Month)?new DateTime(time.Year, time.Month + 1, 1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss"): new DateTime(time.Year, time.Month, time.Day+1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                    // EndTime = time.Day == DateTime.DaysInMonth(time.Year, time.Month) ? time.Month == 12 ? new DateTime(time.Year + 1, 1, 1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss") : new DateTime(time.Year, time.Month + 1, 1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss") : new DateTime(time.Year, time.Month, time.Day + 1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                    //当天为本月最后一天
+                    if (time.Day == DateTime.DaysInMonth(time.Year, time.Month))
+                    {
+                        //当本月为最后一月
+                        if (time.Month == 12)
+                        {
+                            //结束时间置为新年一月一日早6点(明早6点)
+                            EndTime = new DateTime(time.Year + 1, 1, 1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                        }
+                        else
+                        {
+                            //结束时间置为下月一日早6点(明早6点)
+                            EndTime = new DateTime(time.Year, time.Month + 1, 1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                        }
+                    }
+                    else
+                    {
+                        //结束时间置为明日早6点
+                        EndTime = new DateTime(time.Year, time.Month, time.Day + 1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                    }
+
                     zujiangTime = time.ToString("yyyy-MM-dd");
                 }
                 else
                 {
-                    StartTime =time.Day == 1?new DateTime(time.Year, time.Month - 1, DateTime.DaysInMonth(time.Year, time.Month - 1), 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss"): new DateTime(time.Year, time.Month, time.Day - 1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                    // StartTime = time.Day == 1 ? time.Month == 1 ? new DateTime(time.Year - 1, 12, DateTime.DaysInMonth(time.Year - 1, 12), 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss") : new DateTime(time.Year, time.Month - 1, DateTime.DaysInMonth(time.Year, time.Month - 1), 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss") : new DateTime(time.Year, time.Month, time.Day - 1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                    //今天为当月第一天
+                    if (time.Day == 1)
+                    {
+                        //本月为今年第一日
+                        if (time.Month == 1)
+                        {
+                            //起始时间置为去年最后一天早6点(昨天早6点)
+                            StartTime = new DateTime(time.Year - 1, 12, DateTime.DaysInMonth(time.Year - 1, 12), 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                        }
+                        else
+                        {
+                            //起始时间置为前一月最后一天早6点(昨天早6点)
+                            StartTime = new DateTime(time.Year, time.Month - 1, DateTime.DaysInMonth(time.Year, time.Month - 1), 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                        }
+                    }
+                    else
+                    {
+                        //起始时间置为昨天早6点
+                        StartTime = new DateTime(time.Year, time.Month, time.Day - 1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                    }
                     EndTime = new DateTime(time.Year, time.Month, time.Day, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
                     zujiangTime = time.AddDays(-1).ToString("yyyy-MM-dd");
                 }