|
@@ -357,8 +357,8 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
|
|
|
List<IndexErrInfoDto> oneChild = new ArrayList<>();
|
|
|
|
|
|
oneChild.add(new IndexErrInfoDto(IndexErrorType.HIGH_CLASS_STUDENT_LESS_THAN_THREE, IndexErrorType.HIGH_CLASS_STUDENT_LESS_THAN_THREE.getMsg(), indexBaseMonthDataDao.countLessThenThreeClassGroupNum(organIds), indexBaseMonthDataDao.getLessThenThreeMusicGroup(organIds)));
|
|
|
- List<Long> errInspection = indexBaseMonthDataDao.queryErrInspection(organIds);
|
|
|
- oneChild.add(new IndexErrInfoDto(IndexErrorType.MUSIC_PATROL_ITEM, IndexErrorType.MUSIC_PATROL_ITEM.getMsg(),errInspection.size(), errInspection));
|
|
|
+ int errInspection = indexBaseMonthDataDao.queryErrInspection(organIds);
|
|
|
+ oneChild.add(new IndexErrInfoDto(IndexErrorType.MUSIC_PATROL_ITEM, IndexErrorType.MUSIC_PATROL_ITEM.getMsg(),errInspection, null));
|
|
|
|
|
|
one.setNum(oneChild.stream().mapToInt(IndexErrInfoDto::getNum).sum());
|
|
|
one.setResult(oneChild);
|
|
@@ -469,8 +469,8 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
|
|
|
flag1 = true;
|
|
|
}
|
|
|
if(!flag1){
|
|
|
- List<Long> errInspection = indexBaseMonthDataDao.queryErrInspection(organIds);
|
|
|
- if(errInspection.size() > 0){
|
|
|
+ int errInspection = indexBaseMonthDataDao.queryErrInspection(organIds);
|
|
|
+ if(errInspection > 0){
|
|
|
flag1 = true;
|
|
|
}
|
|
|
}
|