修改周视图具体信息

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

@@ -212,10 +212,10 @@ public class BSlScheduleServiceImpl implements BSlScheduleService {
         String weekDetail = "";
         ScheduleDetail scheduleDetail = bSlScheduleRepository.queryDetail(businessId);
         List<ScheduleDto> scheduleDtoList = bArrangeRepository.queryDtoThroughBsl(scheduleDetail.getSubAgencyId()
-                ,scheduleDetail.getEduClassCode()
-                ,scheduleDetail.getLessonCode());
+                , scheduleDetail.getEduClassCode()
+                , scheduleDetail.getLessonCode());
         //获取周
-        for(int i = 0 ;i <scheduleDtoList.size() ; i++){
+        for (int i = 0; i < scheduleDtoList.size(); i++) {
             String detailWeek = scheduleDtoList.get(i).getWeek();
             //分割周
             String[] subWeek = detailWeek.split("-");
@@ -286,13 +286,18 @@ public class BSlScheduleServiceImpl implements BSlScheduleService {
                 format0.format(maxCal.getTime()),
                 subAgencyId);
         int j = 0;
-        for(int i = 0 ; i < allClasses.size() * bCourseCodeList.size() ; i++){
+        int n = 0;
+        for (int i = 0; i < allClasses.size() * bCourseCodeList.size(); i++) {
 
             BSLData bslData = new BSLData();
-            bslData.addDetail(allClasses.get(j).getCode(),allClasses.get(j).getClassName(),"classes");
+            bslData.addDetail(allClasses.get(j).getCode(), allClasses.get(j).getClassName(), "classes");
+            bslData.addDetail(String.valueOf(bCourseCodeList.get(n).getSeq()),
+                    bCourseCodeList.get(n).getStartDate() + "-" + bCourseCodeList.get(n).getEndDate(), "section");
+            //如果超过索引数，则n归零
+            n = n + 1 == bCourseCodeList.size() ? 0 : n + 1;
             resultList.add(bslData);
             //当是班级数 * 每日课程数的倍数时，添加一条空记录，方便前台分割
-            if((i + 1) % bCourseCodeList.size() == 0){
+            if ((i + 1) % bCourseCodeList.size() == 0) {
                 resultList.add(new BSLData());
                 j++;
             }
@@ -307,48 +312,29 @@ public class BSlScheduleServiceImpl implements BSlScheduleService {
                 format0.format(minCal.getTime()),
                 format0.format(maxCal.getTime()),
                 subAgencyId);
-        for(BSlSchedule bSlSchedule : list){
+        for (BSlSchedule bSlSchedule : list) {
             int classesNum = allClassesNum.indexOf(bSlSchedule.getEduClassCode());
             int location = classesNum * bCourseCodeList.size() + Integer.valueOf(bSlSchedule.getSeq()) - 1;
-            if(location / bCourseCodeList.size() >= 1){
+            if (location / bCourseCodeList.size() >= 1) {
                 location += location / bCourseCodeList.size();
             }
             //判断这里是否有此班级，此时间的记录
             BSLData bslData = (BSLData) resultList.get(location);
-            if(!bslData.hasSection()){
-//                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");
-                //判断星期几
-                Calendar calendar = Calendar.getInstance();
-                Date date = bSlSchedule.getStartDay();
-                if(date == null)
-                    continue;
-                calendar.setTime(date);
-                int DAY_OF_WEEK = calendar.get(Calendar.DAY_OF_WEEK);
-                bslData.addDetail(bSlSchedule.getBLesson().getCode(),bSlSchedule.getBLesson().getLessonName(),DAY_OF_WEEK);
-                bslData.addDetail(bSlSchedule.getTeaCode(),bSlSchedule.getTeacherName(),DAY_OF_WEEK);
-                bslData.addDetail(bSlSchedule.getRoomCode(),bSlSchedule.getBRooms().getClassroomName(),DAY_OF_WEEK);
-                bslData.addDetail(bSlSchedule.getBusinessId(),"businessId",DAY_OF_WEEK);
-//                resultMap.put(bSlSchedule.getEduClassCode() + "," + bSlSchedule.getSeq(),bslData);
-            }else{
-
-                //判断星期几
-                Calendar calendar = Calendar.getInstance();
-                Date date = bSlSchedule.getStartDay();
-                if(date == null)
-                    continue;
-                calendar.setTime(date);
-                int DAY_OF_WEEK = calendar.get(Calendar.DAY_OF_WEEK);
-                bslData.addDetail(bSlSchedule.getBLesson().getCode(),bSlSchedule.getBLesson().getLessonName(),DAY_OF_WEEK);
-                bslData.addDetail(bSlSchedule.getTeaCode(),bSlSchedule.getTeacherName(),DAY_OF_WEEK);
-                bslData.addDetail(bSlSchedule.getRoomCode(),bSlSchedule.getBRooms().getClassroomName(),DAY_OF_WEEK);
-                bslData.addDetail(bSlSchedule.getBusinessId(),"businessId",DAY_OF_WEEK);
-            }
+            //判断星期几
+            Calendar calendar = Calendar.getInstance();
+            Date date = bSlSchedule.getStartDay();
+            if (date == null)
+                continue;
+            calendar.setTime(date);
+            int DAY_OF_WEEK = calendar.get(Calendar.DAY_OF_WEEK);
+            bslData.addDetail(bSlSchedule.getBLesson().getCode(), bSlSchedule.getBLesson().getLessonName(), DAY_OF_WEEK);
+            bslData.addDetail(bSlSchedule.getTeaCode(), bSlSchedule.getTeacherName(), DAY_OF_WEEK);
+            bslData.addDetail(bSlSchedule.getRoomCode(), bSlSchedule.getBRooms().getClassroomName(), DAY_OF_WEEK);
+            bslData.addDetail(bSlSchedule.getBusinessId(), "businessId", DAY_OF_WEEK);
         }
         scheduleResult.setBSlSchedules(resultList);
         scheduleResult.setBCourseCodes(bCourseCodeList);
-        return scheduleResult;
+            return scheduleResult;
     }
 
 }