Merge branch 'zx_index_error' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/page/ArrearageStudentsQueryInfo.java

@@ -17,9 +17,6 @@ public class ArrearageStudentsQueryInfo extends QueryInfo {
 
     private Integer eduTeacherId;
 
-    @ApiModelProperty(value = "未缴费类型：0历史，1进行中")
-    private Integer noPaymentType;
-
     private Integer courseViewType;
 
     @ApiModelProperty(value = "是否排课（用于区分欠费学员异常和欠费学员提醒）")
@@ -72,12 +69,4 @@ public class ArrearageStudentsQueryInfo extends QueryInfo {
     public void setEduTeacherId(Integer eduTeacherId) {
         this.eduTeacherId = eduTeacherId;
     }
-
-    public Integer getNoPaymentType() {
-        return noPaymentType;
-    }
-
-    public void setNoPaymentType(Integer noPaymentType) {
-        this.noPaymentType = noPaymentType;
-    }
 }

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

@@ -730,10 +730,10 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			twoChild.add(new IndexErrInfoDto(IndexErrorType.STUDENT_APPLY_FOR_QUIT_MUSIC_GROUP, IndexErrorType.STUDENT_APPLY_FOR_QUIT_MUSIC_GROUP.getMsg(), quitGroupNum.size(),  quitGroupNum));
 
 			//学员已排课时长未消耗完
-			Map<String, Object> params = new HashMap<>();
-			params.put("organId", organIdsStr);
-			params.put("tenantId", tenantId);
-			twoChild.add(new IndexErrInfoDto(IndexErrorType.HAS_FREE_COURSE_TIMES, IndexErrorType.HAS_FREE_COURSE_TIMES.getMsg(), musicGroupDao.countHasFreeCourseTimes(params), null));
+//			Map<String, Object> params = new HashMap<>();
+//			params.put("organId", organIdsStr);
+//			params.put("tenantId", tenantId);
+//			twoChild.add(new IndexErrInfoDto(IndexErrorType.HAS_FREE_COURSE_TIMES, IndexErrorType.HAS_FREE_COURSE_TIMES.getMsg(), musicGroupDao.countHasFreeCourseTimes(params), null));
 
 			//合作单位回款异常
 			Map<String, Object> params1 = new HashMap<>();
@@ -1118,13 +1118,13 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		result.add(new IndexErrInfoDto(IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW, IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW.getMsg(),lowTeacherSalary, null));
 
 		//乐团展演计划提醒
-		List<MusicGroupPerformance> musicGroupPerformances = musicGroupPerformanceDao.findNoStart(educationUserId,organIds);
-		IndexErrInfoDto infoDto1 = new IndexErrInfoDto();
-		infoDto1.setErrorType(IndexErrorType.MUSIC_GROUP_PERFORMANCE);
-		infoDto1.setNum(musicGroupPerformances.stream().map(e -> e.getMusicGroupId()).collect(Collectors.toSet()).size());
-		infoDto1.setNum2(musicGroupPerformances.stream().map(e -> e.getId()).collect(Collectors.toSet()).size());
-		infoDto1.setDesc(IndexErrorType.MUSIC_GROUP_PERFORMANCE.getMsg());
-		result.add(infoDto1);
+//		List<MusicGroupPerformance> musicGroupPerformances = musicGroupPerformanceDao.findNoStart(educationUserId,organIds);
+//		IndexErrInfoDto infoDto1 = new IndexErrInfoDto();
+//		infoDto1.setErrorType(IndexErrorType.MUSIC_GROUP_PERFORMANCE);
+//		infoDto1.setNum(musicGroupPerformances.stream().map(e -> e.getMusicGroupId()).collect(Collectors.toSet()).size());
+//		infoDto1.setNum2(musicGroupPerformances.stream().map(e -> e.getId()).collect(Collectors.toSet()).size());
+//		infoDto1.setDesc(IndexErrorType.MUSIC_GROUP_PERFORMANCE.getMsg());
+//		result.add(infoDto1);
 
 		//乐团剩余时长未排课
 		List<String> musicGroupIds = musicGroupDao.queryHasSubCourseTimes(organIds,tenantId);
@@ -1222,15 +1222,15 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 				flag2 = true;
 			}
 		}
-		if(!flag2){
-			Map<String, Object> params = new HashMap<String, Object>(2);
-			params.put("organId",organIdsStr);
-			params.put("tenantId",tenantId);
-			Integer hasFreeCourseTimes = musicGroupDao.countHasFreeCourseTimes(params);
-			if(hasFreeCourseTimes != null && hasFreeCourseTimes > 0){
-				flag2 = true;
-			}
-		}
+//		if(!flag2){
+//			Map<String, Object> params = new HashMap<String, Object>(2);
+//			params.put("organId",organIdsStr);
+//			params.put("tenantId",tenantId);
+//			Integer hasFreeCourseTimes = musicGroupDao.countHasFreeCourseTimes(params);
+//			if(hasFreeCourseTimes != null && hasFreeCourseTimes > 0){
+//				flag2 = true;
+//			}
+//		}
 		resultMap.put("studentInfo",flag2);
 		boolean flag3 = false;
 

mec-biz/src/main/resources/config/mybatis/MusicGroupPaymentCalenderDetailMapper.xml

@@ -448,12 +448,6 @@
 			<if test="hasCourse != null and hasCourse == false">
 				AND mgpsc.used_course_minutes_ = 0
 			</if>
-			<if test="noPaymentType==null or noPaymentType==0">
-				AND DATE_FORMAT(NOW(),'%Y-%m-%d') > DATE_FORMAT(mgpc.deadline_payment_date_,'%Y-%m-%d')
-			</if>
-			<if test="noPaymentType!=null and noPaymentType==1">
-				AND DATE_FORMAT(NOW(),'%Y-%m-%d') BETWEEN DATE_FORMAT(mgpc.start_payment_date_,'%Y-%m-%d') AND DATE_FORMAT(mgpc.deadline_payment_date_,'%Y-%m-%d')
-			</if>
 			AND mgpcd.payment_status_ = 'NON_PAYMENT' AND mgpc.batch_no_ IS NOT NULL AND mgpc.pay_user_type_ = 'STUDENT'
 			AND mgpc.current_total_amount_ > 0
 			<if test="organId != null and organId != ''">