Skip to content

E
education
Commit b658a5f8 authored by 李博今's avatar 李博今
Browse files
Options

周视图不变

parent a16da2c1
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 67 deletions
src/main/java/org/rcisoft/business/bslschedule/service/impl/BSlScheduleServiceImpl.java
View file @ b658a5f8
...@@ -201,73 +201,73 @@ public class BSlScheduleServiceImpl implements BSlScheduleService { ...@@ -201,73 +201,73 @@ public class BSlScheduleServiceImpl implements BSlScheduleService {
format0.format(maxCal.getTime()), format0.format(maxCal.getTime()),
subAgencyId); subAgencyId);
for(BSlSchedule bSlSchedule : list){ // for(BSlSchedule bSlSchedule : list){
int minWeek = 0; // int minWeek = 0;
int maxWeek = 0; // int maxWeek = 0;
//共几周课 // //共几周课
int total = 0; // int total = 0;
String weekDetail = ""; // String weekDetail = "";
String key = bSlSchedule.getSubAgencyId() + // String key = bSlSchedule.getSubAgencyId() +
bSlSchedule.getBEduClass() + // bSlSchedule.getBEduClass() +
bSlSchedule.getBLesson() + ""; // bSlSchedule.getBLesson() + "";
List<ScheduleDto> scheduleDtos = rcRedisServiceImpl.getList(key); // List<ScheduleDto> scheduleDtos = rcRedisServiceImpl.getList(key);
//如果缓存内不存在数据 // //如果缓存内不存在数据
if(scheduleDtos == null || scheduleDtos.size() == 0){ // if(scheduleDtos == null || scheduleDtos.size() == 0){
List<ScheduleDto> list1 = bArrangeRepository.queryDtoThroughBsl(bSlSchedule.getSubAgencyId(),bSlSchedule.getEduClassCode(),bSlSchedule.getBLesson().getCode()); // List<ScheduleDto> list1 = bArrangeRepository.queryDtoThroughBsl(bSlSchedule.getSubAgencyId(),bSlSchedule.getEduClassCode(),bSlSchedule.getBLesson().getCode());
for(int i = 0 ; i < list1.size() ; i++){ // for(int i = 0 ; i < list1.size() ; i++){
String innerKey = key + i; // String innerKey = key + i;
rcRedisServiceImpl.setBytes(innerKey, SerializationUtils.serializer(list.get(i))); // rcRedisServiceImpl.setBytes(innerKey, SerializationUtils.serializer(list.get(i)));
//获取周 // //获取周
String detailWeek = list1.get(i).getWeek(); // String detailWeek = list1.get(i).getWeek();
//分割周 // //分割周
String[] subWeek = detailWeek.split("-"); // String[] subWeek = detailWeek.split("-");
//确定这段时间有几周 // //确定这段时间有几周
if(subWeek.length > 1){ // if(subWeek.length > 1){
if(i == 0) // if(i == 0)
minWeek = Integer.valueOf(subWeek[0]); // minWeek = Integer.valueOf(subWeek[0]);
maxWeek = Integer.valueOf(subWeek[1]); // maxWeek = Integer.valueOf(subWeek[1]);
total += (Integer.valueOf(subWeek[1]) - Integer.valueOf(subWeek[0])); // total += (Integer.valueOf(subWeek[1]) - Integer.valueOf(subWeek[0]));
weekDetail += "(" + detailWeek + "周)"; // weekDetail += "(" + detailWeek + "周)";
}else{ // }else{
if(i == 0) // if(i == 0)
minWeek = Integer.valueOf(detailWeek); // minWeek = Integer.valueOf(detailWeek);
maxWeek = Integer.valueOf(detailWeek); // maxWeek = Integer.valueOf(detailWeek);
total += 1; // total += 1;
weekDetail += "(" + detailWeek + "周)"; // weekDetail += "(" + detailWeek + "周)";
} // }
} // }
bSlSchedule.setResult("共 " + total + "周，" + weekDetail + FindTime.getStartOrEndTime(minWeek,"getStart") + FindTime.getStartOrEndTime(maxWeek,"getEnd")); // bSlSchedule.setResult("共 " + total + "周，" + weekDetail + FindTime.getStartOrEndTime(minWeek,"getStart") + FindTime.getStartOrEndTime(maxWeek,"getEnd"));
bSlSchedule.setList(list1); // bSlSchedule.setList(list1);
}else{ // }else{
//如果存在 // //如果存在
List<ScheduleDto> list1 = new ArrayList<>(); // List<ScheduleDto> list1 = new ArrayList<>();
for(int i = 0 ; true ; i++){ // for(int i = 0 ; true ; i++){
byte[] bytes = rcRedisServiceImpl.getBytes(key + i); // byte[] bytes = rcRedisServiceImpl.getBytes(key + i);
if(bytes == null || bytes.length == 0){ // if(bytes == null || bytes.length == 0){
break; // break;
} // }
ScheduleDto scheduleDto = SerializationUtils.deserializer(bytes,ScheduleDto.class); // ScheduleDto scheduleDto = SerializationUtils.deserializer(bytes,ScheduleDto.class);
String detailWeek = scheduleDto.getWeek(); // String detailWeek = scheduleDto.getWeek();
String[] subWeek = detailWeek.split("-"); // String[] subWeek = detailWeek.split("-");
list1.add(scheduleDto); // list1.add(scheduleDto);
if(subWeek.length > 1){ // if(subWeek.length > 1){
if(i == 0) // if(i == 0)
minWeek = Integer.valueOf(subWeek[0]); // minWeek = Integer.valueOf(subWeek[0]);
maxWeek = Integer.valueOf(subWeek[1]); // maxWeek = Integer.valueOf(subWeek[1]);
total += (Integer.valueOf(subWeek[1]) - Integer.valueOf(subWeek[0])); // total += (Integer.valueOf(subWeek[1]) - Integer.valueOf(subWeek[0]));
weekDetail += "(" + detailWeek + "周)"; // weekDetail += "(" + detailWeek + "周)";
}else{ // }else{
if(i == 0) // if(i == 0)
minWeek = Integer.valueOf(detailWeek); // minWeek = Integer.valueOf(detailWeek);
maxWeek = Integer.valueOf(detailWeek); // maxWeek = Integer.valueOf(detailWeek);
total += 1; // total += 1;
weekDetail += "(" + detailWeek + "周)"; // weekDetail += "(" + detailWeek + "周)";
} // }
} // }
bSlSchedule.setResult("共 " + total + "周，" + weekDetail + FindTime.getStartOrEndTime(minWeek,"getStart") + FindTime.getStartOrEndTime(maxWeek,"getEnd")); // bSlSchedule.setResult("共 " + total + "周，" + weekDetail + FindTime.getStartOrEndTime(minWeek,"getStart") + FindTime.getStartOrEndTime(maxWeek,"getEnd"));
bSlSchedule.setList(list1); // bSlSchedule.setList(list1);
} // }
} // }
scheduleResult.setBSlSchedules(list); scheduleResult.setBSlSchedules(list);
BCourseCode bCourseCode = new BCourseCode(); BCourseCode bCourseCode = new BCourseCode();
bCourseCode.setFlag("1"); bCourseCode.setFlag("1");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment