周视图修改

src/main/java/org/rcisoft/business/bslschedule/dao/BSlScheduleRepository.java

@@ -121,8 +121,8 @@ public interface BSlScheduleRepository extends BaseMapper<BSlSchedule> {
     @ResultMap(value = "DetailResultMap")
     ScheduleDetail queryDetail(String businessId);
 
-    @Select("select count(distinct(edu_class_code)) from b_sl_schedule  \n" +
-            "where start_day between #{0} and #{1} and sub_agency_id = #{2}")
-    int getNumOfEduClass(String minTime,String maxTime,String subAgencyId);
+    @Select("select distinct(edu_class_code) from b_sl_schedule  \n" +
+            "where start_day between #{0} and #{1} and sub_agency_id = #{2} ORDER BY edu_class_code")
+    List<String> getNumOfEduClass(String minTime,String maxTime,String subAgencyId);
 }
 

src/main/java/org/rcisoft/business/bslschedule/service/impl/BSlScheduleServiceImpl.java

@@ -279,11 +279,12 @@ public class BSlScheduleServiceImpl implements BSlScheduleService {
             maxCal.add(Calendar.DATE, 1);
         }
         SimpleDateFormat format0 = new SimpleDateFormat("yyyy-MM-dd");
-        int classNum = bSlScheduleRepository.getNumOfEduClass(
+        //获取所有班级
+        List<String> allClasses = bSlScheduleRepository.getNumOfEduClass(
                 format0.format(minCal.getTime()),
                 format0.format(maxCal.getTime()),
                 subAgencyId);
-        for(int i = 0 ; i < classNum * bCourseCodeList.size() ; i++){
+        for(int i = 0 ; i < allClasses.size() * bCourseCodeList.size() ; i++){
             resultList.add(new BSLData());
             //当是班级数 * 每日课程数的倍数时，添加一条空记录，方便前台分割
             if((i + 1) % bCourseCodeList.size() == 0){
@@ -296,14 +297,14 @@ public class BSlScheduleServiceImpl implements BSlScheduleService {
                 format0.format(minCal.getTime()),
                 format0.format(maxCal.getTime()),
                 subAgencyId);
-        //需要向前推进的量
-        int post = 0;
         for(BSlSchedule bSlSchedule : list){
-            int i = list.indexOf(bSlSchedule);
-            if(i != 0 && i % bCourseCodeList.size() == 0)
-                post++;
+            int classesNum = allClasses.indexOf(bSlSchedule.getEduClassCode());
+            int location = classesNum * bCourseCodeList.size() + Integer.valueOf(bSlSchedule.getSeq()) - 1;
+            if(location / bCourseCodeList.size() >= 1){
+                location += location / bCourseCodeList.size();
+            }
             //判断这里是否有此班级，此时间的记录
-            BSLData bslData = (BSLData) resultList.get(i + post);
+            BSLData bslData = (BSLData) resultList.get(location);
             if(!bslData.hasClasses()){
                 bslData.addDetail(bSlSchedule.getEduClassCode(),bSlSchedule.getBEduClass().getClassName(),"classes");
                 BCourseCode bCourseCode1 = bCourseCodeList.get(Integer.valueOf(bSlSchedule.getSeq()) - 1);