|
@@ -298,32 +298,32 @@ public class IndexErrDataRecordServiceImpl extends BaseServiceImpl<Long, IndexEr
|
|
switch (typeDataNumMapEntry.getKey()){
|
|
switch (typeDataNumMapEntry.getKey()){
|
|
case MUSIC_PATROL_ITEM:
|
|
case MUSIC_PATROL_ITEM:
|
|
record.setMusicPatrolItem(typeDataNumMapEntry.getValue().intValue());
|
|
record.setMusicPatrolItem(typeDataNumMapEntry.getValue().intValue());
|
|
- if(typeSurplusDataNumMap.containsKey(typeDataNumMapEntry.getValue())) {
|
|
|
|
- record.setMusicPatrolItemSurplus(typeSurplusDataNumMap.get(typeDataNumMapEntry.getValue()).intValue());
|
|
|
|
|
|
+ if(typeSurplusDataNumMap.containsKey(typeDataNumMapEntry.getKey())) {
|
|
|
|
+ record.setMusicPatrolItemSurplus(typeSurplusDataNumMap.get(typeDataNumMapEntry.getKey()).intValue());
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
case INSPECTION_ITEM_PLAN:
|
|
case INSPECTION_ITEM_PLAN:
|
|
record.setInspectionItemPlan(typeDataNumMapEntry.getValue().intValue());
|
|
record.setInspectionItemPlan(typeDataNumMapEntry.getValue().intValue());
|
|
- if(typeSurplusDataNumMap.containsKey(typeDataNumMapEntry.getValue())) {
|
|
|
|
- record.setInspectionItemPlanSurplus(typeSurplusDataNumMap.get(typeDataNumMapEntry.getValue()).intValue());
|
|
|
|
|
|
+ if(typeSurplusDataNumMap.containsKey(typeDataNumMapEntry.getKey())) {
|
|
|
|
+ record.setInspectionItemPlanSurplus(typeSurplusDataNumMap.get(typeDataNumMapEntry.getKey()).intValue());
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
case STUDENT_VISIT:
|
|
case STUDENT_VISIT:
|
|
record.setStudentVisit(typeDataNumMapEntry.getValue().intValue());
|
|
record.setStudentVisit(typeDataNumMapEntry.getValue().intValue());
|
|
- if(typeSurplusDataNumMap.containsKey(typeDataNumMapEntry.getValue())) {
|
|
|
|
- record.setStudentVisitSurplus(typeSurplusDataNumMap.get(typeDataNumMapEntry.getValue()).intValue());
|
|
|
|
|
|
+ if(typeSurplusDataNumMap.containsKey(typeDataNumMapEntry.getKey())) {
|
|
|
|
+ record.setStudentVisitSurplus(typeSurplusDataNumMap.get(typeDataNumMapEntry.getKey()).intValue());
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
case TEACHER_EXCEPTION_ATTENDANCE:
|
|
case TEACHER_EXCEPTION_ATTENDANCE:
|
|
record.setTeacherExceptionAttendance(typeDataNumMapEntry.getValue().intValue());
|
|
record.setTeacherExceptionAttendance(typeDataNumMapEntry.getValue().intValue());
|
|
- if(typeSurplusDataNumMap.containsKey(typeDataNumMapEntry.getValue())) {
|
|
|
|
- record.setTeacherExceptionAttendanceSurplus(typeSurplusDataNumMap.get(typeDataNumMapEntry.getValue()).intValue());
|
|
|
|
|
|
+ if(typeSurplusDataNumMap.containsKey(typeDataNumMapEntry.getKey())) {
|
|
|
|
+ record.setTeacherExceptionAttendanceSurplus(typeSurplusDataNumMap.get(typeDataNumMapEntry.getKey()).intValue());
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
case TEACHER_NOT_A_CLASS:
|
|
case TEACHER_NOT_A_CLASS:
|
|
record.setTeacherNotAClass(typeDataNumMapEntry.getValue().intValue());
|
|
record.setTeacherNotAClass(typeDataNumMapEntry.getValue().intValue());
|
|
- if(typeSurplusDataNumMap.containsKey(typeDataNumMapEntry.getValue())) {
|
|
|
|
- record.setTeacherNotAClassSurplus(typeSurplusDataNumMap.get(typeDataNumMapEntry.getValue()).intValue());
|
|
|
|
|
|
+ if(typeSurplusDataNumMap.containsKey(typeDataNumMapEntry.getKey())) {
|
|
|
|
+ record.setTeacherNotAClassSurplus(typeSurplusDataNumMap.get(typeDataNumMapEntry.getKey()).intValue());
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
@@ -357,32 +357,32 @@ public class IndexErrDataRecordServiceImpl extends BaseServiceImpl<Long, IndexEr
|
|
switch (typeDataNumMapEntry.getKey()){
|
|
switch (typeDataNumMapEntry.getKey()){
|
|
case MUSIC_PATROL_ITEM:
|
|
case MUSIC_PATROL_ITEM:
|
|
record.setMusicPatrolItem(typeDataNumMapEntry.getValue().intValue());
|
|
record.setMusicPatrolItem(typeDataNumMapEntry.getValue().intValue());
|
|
- if(typeSurplusDataNumMap.containsKey(typeDataNumMapEntry.getValue())) {
|
|
|
|
- record.setMusicPatrolItemSurplus(typeSurplusDataNumMap.get(typeDataNumMapEntry.getValue()).intValue());
|
|
|
|
|
|
+ if(typeSurplusDataNumMap.containsKey(typeDataNumMapEntry.getKey())) {
|
|
|
|
+ record.setMusicPatrolItemSurplus(typeSurplusDataNumMap.get(typeDataNumMapEntry.getKey()).intValue());
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
case INSPECTION_ITEM_PLAN:
|
|
case INSPECTION_ITEM_PLAN:
|
|
record.setInspectionItemPlan(typeDataNumMapEntry.getValue().intValue());
|
|
record.setInspectionItemPlan(typeDataNumMapEntry.getValue().intValue());
|
|
- if(typeSurplusDataNumMap.containsKey(typeDataNumMapEntry.getValue())) {
|
|
|
|
- record.setInspectionItemPlanSurplus(typeSurplusDataNumMap.get(typeDataNumMapEntry.getValue()).intValue());
|
|
|
|
|
|
+ if(typeSurplusDataNumMap.containsKey(typeDataNumMapEntry.getKey())) {
|
|
|
|
+ record.setInspectionItemPlanSurplus(typeSurplusDataNumMap.get(typeDataNumMapEntry.getKey()).intValue());
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
case STUDENT_VISIT:
|
|
case STUDENT_VISIT:
|
|
record.setStudentVisit(typeDataNumMapEntry.getValue().intValue());
|
|
record.setStudentVisit(typeDataNumMapEntry.getValue().intValue());
|
|
- if(typeSurplusDataNumMap.containsKey(typeDataNumMapEntry.getValue())) {
|
|
|
|
- record.setStudentVisitSurplus(typeSurplusDataNumMap.get(typeDataNumMapEntry.getValue()).intValue());
|
|
|
|
|
|
+ if(typeSurplusDataNumMap.containsKey(typeDataNumMapEntry.getKey())) {
|
|
|
|
+ record.setStudentVisitSurplus(typeSurplusDataNumMap.get(typeDataNumMapEntry.getKey()).intValue());
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
case TEACHER_EXCEPTION_ATTENDANCE:
|
|
case TEACHER_EXCEPTION_ATTENDANCE:
|
|
record.setTeacherExceptionAttendance(typeDataNumMapEntry.getValue().intValue());
|
|
record.setTeacherExceptionAttendance(typeDataNumMapEntry.getValue().intValue());
|
|
- if(typeSurplusDataNumMap.containsKey(typeDataNumMapEntry.getValue())) {
|
|
|
|
- record.setTeacherExceptionAttendanceSurplus(typeSurplusDataNumMap.get(typeDataNumMapEntry.getValue()).intValue());
|
|
|
|
|
|
+ if(typeSurplusDataNumMap.containsKey(typeDataNumMapEntry.getKey())) {
|
|
|
|
+ record.setTeacherExceptionAttendanceSurplus(typeSurplusDataNumMap.get(typeDataNumMapEntry.getKey()).intValue());
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
case TEACHER_NOT_A_CLASS:
|
|
case TEACHER_NOT_A_CLASS:
|
|
record.setTeacherNotAClass(typeDataNumMapEntry.getValue().intValue());
|
|
record.setTeacherNotAClass(typeDataNumMapEntry.getValue().intValue());
|
|
- if(typeSurplusDataNumMap.containsKey(typeDataNumMapEntry.getValue())) {
|
|
|
|
- record.setTeacherNotAClassSurplus(typeSurplusDataNumMap.get(typeDataNumMapEntry.getValue()).intValue());
|
|
|
|
|
|
+ if(typeSurplusDataNumMap.containsKey(typeDataNumMapEntry.getKey())) {
|
|
|
|
+ record.setTeacherNotAClassSurplus(typeSurplusDataNumMap.get(typeDataNumMapEntry.getKey()).intValue());
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
}
|
|
}
|