|
|
@ -62,7 +62,7 @@ public class LabRecordServiceImpl implements LabRecordService{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public LabRecordBean findByUcIdAndStatus(Integer uc_id , Integer status) {
|
|
|
|
public List<LabRecordBean> findByUcIdAndStatus(Integer uc_id , Integer status) {
|
|
|
|
return labrecordRepository.findByUcIdAndStatus(uc_id , status);
|
|
|
|
return labrecordRepository.findByUcIdAndStatus(uc_id , status);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -75,28 +75,31 @@ public class LabRecordServiceImpl implements LabRecordService{
|
|
|
|
for ( UserCourseBean uc : usercourses)
|
|
|
|
for ( UserCourseBean uc : usercourses)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
LabRecordBean labrecord = findByUcIdAndStatus(uc.getUcId(),2) ;
|
|
|
|
List<LabRecordBean> labrecordlist = findByUcIdAndStatus(uc.getUcId(),2) ;
|
|
|
|
LabTimeBean labtime=labtimeservice.findByLtId(labrecord.getLtId());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
UserBean user= userservice.findById(uc.getUId());
|
|
|
|
UserBean user= userservice.findById(uc.getUId());
|
|
|
|
// System.out.println(uc.getUcId() +"\t"+labrecord.getLtId()+uc.getUId());
|
|
|
|
// System.out.println(uc.getUcId() +"\t"+labrecord.getLtId()+uc.getUId());
|
|
|
|
|
|
|
|
for ( LabRecordBean labrecord:labrecordlist) {
|
|
|
|
|
|
|
|
LabTimeBean labtime = labtimeservice.findByLtId(labrecord.getLtId( ));
|
|
|
|
Integer day = Integer.valueOf(labtime.getTime( )) - 1;
|
|
|
|
Integer day = Integer.valueOf(labtime.getTime( )) - 1;
|
|
|
|
Integer time = Integer.valueOf(labtime.getTime( )) - 1;
|
|
|
|
Integer time = Integer.valueOf(labtime.getTime( )) - 1;
|
|
|
|
Integer week = Integer.valueOf(labtime.getWeek( )) - 1;
|
|
|
|
Integer week = Integer.valueOf(labtime.getWeek( )) - 1;
|
|
|
|
String val = uc.getName( ) + " " + user.getNickname( ) + "\n" + uc.getClasses( ) + " " + uc.getPopulation( ) + "\n";
|
|
|
|
String val = uc.getName( ) + " " + user.getNickname( ) + "\n" + uc.getClasses( ) + " " + uc.getPopulation( ) + "\n";
|
|
|
|
value[day][time][week] = val;
|
|
|
|
value[day][time][week] = val;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
for (int i = 0 ; i < 7 ; ++ i ) {
|
|
|
|
// for (int i = 0 ; i < 7 ; ++ i ) {
|
|
|
|
|
|
|
|
//
|
|
|
|
for (int j = 0; j < 5; ++j) {
|
|
|
|
// for (int j = 0; j < 5; ++j) {
|
|
|
|
for (int k = 0; k < 19; ++k) {
|
|
|
|
// for (int k = 0; k < 19; ++k) {
|
|
|
|
if (value[i][j][k]!= null)
|
|
|
|
// if (value[i][j][k]!= null)
|
|
|
|
System.out.println("第"+(k+1)+"周的第"+(i+1)+"天的第"+(j+1)+"节"+value[i][j][k]+"\t");
|
|
|
|
// System.out.println("第"+(k+1)+"周的第"+(i+1)+"天的第"+(j+1)+"节"+value[i][j][k]+"\t");
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (int i = 0 ; i < 7 ; ++ i ){
|
|
|
|
for (int i = 0 ; i < 7 ; ++ i ){
|
|
|
|
for ( int j = 0 ; j < 5 ; ++ j ){
|
|
|
|
for ( int j = 0 ; j < 5 ; ++ j ){
|
|
|
@ -108,7 +111,7 @@ public class LabRecordServiceImpl implements LabRecordService{
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (value_name[i][j] == null) value_name[i][j] = "";
|
|
|
|
if (value_name[i][j] == null) value_name[i][j] = "";
|
|
|
|
value_name[i][j] =value_name[i][j] +value[i][j][k] ;
|
|
|
|
value_name[i][j] =value_name[i][j] +value[i][j][k] ;
|
|
|
|
value_name[i][j]= value_name[i][j] +"第"+ k+"周\n";
|
|
|
|
value_name[i][j]= value_name[i][j] +"第"+ (k+1)+"周\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if ( value[i][j][k]!= null&&value[i][j][k].equals(value[i][j][k+1])) {
|
|
|
|
if ( value[i][j][k]!= null&&value[i][j][k].equals(value[i][j][k+1])) {
|
|
|
|