update

mec-biz/src/main/java/com/ym/mec/biz/service/IndexBaseMonthDataService.java

@@ -28,5 +28,5 @@ public interface IndexBaseMonthDataService extends BaseService<Long, IndexBaseMo
      * @param organIds
      * @return
      */
-    Boolean hasIndexErrData(String organIds);
+    Map<String,Boolean> hasIndexErrData(String organIds);
 }

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

@@ -418,66 +418,93 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 	}
 
 	@Override
-	public Boolean hasIndexErrData(String organIdsStr) {
+	public Map<String,Boolean> hasIndexErrData(String organIdsStr) {
+		Map<String,Boolean> resultMap = new HashMap<>();
 		Set<Integer> organIds = null;
 		if(StringUtils.isNotBlank(organIdsStr)){
 			organIds = Arrays.stream(organIdsStr.split(",")).map(Integer::new).collect(Collectors.toSet());
 		}
 		Date date = new Date();
+		boolean flag = false;
 		int countLessThenThreeClassGroupNum = indexBaseMonthDataDao.countLessThenThreeClassGroupNum(organIds);
 		if(countLessThenThreeClassGroupNum > 0){
-			return true;
+			flag = true;
 		}
-		List<Long> errInspection = indexBaseMonthDataDao.queryErrInspection(organIds);
-		if(errInspection.size() > 0){
-			return true;
+		if(!flag){
+			List<Long> errInspection = indexBaseMonthDataDao.queryErrInspection(organIds);
+			if(errInspection.size() > 0){
+				flag = true;
+			}
 		}
 		Date firstDayOfMonth = DateUtil.getFirstDayOfMonth(DateUtil.addMonths(date, -1));
-		int countNoPaymentStudentNum = indexBaseMonthDataDao.countNoPaymentStudentNum(organIds);
-		if(countNoPaymentStudentNum > 0){
-			return true;
+		if(!flag){
+			int countNoPaymentStudentNum = indexBaseMonthDataDao.countNoPaymentStudentNum(organIds);
+			if(countNoPaymentStudentNum > 0){
+				flag = true;
+			}
 		}
-		List<Long> quitGroupNum = indexBaseMonthDataDao.queryApplyForQuitGroupNum(organIds);
-		if(quitGroupNum.size() > 0){
-			return true;
+		if(!flag){
+			List<Long> quitGroupNum = indexBaseMonthDataDao.queryApplyForQuitGroupNum(organIds);
+			if(quitGroupNum.size() > 0){
+				flag = true;
+			}
 		}
-		List<Long> attendanceInfo = indexBaseMonthDataDao.queryStudentAttendanceInfo(organIds, StudentAttendanceStatusEnum.TRUANT.getCode(),firstDayOfMonth);
-		if(attendanceInfo.size() > 0){
-			return true;
+		if(!flag){
+			List<Long> attendanceInfo = indexBaseMonthDataDao.queryStudentAttendanceInfo(organIds, StudentAttendanceStatusEnum.TRUANT.getCode(),firstDayOfMonth);
+			if(attendanceInfo.size() > 0){
+				flag = true;
+			}
 		}
-		List<Long> attendanceInfo1 = indexBaseMonthDataDao.queryStudentAttendanceInfo(organIds, StudentAttendanceStatusEnum.LEAVE.getCode(),null);
-		if(attendanceInfo1.size() > 0){
-			return true;
+		if(!flag){
+			List<Long> attendanceInfo1 = indexBaseMonthDataDao.queryStudentAttendanceInfo(organIds, StudentAttendanceStatusEnum.LEAVE.getCode(),null);
+			if(attendanceInfo1.size() > 0){
+				flag = true;
+			}
 		}
-		List<Long> attendanceError = indexBaseMonthDataDao.getAttendanceError(organIdsStr,firstDayOfMonth);
-		if(attendanceError.size() > 0){
-			return true;
+		if(!flag){
+			List<Long> attendanceError = indexBaseMonthDataDao.getAttendanceError(organIdsStr,firstDayOfMonth);
+			if(attendanceError.size() > 0){
+				flag = true;
+			}
 		}
-		List<Long> noAttendance = indexBaseMonthDataDao.getNoAttendance(organIdsStr,firstDayOfMonth);
-		if(noAttendance.size() > 0){
-			return true;
+		if(!flag){
+			List<Long> noAttendance = indexBaseMonthDataDao.getNoAttendance(organIdsStr,firstDayOfMonth);
+			if(noAttendance.size() > 0){
+				flag = true;
+			}
 		}
-		List<Long> teacherLeave = indexBaseMonthDataDao.queryTeacherLeave(organIdsStr);
-		if(teacherLeave.size() > 0){
-			return true;
+		if(!flag){
+			List<Long> teacherLeave = indexBaseMonthDataDao.queryTeacherLeave(organIdsStr);
+			if(teacherLeave.size() > 0){
+				flag = true;
+			}
 		}
-		String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
-		List<Long> lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
-		if(lowTeacherSalary.size() > 0){
-			return true;
+		if(!flag){
+			String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
+			List<Long> lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
+			if(lowTeacherSalary.size() > 0){
+				flag = true;
+			}
 		}
-		List<Long> inspectionItem = indexBaseMonthDataDao.queryInspectionItem(organIdsStr);
-		if(inspectionItem.size() > 0){
-			return true;
+		if(!flag){
+			List<Long> inspectionItem = indexBaseMonthDataDao.queryInspectionItem(organIdsStr);
+			if(inspectionItem.size() > 0){
+				flag = true;
+			}
 		}
-		List<Long> inspectionItemPlan = indexBaseMonthDataDao.queryInspectionItemPlan(organIdsStr);
-		if(inspectionItemPlan.size() > 0){
-			return true;
+		if(!flag){
+			List<Long> inspectionItemPlan = indexBaseMonthDataDao.queryInspectionItemPlan(organIdsStr);
+			if(inspectionItemPlan.size() > 0){
+				flag = true;
+			}
 		}
-		List<Long> studentVisit = indexBaseMonthDataDao.queryStudentVisit(organIdsStr);
-		if(studentVisit.size() > 0){
-			return true;
+		if(!flag){
+			List<Long> studentVisit = indexBaseMonthDataDao.queryStudentVisit(organIdsStr);
+			if(studentVisit.size() > 0){
+				flag = true;
+			}
 		}
+		resultMap.put("indexErrData",flag);
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			throw new BizException("用户信息获取失败");
@@ -492,9 +519,11 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		if(musicGroupIds.size() > 0){
 			List<Long> calenderIds = musicGroupPaymentCalenderDao.queryEndIds(configValue1, format,musicGroupIds);
 			if(calenderIds.size() > 0){
-				return true;
+				resultMap.put("indexErrData",true);
+			}else {
+				resultMap.put("remindMatterData",false);
 			}
 		}
-		return false;
+		return resultMap;
 	}
 }

mec-web/src/main/java/com/ym/mec/web/controller/IndexController.java

@@ -116,92 +116,90 @@ public class IndexController extends BaseController {
 	}
 
 	@GetMapping("/newIndex")
-	public HttpResponseResult newIndex(String dataTypes, String organIds, Integer year){
+	public HttpResponseResult newIndex(String dataTypes, String organId, Integer year){
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
 		if (!sysUser.getIsSuperAdmin()) {
 			Employee employee = employeeService.get(sysUser.getId());
-			if (StringUtils.isBlank(organIds)) {
-				organIds = employee.getOrganIdList();
+			if (StringUtils.isBlank(organId)) {
+				organId = employee.getOrganIdList();
 			}else if(StringUtils.isEmpty(employee.getOrganIdList())){
 				return failed("用户所在分部异常");
 			}else {
 				List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-				if(!list.containsAll(Arrays.asList(organIds.split(",")))){
+				if(!list.containsAll(Arrays.asList(organId.split(",")))){
 					return failed("非法请求");
 				}
 			}
 		}
-		return succeed(indexService.getIndexBaseData(dataTypes , organIds, year));
+		return succeed(indexService.getIndexBaseData(dataTypes , organId, year));
 	}
 
-
-
 	@GetMapping("/hasIndexErrData")
-	public HttpResponseResult hasIndexErrData(String organIds){
+	public HttpResponseResult hasIndexErrData(String organId){
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
 		if (!sysUser.getIsSuperAdmin()) {
 			Employee employee = employeeService.get(sysUser.getId());
-			if (StringUtils.isBlank(organIds)) {
-				organIds = employee.getOrganIdList();
+			if (StringUtils.isBlank(organId)) {
+				organId = employee.getOrganIdList();
 			}else if(StringUtils.isEmpty(employee.getOrganIdList())){
 				return failed("用户所在分部异常");
 			}else {
 				List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-				if(!list.containsAll(Arrays.asList(organIds.split(",")))){
+				if(!list.containsAll(Arrays.asList(organId.split(",")))){
 					return failed("非法请求");
 				}
 			}
 		}
-		return succeed(indexService.hasIndexErrData(organIds));
+		return succeed(indexService.hasIndexErrData(organId));
 	}
 
 	@GetMapping("/getIndexErrData")
-	public HttpResponseResult getIndexErrData(String organIds){
+	public HttpResponseResult getIndexErrData(String organId){
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
 		if (!sysUser.getIsSuperAdmin()) {
 			Employee employee = employeeService.get(sysUser.getId());
-			if (StringUtils.isBlank(organIds)) {
-				organIds = employee.getOrganIdList();
+			if (StringUtils.isBlank(organId)) {
+				organId = employee.getOrganIdList();
 			}else if(StringUtils.isEmpty(employee.getOrganIdList())){
 				return failed("用户所在分部异常");
 			}else {
 				List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-				if(!list.containsAll(Arrays.asList(organIds.split(",")))){
+				if(!list.containsAll(Arrays.asList(organId.split(",")))){
 					return failed("非法请求");
 				}
 			}
 		}
-		return succeed(indexService.getIndexErrData(organIds));
+		return succeed(indexService.getIndexErrData(organId));
 	}
 
 	@GetMapping("/getRemindMatterData")
-	public HttpResponseResult getRemindMatterData(String organIds){
+	public HttpResponseResult getRemindMatterData(String organId){
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
 		if (!sysUser.getIsSuperAdmin()) {
 			Employee employee = employeeService.get(sysUser.getId());
-			if (StringUtils.isBlank(organIds)) {
-				organIds = employee.getOrganIdList();
+			if (StringUtils.isBlank(organId)) {
+				organId = employee.getOrganIdList();
 			}else if(StringUtils.isEmpty(employee.getOrganIdList())){
 				return failed("用户所在分部异常");
 			}else {
 				List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-				if(!list.containsAll(Arrays.asList(organIds.split(",")))){
+				if(!list.containsAll(Arrays.asList(organId.split(",")))){
 					return failed("非法请求");
 				}
 			}
 		}
-		return succeed(indexService.getRemindMatterData(organIds));
+		return succeed(indexService.getRemindMatterData(organId));
 	}
 }