校历修改

src/main/java/org/rcisoft/business/bterm/service/impl/BTermServiceImpl.java

@@ -5,6 +5,7 @@ import org.rcisoft.business.bterm.dao.BTermRepository;
 import org.rcisoft.business.bterm.entity.BTerm;
 import org.rcisoft.business.bterm.enums.BTermEnum;
 import org.rcisoft.business.bterm.service.BTermService;
+import org.rcisoft.business.bterm.utils.SchoolCalendarWeek;
 import org.rcisoft.business.bterm.utils.Week;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.constant.MessageConstant;
@@ -143,8 +144,9 @@ public class BTermServiceImpl implements BTermService {
     public Map<String, Object> getSchoolWeek(String termCode){
         Map<String,Object> map = new HashMap<>();
         BTerm bTerm = bTermRepository.queryCurrentTerm(termCode);
-        List<String> list = new ArrayList<>();
-        list = Week.buildList(bTerm.getStartDate(),bTerm.getEndDate());
+        List<SchoolCalendarWeek> list = new ArrayList<>();
+        //list = Week.buildList(bTerm.getStartDate(),bTerm.getEndDate());
+        list = SchoolCalendarWeek.buildList(bTerm.getStartDate(),bTerm.getEndDate());
         map.put("weekList",list);
         map.put("termName",bTerm.getName());
         return map;

src/main/java/org/rcisoft/business/bterm/utils/Week.java

@@ -191,4 +191,6 @@ public class Week {
         }
         return list;
     }
+
+
 }