修改周视图

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

 package org.rcisoft.business.bslschedule.dao;
 
 import org.apache.ibatis.annotations.*;
+import org.rcisoft.business.beduclass.entity.BEduClass;
 import org.rcisoft.business.bslschedule.entity.BSlSchedule;
 import org.rcisoft.business.bslschedule.entity.ScheduleDetail;
 import org.rcisoft.core.base.BaseMapper;
@@ -121,8 +122,12 @@ public interface BSlScheduleRepository extends BaseMapper<BSlSchedule> {
     @ResultMap(value = "DetailResultMap")
     ScheduleDetail queryDetail(String businessId);
 
-    @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);
+    @Select("select DISTINCT(edu_class_code) as `code`,b_edu_class.class_name as className from b_sl_schedule LEFT JOIN b_edu_class on edu_class_code = b_edu_class.`code` \n" +
+            "where sub_agency_id = #{2} and b_edu_class.flag = \"1\" and b_edu_class.del_flag = \"0\" ORDER BY edu_class_code")
+    List<BEduClass> getAllEduClass(String minTime, String maxTime, String subAgencyId);
+
+    @Select("select DISTINCT(edu_class_code) from b_sl_schedule \n" +
+            "where 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

@@ -5,6 +5,7 @@ import org.rcisoft.business.barrange.entity.ScheduleDto;
 import org.rcisoft.business.bcoursecode.dao.BCourseCodeRepository;
 import org.rcisoft.business.bcoursecode.entity.BCourseCode;
 import org.rcisoft.business.beduclass.dao.BEduClassRepository;
+import org.rcisoft.business.beduclass.entity.BEduClass;
 import org.rcisoft.business.blesson.dao.BLessonRepository;
 import org.rcisoft.business.brooms.dao.BRoomsRepository;
 import org.rcisoft.business.bslschedule.entity.*;
@@ -280,15 +281,20 @@ public class BSlScheduleServiceImpl implements BSlScheduleService {
         }
         SimpleDateFormat format0 = new SimpleDateFormat("yyyy-MM-dd");
         //获取所有班级
-        List<String> allClasses = bSlScheduleRepository.getNumOfEduClass(
+        List<BEduClass> allClasses = bSlScheduleRepository.getAllEduClass(
                 format0.format(minCal.getTime()),
                 format0.format(maxCal.getTime()),
                 subAgencyId);
+        int j = 0;
         for(int i = 0 ; i < allClasses.size() * bCourseCodeList.size() ; i++){
-            resultList.add(new BSLData());
+
+            BSLData bslData = new BSLData();
+            bslData.addDetail(allClasses.get(j).getCode(),allClasses.get(j).getClassName(),"classes");
+            resultList.add(bslData);
             //当是班级数 * 每日课程数的倍数时，添加一条空记录，方便前台分割
             if((i + 1) % bCourseCodeList.size() == 0){
                 resultList.add(new BSLData());
+                j++;
             }
         }
         //会多出一行，移除
@@ -297,8 +303,12 @@ public class BSlScheduleServiceImpl implements BSlScheduleService {
                 format0.format(minCal.getTime()),
                 format0.format(maxCal.getTime()),
                 subAgencyId);
+        List<String> allClassesNum = bSlScheduleRepository.getNumOfEduClass(
+                format0.format(minCal.getTime()),
+                format0.format(maxCal.getTime()),
+                subAgencyId);
         for(BSlSchedule bSlSchedule : list){
-            int classesNum = allClasses.indexOf(bSlSchedule.getEduClassCode());
+            int classesNum = allClassesNum.indexOf(bSlSchedule.getEduClassCode());
             int location = classesNum * bCourseCodeList.size() + Integer.valueOf(bSlSchedule.getSeq()) - 1;
             if(location / bCourseCodeList.size() >= 1){
                 location += location / bCourseCodeList.size();
@@ -306,7 +316,7 @@ public class BSlScheduleServiceImpl implements BSlScheduleService {
             //判断这里是否有此班级，此时间的记录
             BSLData bslData = (BSLData) resultList.get(location);
             if(!bslData.hasClasses()){
-                bslData.addDetail(bSlSchedule.getEduClassCode(),bSlSchedule.getBEduClass().getClassName(),"classes");
+//                bslData.addDetail(bSlSchedule.getEduClassCode(),bSlSchedule.getBEduClass().getClassName(),"classes");
                 BCourseCode bCourseCode1 = bCourseCodeList.get(Integer.valueOf(bSlSchedule.getSeq()) - 1);
                 bslData.addDetail(bSlSchedule.getSeq(),bCourseCode1.getStartDate() + "-" + bCourseCode1.getEndDate(),"section");
                 //判断星期几