Merge branch 'err_data_export'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/IndexErrDataRecordServiceImpl.java

@@ -99,14 +99,14 @@ public class IndexErrDataRecordServiceImpl extends BaseServiceImpl<Long, IndexEr
 			}
 
 			//回访任务未完成
-			List<IndexErrDataRecord> errStudentVisits = indexErrDataRecordDao.queryStudentVisit(date, null);
-			if(!CollectionUtils.isEmpty(errStudentVisits)) {
-				errStudentVisits.forEach(e -> {
-					e.setDataType(IndexErrorType.STUDENT_VISIT);
-					e.setGenerateTime(dt);
-				});
-				indexErrDataRecordDao.batchInsert(errStudentVisits);
-			}
+//			List<IndexErrDataRecord> errStudentVisits = indexErrDataRecordDao.queryStudentVisit(date, null);
+//			if(!CollectionUtils.isEmpty(errStudentVisits)) {
+//				errStudentVisits.forEach(e -> {
+//					e.setDataType(IndexErrorType.STUDENT_VISIT);
+//					e.setGenerateTime(dt);
+//				});
+//				indexErrDataRecordDao.batchInsert(errStudentVisits);
+//			}
 
 			//课程考勤异常
 			List<IndexErrDataRecord> errStudentAttendances = indexErrDataRecordDao.getAttendanceError(date, null);
@@ -298,32 +298,32 @@ public class IndexErrDataRecordServiceImpl extends BaseServiceImpl<Long, IndexEr
 							switch (typeDataNumMapEntry.getKey()){
 								case MUSIC_PATROL_ITEM:
 									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;
 								case INSPECTION_ITEM_PLAN:
 									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;
 								case STUDENT_VISIT:
 									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;
 								case TEACHER_EXCEPTION_ATTENDANCE:
 									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;
 								case TEACHER_NOT_A_CLASS:
 									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;
 							}
@@ -357,32 +357,32 @@ public class IndexErrDataRecordServiceImpl extends BaseServiceImpl<Long, IndexEr
 			switch (typeDataNumMapEntry.getKey()){
 				case MUSIC_PATROL_ITEM:
 					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;
 				case INSPECTION_ITEM_PLAN:
 					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;
 				case STUDENT_VISIT:
 					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;
 				case TEACHER_EXCEPTION_ATTENDANCE:
 					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;
 				case TEACHER_NOT_A_CLASS:
 					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;
 			}