Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentCompetition.java

@@ -23,7 +23,7 @@ public class StudentCompetition {
 	private Integer age;
 
 	@ApiModelProperty(value = "性别")
-	private boolean gender;
+	private Boolean gender;
 
 	@ApiModelProperty(value = "年级")
 	private String grade;
@@ -47,7 +47,7 @@ public class StudentCompetition {
 	private Integer prizeLevel;
 
 	@ApiModelProperty(value = "是否展示")
-	private boolean isShow;
+	private Boolean isShow;
 
 	@ApiModelProperty(value = "评价")
 	private String comment;
@@ -95,15 +95,15 @@ public class StudentCompetition {
 	public Integer getAge(){
 		return this.age;
 	}
-			
-	public void setGender(boolean gender){
-		this.gender = gender;
+
+	public Boolean getGender() {
+		return gender;
 	}
-	
-	public boolean isGender(){
-		return this.gender;
+
+	public void setGender(Boolean gender) {
+		this.gender = gender;
 	}
-			
+
 	public void setGrade(String grade){
 		this.grade = grade;
 	}
@@ -168,14 +168,14 @@ public class StudentCompetition {
 		this.prizeLevel = prizeLevel;
 	}
 
-	public void setIsShow(boolean isShow){
-		this.isShow = isShow;
+	public Boolean getIsShow() {
+		return isShow;
 	}
-	
-	public boolean isIsShow(){
-		return this.isShow;
+
+	public void setIsShow(Boolean show) {
+		isShow = show;
 	}
-			
+
 	public void setComment(String comment){
 		this.comment = comment;
 	}

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.page;
 
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -13,7 +14,7 @@ import java.util.Date;
 public class StudentCompetitionQueryInfo extends QueryInfo {
 
     @ApiModelProperty(value = "性别")
-    private boolean gender;
+    private Boolean gender;
 
     @ApiModelProperty(value = "年级")
     private String grade;
@@ -28,21 +29,29 @@ public class StudentCompetitionQueryInfo extends QueryInfo {
     private Integer prizeLevel;
 
     @ApiModelProperty(value = "是否展示")
-    private boolean isShow;
+    private Boolean isShow;
 
     @ApiModelProperty(value = "评价")
     private String comment;
 
     private java.util.Date createTime;
 
-    public boolean isGender() {
+    public Boolean getGender() {
         return gender;
     }
 
-    public void setGender(boolean gender) {
+    public void setGender(Boolean gender) {
         this.gender = gender;
     }
 
+    public Boolean getIsShow() {
+        return isShow;
+    }
+
+    public void setIsShow(Boolean show) {
+        isShow = show;
+    }
+
     public String getGrade() {
         return grade;
     }
@@ -75,14 +84,6 @@ public class StudentCompetitionQueryInfo extends QueryInfo {
         this.prizeLevel = prizeLevel;
     }
 
-    public boolean isShow() {
-        return isShow;
-    }
-
-    public void setShow(boolean show) {
-        isShow = show;
-    }
-
     public String getComment() {
         return comment;
     }

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

@@ -1220,7 +1220,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 //                String[] studentNames = classGroupStudentMapperDao.findCourseStudentName(courseScheduleDto.getId().intValue());
                 List<StudentNameAndPhoneDto> courseStudentNameAndPhone = classGroupStudentMapperDao.findCourseStudentNameAndPhone(courseScheduleDto.getId().intValue());
                 if(!CollectionUtils.isEmpty(courseStudentNameAndPhone)){
-                    List<String> studentNames = courseStudentNameAndPhone.stream().map(StudentNameAndPhoneDto::getUserName).collect(Collectors.toList());
+                    List<String> studentNames = courseStudentNameAndPhone.stream().filter(s->Objects.nonNull(s)).map(StudentNameAndPhoneDto::getUserName).collect(Collectors.toList());
                     courseScheduleDto.setStudentNames(org.apache.commons.lang3.StringUtils.join(studentNames, ","));
                     courseScheduleDto.setStudents(courseStudentNameAndPhone);
                 }

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

@@ -41,8 +41,7 @@ import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
 import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PayUserType.SCHOOL;
-import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentType.MUSIC_APPLY;
-import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentType.MUSIC_RENEW;
+import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentType.*;
 
 @Service
 public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long, MusicGroupPaymentCalender> implements MusicGroupPaymentCalenderService {
@@ -128,10 +127,12 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		if (musicGroupPaymentCalender.getDeadlinePaymentDate() == null && musicGroupPaymentCalender.getPayUserType() == PayUserType.STUDENT) {
 			musicGroupPaymentCalender.setDeadlinePaymentDate(DateUtil.addDays(musicGroupPaymentCalender.getStartPaymentDate(), 3));
 		}
-		int count = musicGroupPaymentCalenderDao.queryIntersectionByValidDate(musicGroupId, musicGroupPaymentCalender.getPayUserType(), musicGroupPaymentCalender.getPaymentValidStartDate(),
-				musicGroupPaymentCalender.getPaymentValidEndDate(), null);
-		if (count > 0) {
-			throw new BizException("缴费有效期存在冲突，请修改缴费有效期");
+		if(musicGroupPaymentCalender.getPaymentType() != ADD_STUDENT){
+			int count = musicGroupPaymentCalenderDao.queryIntersectionByValidDate(musicGroupId, musicGroupPaymentCalender.getPayUserType(), musicGroupPaymentCalender.getPaymentValidStartDate(),
+					musicGroupPaymentCalender.getPaymentValidEndDate(), null);
+			if (count > 0) {
+				throw new BizException("缴费有效期存在冲突，请修改缴费有效期");
+			}
 		}
 		// 获取设置的课程
 		List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettingsList = musicGroupPaymentCalender
@@ -193,60 +194,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			
 			//如果是进行中加学生
 			if (musicGroupPaymentCalender.getPaymentType() == PaymentType.ADD_STUDENT) {
-				String studentIdStr = musicGroupPaymentCalender.getStudentIds();
-				if (StringUtils.isNoneBlank(studentIdStr)) {
-					//计算总费用
-					BigDecimal totalPrice = new BigDecimal(0);
-					for(MusicGroupPaymentCalenderCourseSettings musicGroupPaymentCalenderCourseSettings : musicGroupPaymentCalenderCourseSettingsList){
-						totalPrice = totalPrice.add(musicGroupPaymentCalenderCourseSettings.getCourseCurrentPrice());
-					}
-					
-					List<MusicGroupPaymentStudentCourseDetail> musicGroupPaymentStudentCourseDetailList = new ArrayList<MusicGroupPaymentStudentCourseDetail>();
-					MusicGroupPaymentStudentCourseDetail musicGroupPaymentStudentCourseDetail = null;
-					
-					for (String studentId : studentIdStr.split(",")) {
-						// 学生加到calenderDetail
-						MusicGroupPaymentCalenderDetail musicGroupPaymentCalenderDetail = new MusicGroupPaymentCalenderDetail();
-						musicGroupPaymentCalenderDetail.setMusicGroupPaymentCalenderId(musicGroupPaymentCalender.getId());
-						musicGroupPaymentCalenderDetail.setCreateTime(date);
-						musicGroupPaymentCalenderDetail.setExpectAmount(totalPrice);
-						musicGroupPaymentCalenderDetail.setPaymentStatus(PaymentStatus.NON_PAYMENT);
-						musicGroupPaymentCalenderDetail.setUpdateTime(date);
-						musicGroupPaymentCalenderDetail.setUserId(Integer.parseInt(studentId));
-						musicGroupPaymentCalenderDetail.setStartPaymentDate(musicGroupPaymentCalender.getStartPaymentDate());
-						musicGroupPaymentCalenderDetail.setDeadlinePaymentDate(musicGroupPaymentCalender.getDeadlinePaymentDate());
-						
-						musicGroupPaymentCalenderDetailDao.insert(musicGroupPaymentCalenderDetail);
-						
-						// 学生加课程明细
-						for(MusicGroupPaymentCalenderCourseSettings courseSettings : musicGroupPaymentCalenderCourseSettingsList){
-							if (courseSettings.getIsStudentOptional() == true) {
-								continue;
-							}
-							musicGroupPaymentStudentCourseDetail = new MusicGroupPaymentStudentCourseDetail();
-							musicGroupPaymentStudentCourseDetail.setCourseType(courseSettings.getCourseType());
-							musicGroupPaymentStudentCourseDetail.setCreateTime(date);
-							musicGroupPaymentStudentCourseDetail.setMusicGroupPaymentCalenderId(musicGroupPaymentCalender.getId());
-							musicGroupPaymentStudentCourseDetail.setMusicGroupPaymentCalenderDetailId(musicGroupPaymentCalenderDetail.getId());
-							musicGroupPaymentStudentCourseDetail.setTotalCourseMinutes(courseSettings.getCourseTotalMinuties());
-							musicGroupPaymentStudentCourseDetail.setUpdateTime(date);
-							musicGroupPaymentStudentCourseDetail.setUsedCourseMinutes(0);
-							musicGroupPaymentStudentCourseDetail.setUserId(Integer.parseInt(studentId));
-							
-							musicGroupPaymentStudentCourseDetailList.add(musicGroupPaymentStudentCourseDetail);
-						}
-						
-						if(musicGroupPaymentStudentCourseDetailList.size() > 0){
-							musicGroupPaymentStudentCourseDetailDao.batchInsert(musicGroupPaymentStudentCourseDetailList);
-						}
-
-						// 学生加到班级
-						String classGroupIdStr = musicGroupPaymentCalender.getAttribute1();
-						if (StringUtils.isNotBlank(classGroupIdStr)) {
-							classGroupService.addStudentToClassGroupAndCourseArranging(Integer.parseInt(studentId), classGroupIdStr, musicGroupPaymentCalenderCourseSettingsList);
-						}
-					}
-				}
+				addStudent(musicGroupPaymentCalender,musicGroupPaymentCalenderCourseSettingsList);
 			}
 		}else {
             Set<Integer> roleIds = new HashSet<>(1);
@@ -349,10 +297,12 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		if (musicGroupPaymentCalender.getDeadlinePaymentDate() == null && musicGroupPaymentCalender.getPayUserType() == PayUserType.STUDENT) {
 			musicGroupPaymentCalender.setDeadlinePaymentDate(DateUtil.addDays(musicGroupPaymentCalender.getStartPaymentDate(), 3));
 		}
-		int count = musicGroupPaymentCalenderDao.queryIntersectionByValidDate(musicGroupId, musicGroupPaymentCalender.getPayUserType(), musicGroupPaymentCalender.getPaymentValidStartDate(),
-				musicGroupPaymentCalender.getPaymentValidEndDate(), musicGroupPaymentCalender.getId());
-		if (count > 0) {
-			throw new BizException("缴费有效期存在冲突，请修改缴费有效期");
+		if(musicGroupPaymentCalender.getPaymentType() != ADD_STUDENT){
+			int count = musicGroupPaymentCalenderDao.queryIntersectionByValidDate(musicGroupId, musicGroupPaymentCalender.getPayUserType(), musicGroupPaymentCalender.getPaymentValidStartDate(),
+					musicGroupPaymentCalender.getPaymentValidEndDate(), null);
+			if (count > 0) {
+				throw new BizException("缴费有效期存在冲突，请修改缴费有效期");
+			}
 		}
 		
 		//获取设置的课程
@@ -413,60 +363,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			
 			//如果是进行中加学生
 			if (musicGroupPaymentCalender.getPaymentType() == PaymentType.ADD_STUDENT) {
-				String studentIdStr = musicGroupPaymentCalender.getStudentIds();
-				if (StringUtils.isNoneBlank(studentIdStr)) {
-					//计算总费用
-					BigDecimal totalPrice = new BigDecimal(0);
-					for(MusicGroupPaymentCalenderCourseSettings musicGroupPaymentCalenderCourseSettings : musicGroupPaymentCalenderCourseSettingsList){
-						totalPrice = totalPrice.add(musicGroupPaymentCalenderCourseSettings.getCourseCurrentPrice());
-					}
-					
-					List<MusicGroupPaymentStudentCourseDetail> musicGroupPaymentStudentCourseDetailList = new ArrayList<MusicGroupPaymentStudentCourseDetail>();
-					MusicGroupPaymentStudentCourseDetail musicGroupPaymentStudentCourseDetail = null;
-					
-					for (String studentId : studentIdStr.split(",")) {
-						// 学生加到calenderDetail
-						MusicGroupPaymentCalenderDetail musicGroupPaymentCalenderDetail = new MusicGroupPaymentCalenderDetail();
-						musicGroupPaymentCalenderDetail.setMusicGroupPaymentCalenderId(musicGroupPaymentCalender.getId());
-						musicGroupPaymentCalenderDetail.setCreateTime(date);
-						musicGroupPaymentCalenderDetail.setExpectAmount(totalPrice);
-						musicGroupPaymentCalenderDetail.setPaymentStatus(PaymentStatus.NON_PAYMENT);
-						musicGroupPaymentCalenderDetail.setUpdateTime(date);
-						musicGroupPaymentCalenderDetail.setUserId(Integer.parseInt(studentId));
-						musicGroupPaymentCalenderDetail.setStartPaymentDate(musicGroupPaymentCalender.getStartPaymentDate());
-						musicGroupPaymentCalenderDetail.setDeadlinePaymentDate(musicGroupPaymentCalender.getDeadlinePaymentDate());
-						
-						musicGroupPaymentCalenderDetailDao.insert(musicGroupPaymentCalenderDetail);
-						
-						// 学生加课程明细
-						for(MusicGroupPaymentCalenderCourseSettings courseSettings : musicGroupPaymentCalenderCourseSettingsList){
-							if (courseSettings.getIsStudentOptional() == true) {
-								continue;
-							}
-							musicGroupPaymentStudentCourseDetail = new MusicGroupPaymentStudentCourseDetail();
-							musicGroupPaymentStudentCourseDetail.setCourseType(courseSettings.getCourseType());
-							musicGroupPaymentStudentCourseDetail.setCreateTime(date);
-							musicGroupPaymentStudentCourseDetail.setMusicGroupPaymentCalenderId(musicGroupPaymentCalender.getId());
-							musicGroupPaymentStudentCourseDetail.setMusicGroupPaymentCalenderDetailId(musicGroupPaymentCalenderDetail.getId());
-							musicGroupPaymentStudentCourseDetail.setTotalCourseMinutes(courseSettings.getCourseTotalMinuties());
-							musicGroupPaymentStudentCourseDetail.setUpdateTime(date);
-							musicGroupPaymentStudentCourseDetail.setUsedCourseMinutes(0);
-							musicGroupPaymentStudentCourseDetail.setUserId(Integer.parseInt(studentId));
-							
-							musicGroupPaymentStudentCourseDetailList.add(musicGroupPaymentStudentCourseDetail);
-						}
-						
-						if(musicGroupPaymentStudentCourseDetailList.size() > 0){
-							musicGroupPaymentStudentCourseDetailDao.batchInsert(musicGroupPaymentStudentCourseDetailList);
-						}
-
-						// 学生加到班级
-						String classGroupIdStr = musicGroupPaymentCalender.getAttribute1();
-						if(StringUtils.isNotBlank(classGroupIdStr)){
-							classGroupService.addStudentToClassGroupAndCourseArranging(Integer.parseInt(studentId), classGroupIdStr, musicGroupPaymentCalenderCourseSettingsList);
-						}
-					}
-				}
+				addStudent(musicGroupPaymentCalender,musicGroupPaymentCalenderCourseSettingsList);
 			}
 
 		}else {
@@ -519,6 +416,65 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		return musicGroupPaymentCalender.getId();
 	}
 
+	public void addStudent(MusicGroupPaymentCalender musicGroupPaymentCalender,List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettingsList){
+		//如果是进行中加学生
+		Date date = new Date();
+		String studentIdStr = musicGroupPaymentCalender.getStudentIds();
+		if (StringUtils.isNoneBlank(studentIdStr)) {
+			//计算总费用
+			BigDecimal totalPrice = new BigDecimal(0);
+			for(MusicGroupPaymentCalenderCourseSettings musicGroupPaymentCalenderCourseSettings : musicGroupPaymentCalenderCourseSettingsList){
+				totalPrice = totalPrice.add(musicGroupPaymentCalenderCourseSettings.getCourseCurrentPrice());
+			}
+
+			List<MusicGroupPaymentStudentCourseDetail> musicGroupPaymentStudentCourseDetailList = new ArrayList<MusicGroupPaymentStudentCourseDetail>();
+			MusicGroupPaymentStudentCourseDetail musicGroupPaymentStudentCourseDetail = null;
+
+			for (String studentId : studentIdStr.split(",")) {
+				// 学生加到calenderDetail
+				MusicGroupPaymentCalenderDetail musicGroupPaymentCalenderDetail = new MusicGroupPaymentCalenderDetail();
+				musicGroupPaymentCalenderDetail.setMusicGroupPaymentCalenderId(musicGroupPaymentCalender.getId());
+				musicGroupPaymentCalenderDetail.setCreateTime(date);
+				musicGroupPaymentCalenderDetail.setExpectAmount(totalPrice);
+				musicGroupPaymentCalenderDetail.setPaymentStatus(PaymentStatus.NON_PAYMENT);
+				musicGroupPaymentCalenderDetail.setUpdateTime(date);
+				musicGroupPaymentCalenderDetail.setUserId(Integer.parseInt(studentId));
+				musicGroupPaymentCalenderDetail.setStartPaymentDate(musicGroupPaymentCalender.getStartPaymentDate());
+				musicGroupPaymentCalenderDetail.setDeadlinePaymentDate(musicGroupPaymentCalender.getDeadlinePaymentDate());
+
+				musicGroupPaymentCalenderDetailDao.insert(musicGroupPaymentCalenderDetail);
+
+				// 学生加课程明细
+				for(MusicGroupPaymentCalenderCourseSettings courseSettings : musicGroupPaymentCalenderCourseSettingsList){
+					if (courseSettings.getIsStudentOptional() == true) {
+						continue;
+					}
+					musicGroupPaymentStudentCourseDetail = new MusicGroupPaymentStudentCourseDetail();
+					musicGroupPaymentStudentCourseDetail.setCourseType(courseSettings.getCourseType());
+					musicGroupPaymentStudentCourseDetail.setCreateTime(date);
+					musicGroupPaymentStudentCourseDetail.setMusicGroupPaymentCalenderId(musicGroupPaymentCalender.getId());
+					musicGroupPaymentStudentCourseDetail.setMusicGroupPaymentCalenderDetailId(musicGroupPaymentCalenderDetail.getId());
+					musicGroupPaymentStudentCourseDetail.setTotalCourseMinutes(courseSettings.getCourseTotalMinuties());
+					musicGroupPaymentStudentCourseDetail.setUpdateTime(date);
+					musicGroupPaymentStudentCourseDetail.setUsedCourseMinutes(0);
+					musicGroupPaymentStudentCourseDetail.setUserId(Integer.parseInt(studentId));
+
+					musicGroupPaymentStudentCourseDetailList.add(musicGroupPaymentStudentCourseDetail);
+				}
+
+				if(musicGroupPaymentStudentCourseDetailList.size() > 0){
+					musicGroupPaymentStudentCourseDetailDao.batchInsert(musicGroupPaymentStudentCourseDetailList);
+				}
+
+				// 学生加到班级
+				String classGroupIdStr = musicGroupPaymentCalender.getAttribute1();
+				if(StringUtils.isNotBlank(classGroupIdStr)){
+					classGroupService.addStudentToClassGroupAndCourseArranging(Integer.parseInt(studentId), classGroupIdStr, musicGroupPaymentCalenderCourseSettingsList);
+				}
+			}
+		}
+	}
+
 	@Override
 	public void autoUpdateMusicGroupStudentFeeStatus() {
 		Date date = new Date();
@@ -650,6 +606,9 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				roleIds.add(SysUserRole.SECTION_MANAGER);
 				sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds, musicGroup.getOrganId()), MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_APPLY, "", sysUser.getUsername());
 			}
+		}else if (musicGroupPaymentCalender.getPaymentType() == PaymentType.ADD_STUDENT) {
+			List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettings = musicGroupPaymentCalenderCourseSettingsDao.queryCalenderCourseSettings(calenderId);
+			addStudent(musicGroupPaymentCalender,musicGroupPaymentCalenderCourseSettings);
 		}
 	}
 
@@ -838,18 +797,20 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		}
 		Date date = new Date();
 		// 判断缴费开始时间、结束时间是否被其他缴费记录占用
-		int count = musicGroupPaymentCalenderDao.queryIntersectionByPaymentDate(calender.getMusicGroupId(), paymentCalender.getStartPaymentDate(),
-				paymentCalender.getDeadlinePaymentDate(), paymentCalender.getId());
+//		int count = musicGroupPaymentCalenderDao.queryIntersectionByPaymentDate(calender.getMusicGroupId(), paymentCalender.getStartPaymentDate(),
+//				paymentCalender.getDeadlinePaymentDate(), paymentCalender.getId());
 		// String format = DateUtil.format(startTime, DateUtil.DEFAULT_PATTERN);
 		// String format1 = DateUtil.format(endTime, DateUtil.DEFAULT_PATTERN);
 		// int count = musicGroupPaymentCalenderDao.queryIntersectionByDate(calender.getMusicGroupId(), format,format1);
-		if (count > 0) {
+		/*if (count > 0) {
 			throw new BizException("缴费时间存在冲突，请修改缴费开始日期");
-		}
-		count = musicGroupPaymentCalenderDao.queryIntersectionByValidDate(calender.getMusicGroupId(), paymentCalender.getPayUserType(), paymentCalender.getPaymentValidStartDate(),
-				paymentCalender.getPaymentValidEndDate(), paymentCalender.getId());
-		if (count > 0) {
-			throw new BizException("缴费有效期存在冲突，请修改缴费有效期");
+		}*/
+		if(paymentCalender.getPaymentType() != ADD_STUDENT){
+			int count = musicGroupPaymentCalenderDao.queryIntersectionByValidDate(paymentCalender.getMusicGroupId(), paymentCalender.getPayUserType(), paymentCalender.getPaymentValidStartDate(),
+					paymentCalender.getPaymentValidEndDate(), paymentCalender.getId());
+			if (count > 0) {
+				throw new BizException("缴费有效期存在冲突，请修改缴费有效期");
+			}
 		}
 		calender.setStartPaymentDate(paymentCalender.getStartPaymentDate());
 		calender.setDeadlinePaymentDate(paymentCalender.getDeadlinePaymentDate());

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

@@ -1,16 +1,13 @@
 package com.ym.mec.biz.service.impl;
 
-import cfca.sadk.org.bouncycastle.apache.bzip2.BZip2Constants;
 import com.ym.mec.biz.dal.dto.StudentCompetitionRankingDto;
 import com.ym.mec.biz.dal.page.StudentCompetitionQueryInfo;
-import com.ym.mec.biz.service.ContractService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.ym.mec.biz.dal.entity.StudentCompetition;
 import com.ym.mec.biz.service.StudentCompetitionService;

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

@@ -30,6 +30,7 @@
         <result column="payment_amount_" property="paymentAmount"/>
         <result column="attribute1_" property="attribute1"/>
         <result column="attribute2_" property="attribute2"/>
+        <result column="student_ids_" property="studentIds"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -48,12 +49,12 @@
         INSERT INTO music_group_payment_calender
         (music_group_id_,music_group_organization_course_settings_id_,pay_user_type_,reject_reason_,start_payment_date_,deadline_payment_date_,status_,expect_num_,
         actual_num_,memo_,is_give_music_network_,create_time_,update_time_,payment_valid_start_date_,payment_valid_end_date_,
-        payment_pattern_,payment_type_,payment_amount_,batch_no_,audit_memo_,operator_,attribute1_,attribute2_)
+        payment_pattern_,payment_type_,payment_amount_,batch_no_,audit_memo_,operator_,attribute1_,attribute2_,student_ids_)
         VALUES(#{musicGroupId},#{musicGroupOrganizationCourseSettingId},#{payUserType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{rejectReason},#{startPaymentDate},#{deadlinePaymentDate},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{expectNum},#{actualNum},#{memo},#{isGiveMusicNetwork},now(),now(),
         #{paymentValidStartDate},#{paymentValidEndDate},#{paymentPattern},#{paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{paymentAmount},#{batchNo},#{auditMemo},#{operator},#{attribute1},#{attribute2})
+        #{paymentAmount},#{batchNo},#{auditMemo},#{operator},#{attribute1},#{attribute2},#{studentIds})
     </insert>
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender" useGeneratedKeys="true"
@@ -61,13 +62,13 @@
         INSERT INTO music_group_payment_calender
         (music_group_id_,music_group_organization_course_settings_id_,pay_user_type_,reject_reason_,start_payment_date_,deadline_payment_date_,status_,expect_num_,
         actual_num_,memo_,is_give_music_network_,create_time_,update_time_,payment_valid_start_date_,payment_valid_end_date_,payment_pattern_,payment_amount_,
-        payment_type_,batch_no_,audit_memo_,operator_,attribute1_,attribute2_)
+        payment_type_,batch_no_,audit_memo_,operator_,attribute1_,attribute2_,student_ids_)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
         (#{item.musicGroupId},#{item.musicGroupOrganizationCourseSettingId},#{item.payUserType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.rejectReason},#{item.startPaymentDate},#{item.deadlinePaymentDate},#{item.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{item.expectNum},#{item.actualNum},#{item.memo},#{item.isGiveMusicNetwork},now(),now(),
         #{item.paymentValidStartDate},#{item.paymentValidEndDate},#{item.paymentPattern},#{item.paymentAmount},#{item.paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{item.batchNo},#{item.auditMemo},#{item.operator},#{item.attribute1},#{item.attribute2})
+        #{item.batchNo},#{item.auditMemo},#{item.operator},#{item.attribute1},#{item.attribute2},#{item.studentIds})
         </foreach>
     </insert>
 
@@ -75,6 +76,9 @@
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender">
         UPDATE music_group_payment_calender
         <set>
+            <if test="studentIds != null and studentIds != ''">
+                student_ids_ = #{studentIds},
+            </if>
             <if test="auditMemo != null and auditMemo != ''">
                 audit_memo_ = #{auditMemo},
             </if>
@@ -144,6 +148,9 @@
 	    <foreach collection="list" item="item" index="index" open="" close="" separator=";">
 	        UPDATE music_group_payment_calender
 	        <set>
+                <if test="item.studentIds != null and item.studentIds != ''">
+                    student_ids_ = #{item.studentIds},
+                </if>
                 <if test="item.paymentPattern != null">
                     payment_pattern_ = #{item.paymentPattern},
                 </if>

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

@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
 <mapper namespace="com.ym.mec.biz.dal.dao.StudentCompetitionDao">
 	
 	<resultMap type="com.ym.mec.biz.dal.entity.StudentCompetition" id="StudentCompetition">
@@ -28,7 +24,7 @@
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="StudentCompetition" >
-		SELECT * FROM student_competition WHERE id_ = #{id} FOR UPDATE
+		SELECT * FROM student_competition WHERE id_ = #{id}
 	</select>
 	
 	<!-- 全查询 -->
@@ -149,7 +145,7 @@
 	</select>
 
 	<select id="getWinnerList" resultMap="StudentCompetition">
-		SELECT * FROM student_competition WHERE is_show_ = 1 AND prize_level_ IS NOT NULL ORDER BY prize_level_
+		SELECT * FROM student_competition WHERE is_show_ = 1 AND prize_level_ &gt; 0 ORDER BY prize_level_,score_ DESC
 	</select>
 
 	<select id="getCompetitionWithUser" resultMap="StudentCompetition">

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

@@ -898,11 +898,11 @@
         LEFT JOIN student_registration sr ON sr.music_group_id_ = mgpc.music_group_id_
         LEFT JOIN sys_user su ON su.id_ = sr.user_id_
         LEFT JOIN `subject` s ON s.id_ = sr.subject_id_
-        WHERE mgpc.id_ = #{musicGroupPaymentCalenderId} AND mgpc.music_group_id_ = #{musicGroupId} AND sr.music_group_status_ != 'QUIT' AND sr.user_id_ NOT IN (
+        WHERE mgpc.id_ = #{musicGroupPaymentCalenderId} AND mgpc.music_group_id_ = #{musicGroupId} AND sr.music_group_status_ = 'NORMAL' AND sr.user_id_ NOT IN (
         SELECT DISTINCT user_id_ FROM music_group_payment_calender_detail
         WHERE music_group_payment_calender_id_ = #{musicGroupPaymentCalenderId})
         <if test="search != null and search != ''">
-            AND sr.user_id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%')
+            AND (sr.user_id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%'))
         </if>
         <if test="subjectId != null">
             AND sr.subject_id_ = #{subjectId}