dto排序修改

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

@@ -17,6 +17,7 @@ import org.rcisoft.business.bslschedule.entity.ScheduleResult;
 import org.rcisoft.business.bslschedule.util.FindTime;
 import org.rcisoft.business.bterm.dao.BTermRepository;
 import org.rcisoft.business.bterm.entity.BTerm;
+import org.rcisoft.business.bterm.utils.Week;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.result.ResultServiceEnums;
 import org.rcisoft.core.util.ExcelUtil;
@@ -158,7 +159,11 @@ public class BSlScheduleServiceImpl implements BSlScheduleService {
     public ScheduleResult queryMoreBSlSchedules(String week,String termCode1 , String subAgencyId) {
         ScheduleResult scheduleResult = new ScheduleResult();
         BTerm bTerm = bTermRepository.queryBtermByCode(termCode1).get(0);
-        scheduleResult.setWeekNum(bTerm.getWeek());
+        if(bTerm.getWeek() == null || bTerm.getWeek().equals("")){
+            scheduleResult.setWeekNum(String.valueOf(Week.buildList(bTerm.getStartDate(),bTerm.getEndDate()).size() + 1));
+        }else{
+            scheduleResult.setWeekNum(bTerm.getWeek());
+        }
         Map<String,Date> map = FindTime.findTime(bTerm.getStartDate(),bTerm.getEndDate());
         Date min = new Date();
         //按周获取时间段

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

@@ -57,6 +57,7 @@ public class BTermServiceImpl implements BTermService {
     @Transactional(propagation = Propagation.REQUIRED,readOnly = false)
     public PersistModel persist(BTerm model, String token){
         int line = 0;
+        model.setWeek(String.valueOf(Week.buildList(model.getStartDate(),model.getEndDate()).size() + 1));
         if(model.getBusinessId()!=null) {
             UserUtil.setCurrentMergeOperation(model);
             line = bTermRepository.updateByPrimaryKeySelective(model);