页面修改

Edu.Repository/Duty/RB_Duty_PlanRepository.cs

@@ -108,6 +108,7 @@ WHERE 1=1
 SELECT A.ID,A.Date,IFNULL(C.SName,'') AS SchoolName,A.CreateBy,A.School_Id,B.Id AS DetailId
 FROM RB_Duty_Plan AS A INNER JOIN rb_duty_plandetails AS B ON A.Id=B.PlanId
      INNER JOIN rb_school AS C ON A.School_Id=C.SId
+     LEFT JOIN rb_duty_frequency AS D ON B.Shift=D.Id
 WHERE 1=1 AND A.`Status`=0 
 ");
             if (query == null)
@@ -138,7 +139,7 @@ WHERE 1=1 AND A.`Status`=0
                 }
             }
             builder.AppendFormat(" GROUP BY A.Id,A.Date,C.SName,A.CreateBy,A.School_Id,B.Id ");
-            builder.AppendFormat(" ORDER BY A.Date ASC ");
+            builder.AppendFormat(" ORDER BY A.Date ASC,D.StartTime ASC ");
             return GetPage<RB_Duty_Plan_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
         }