zouxuan 4 år sedan
förälder
incheckning
8a3e3ea9e2

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/IndexBaseMonthDataDao.java

@@ -105,7 +105,7 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
     int countLessThenThreeClassGroupNum(@Param("organIds") Set<Integer> organIds);
     List<String> getLessThenThreeMusicGroup(@Param("organIds") Set<Integer> organIds);
 
-    List<Long> queryErrInspection(@Param("organIds") Set<Integer> organIds);
+    int queryErrInspection(@Param("organIds") Set<Integer> organIds);
 
     int countNoPaymentStudentNum(@Param("organIds") Set<Integer> organIds);
     List<String> getNoPaymentMusicGroup(@Param("organIds") Set<Integer> organIds);

+ 4 - 4
mec-biz/src/main/java/com/ym/mec/biz/service/impl/IndexBaseMonthDataServiceImpl.java

@@ -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;
 			}
 		}

+ 2 - 2
mec-biz/src/main/resources/config/mybatis/IndexBaseMonthDataMapper.xml

@@ -643,9 +643,9 @@
 		</if>
 	</select>
 
-    <select id="queryErrInspection" resultType="java.lang.Long">
+    <select id="queryErrInspection" resultType="int">
 		SELECT
-			id_
+			COUNT(id_)
 		FROM
 			inspection_item_plan
 		WHERE