Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupStudentsDto.java

@@ -20,6 +20,9 @@ public class MusicGroupStudentsDto{
     @ApiModelProperty(value = "手机号",required = false)
     private String phone;
 
+    @ApiModelProperty(value = "年级年份",required = false)
+    private Date currentGradeDate;
+
     @ApiModelProperty(value = "年级",required = false)
     private String currentGrade;
 
@@ -220,4 +223,12 @@ public class MusicGroupStudentsDto{
     public void setQuitReason(String quitReason) {
         this.quitReason = quitReason;
     }
+
+    public Date getCurrentGradeDate() {
+        return currentGradeDate;
+    }
+
+    public void setCurrentGradeDate(Date currentGradeDate) {
+        this.currentGradeDate = currentGradeDate;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentApplyDetailDto.java

@@ -9,6 +9,8 @@ import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.common.enums.UserGenderEnum;
 import com.ym.mec.common.page.QueryInfo;
 
+import java.util.Date;
+
 public class StudentApplyDetailDto{
 
     @ApiModelProperty(value = "学生报名编号",required = false)
@@ -24,6 +26,10 @@ public class StudentApplyDetailDto{
     private String parentsName;
 
     /** 当前所在年级 */
+    @ApiModelProperty(value = "年级年份",required = false)
+    private Date currentGradeDate;
+
+    /** 当前所在年级 */
     @ApiModelProperty(value = "当前所在年级",required = false)
     private String currentGrade;
 
@@ -189,4 +195,12 @@ public class StudentApplyDetailDto{
     public void setSubjectChange(SubjectChange subjectChange) {
         this.subjectChange = subjectChange;
     }
+
+    public Date getCurrentGradeDate() {
+        return currentGradeDate;
+    }
+
+    public void setCurrentGradeDate(Date currentGradeDate) {
+        this.currentGradeDate = currentGradeDate;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentInfo.java

@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.Subject;
 
+import java.util.Date;
+
 public class StudentInfo extends SysUser {
 
 	/**
@@ -15,7 +17,9 @@ public class StudentInfo extends SysUser {
 	private String name;
 	
 	private String grade;
-	
+
+	private Date gradeDate;
+
 	private String clazz;
 	
 	private String parentsName;
@@ -66,4 +70,12 @@ public class StudentInfo extends SysUser {
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);
 	}
+
+	public Date getGradeDate() {
+		return gradeDate;
+	}
+
+	public void setGradeDate(Date gradeDate) {
+		this.gradeDate = gradeDate;
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherAttendanceDetailDto.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.CourseSchedule;
+import com.ym.mec.biz.dal.entity.School;
 import com.ym.mec.biz.dal.enums.*;
 
 import java.util.Date;
@@ -31,6 +32,8 @@ public class TeacherAttendanceDetailDto {
     private Date signOutTime;
 
     private Integer attendClassTime;
+    
+    private School school;
 
     public Integer getAttendClassTime() {
         return attendClassTime;
@@ -135,4 +138,12 @@ public class TeacherAttendanceDetailDto {
     public void setSignOutTime(Date signOutTime) {
         this.signOutTime = signOutTime;
     }
+
+	public School getSchool() {
+		return school;
+	}
+
+	public void setSchool(School school) {
+		this.school = school;
+	}
 }

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

@@ -40,6 +40,9 @@ public class StudentRegistration {
     @ApiModelProperty(value = "当前所在年级", required = false)
     private String currentGrade;
 
+    @ApiModelProperty(value = "年级年份", required = false)
+    private Date currentGradeDate;
+
     @ApiModelProperty(value = "当前所在班级", required = false)
     private String currentClass;
 
@@ -401,4 +404,12 @@ public class StudentRegistration {
     public void setSurplusCourseFee(BigDecimal surplusCourseFee) {
         this.surplusCourseFee = surplusCourseFee;
     }
+
+    public Date getCurrentGradeDate() {
+        return currentGradeDate;
+    }
+
+    public void setCurrentGradeDate(Date currentGradeDate) {
+        this.currentGradeDate = currentGradeDate;
+    }
 }

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

@@ -307,6 +307,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         sysUser.setUpdateTime(date);
         teacherDao.updateUser(sysUser);
 
+        studentRegistration.setCurrentGradeDate(date);
         studentRegistration.setActualSubjectId(studentRegistration.getSubjectId());
         studentRegistration.setCreateTime(date);
         studentRegistration.setUpdateTime(date);
@@ -442,15 +443,15 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         //增加缴费学生数
         boolean updateFlag = false;
         for (int i = 0; i < 10; i++) {
-            if (amount.compareTo(BigDecimal.ZERO) == 0) { //0元订单不增加报名人数
-                updateFlag = true;
-                break;
-            }
+//            if (amount.compareTo(BigDecimal.ZERO) == 0) { //0元订单不增加报名人数
+//                updateFlag = true;
+//                break;
+//            }
             MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(studentRegistration.getMusicGroupId(), studentRegistration.getActualSubjectId());
             int paidNum = musicOneSubjectClassPlan.getPaidStudentNum() == null ? 0 : musicOneSubjectClassPlan.getPaidStudentNum();
             musicOneSubjectClassPlan.setPaidStudentNum(paidNum + 1);
             if (studentRegistration.getTemporaryCourseFee() == null && musicOneSubjectClassPlan.getPaidStudentNum() > musicOneSubjectClassPlan.getExpectedStudentNum()) {
-                throw new BizException("乐团人数已满");
+                throw new BizException("乐团该声部人数暂时已满，请稍后再试");
             }
             int count = musicGroupSubjectPlanService.update(musicOneSubjectClassPlan);
             if (count >= 1) {
@@ -926,7 +927,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailService.getOrderDetail(studentPaymentOrder.getId());
 
             List<StudentPaymentOrderDetail> allDetails = studentPaymentOrderDetailDao.getOrderDetailByOrderId(studentPaymentOrder.getId());
-            BigDecimal courseFee = allDetails.stream().filter(o -> !o.getType().getCode().equals("MUSICAL")).filter(o -> !o.getType().getCode().equals("ACCESSORIES")).map(o -> o.getPrice().subtract(o.getRemitFee()==null?BigDecimal.ZERO:o.getRemitFee()))
+            BigDecimal courseFee = allDetails.stream().filter(o -> !o.getType().getCode().equals("MUSICAL")).filter(o -> !o.getType().getCode().equals("ACCESSORIES")).map(o -> o.getPrice().subtract(o.getRemitFee() == null ? BigDecimal.ZERO : o.getRemitFee()))
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
 
             //累加充值金额
@@ -1032,12 +1033,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
         //减去缴费人数
         if (studentPaymentOrder.getStatus().equals(DealStatusEnum.FAILED)) {
-            if (studentPaymentOrder.getActualAmount().compareTo(BigDecimal.ZERO) > 0) {
-                musicOneSubjectClassPlan.setPaidStudentNum(musicOneSubjectClassPlan.getPaidStudentNum() - 1);
-                updateCount = musicGroupSubjectPlanService.update(musicOneSubjectClassPlan);
-                if (updateCount <= 0) {
-                    throw new BizException("减去缴费人数失败");
-                }
+            musicOneSubjectClassPlan.setPaidStudentNum(musicOneSubjectClassPlan.getPaidStudentNum() - 1);
+            updateCount = musicGroupSubjectPlanService.update(musicOneSubjectClassPlan);
+            if (updateCount <= 0) {
+                throw new BizException("减去缴费人数失败");
             }
             if (studentPaymentOrder.getBalancePaymentAmount() != null && studentPaymentOrder.getBalancePaymentAmount().compareTo(BigDecimal.ZERO) > 0) {
                 sysUserCashAccountService.updateBalance(studentPaymentOrder.getUserId(), studentPaymentOrder.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "报名缴费失败");

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

@@ -631,6 +631,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		result.setType(courseSchedule.getType());
 		result.setTeacherName(teacherDao.queryNameById(courseSchedule.getActualTeacherId()));
 		result.setAttendClassTime(teacherAttendanceDao.getAttendClassTime(courseScheduleId));
+		result.setSchool(schoolDao.get(courseSchedule.getSchoolId()));
 		if(teacherAttendance != null){
 			result.setIsSignIn(Objects.isNull(teacherAttendance.getSignInStatus())?3:teacherAttendance.getSignInStatus().getCode());
 			result.setIsSignOut(Objects.isNull(teacherAttendance.getSignOutStatus())?3:teacherAttendance.getSignOutStatus().getCode());

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

@@ -453,6 +453,7 @@
         <result property="phone" column="parents_phone_"/>
         <result property="gender" column="gender_"/>
         <result property="currentGrade" column="current_grade_"/>
+        <result property="currentGradeDate" column="current_grade_date_"/>
         <result property="currentClass" column="current_class_"/>
         <result property="subjectName" column="subject_name_"/>
         <result property="studentStatus" column="student_status_"/>
@@ -466,7 +467,7 @@
         <result property="paymentPeriodList" column="payment_period_list_"/>
     </resultMap>
     <select id="queryMusicGroupStudent" resultMap="MusicGroupStudentsDto">
-        SELECT sr.user_id_,su.username_ real_name_,su.gender_,su.phone_ parents_phone_,sr.current_grade_,
+        SELECT sr.user_id_,su.username_ real_name_,su.gender_,su.phone_ parents_phone_,sr.current_grade_,sr.current_grade_date_,
         sr.current_class_,sr.music_group_status_ student_status_,CASE WHEN sr.payment_status_ = 2 THEN 1 ELSE 0 END payment_status_,
         s.name_ subject_name_,sr.music_group_id_,case when su.password_ is null then 0 else 1 end isActive_,
         IF(DATE_FORMAT(sr.create_time_,'%Y-%m-%d') > DATE_FORMAT(mg.payment_expire_date_,'%Y-%m-%d'),1,0) is_new_student_

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

@@ -13,6 +13,8 @@
         <result column="id_card_no_" property="idCardNo"/>
         <result column="music_group_id_" property="musicGroupId"/>
         <result column="current_grade_" property="currentGrade"/>
+        <result column="current_grade_date_" property="currentGradeDate"/>
+        <result column="current_grade_" property="currentGrade"/>
         <result column="current_class_" property="currentClass"/>
         <result column="subject_id_" property="subjectId"/>
         <result column="actual_subject_id_" property="actualSubjectId"/>
@@ -67,6 +69,7 @@
         <result column="name_" property="name"/>
         <result column="parents_name_" property="parentsName"/>
         <result column="current_grade_" property="grade"/>
+        <result column="current_grade_date_" property="gradeDate"/>
         <result column="current_class_" property="clazz"/>
         <result column="actual_subject_id_" property="subject.id"/>
         <result column="subject_name_" property="subject.name"/>
@@ -109,6 +112,7 @@
             <if test="name!=null">name_,</if>
             <if test="musicGroupId!=null">music_group_id_,</if>
             <if test="currentGrade!=null">current_grade_,</if>
+            <if test="currentGradeDate!=null">current_grade_date_,</if>
             <if test="currentClass!=null">current_class_,</if>
             <if test="subjectId!=null">subject_id_,</if>
             <if test="actualSubjectId!=null">actual_subject_id_,</if>
@@ -133,6 +137,7 @@
             <if test="name!=null">#{name},</if>
             <if test="musicGroupId!=null">#{musicGroupId},</if>
             <if test="currentGrade!=null">#{currentGrade},</if>
+            <if test="currentGradeDate!=null">#{currentGradeDate},</if>
             <if test="currentClass!=null">#{currentClass},</if>
             <if test="subjectId!=null">#{subjectId},</if>
             <if test="actualSubjectId!=null">#{actualSubjectId},</if>
@@ -171,6 +176,9 @@
             <if test="currentGrade != null">
                 current_grade_ = #{currentGrade},
             </if>
+            <if test="currentGradeDate != null">
+                current_grade_date_ = #{currentGradeDate},
+            </if>
             <if test="currentClass != null">
                 current_class_ = #{currentClass},
             </if>
@@ -275,6 +283,7 @@
 
     <resultMap type="com.ym.mec.biz.dal.dto.StudentApplyDetailDto" id="studentApplyDetail">
         <result column="current_grade_" property="currentGrade"/>
+        <result column="current_grade_date_" property="currentGradeDate"/>
         <result column="current_class_" property="currentClass"/>
         <result column="is_allow_adjust_" property="isAllowAdjust" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="parents_name_" property="parentsName"/>
@@ -290,7 +299,7 @@
         <result column="remark_" property="remark"/>
     </resultMap>
     <select id="queryStudentDetailPage" resultMap="studentApplyDetail">
-        SELECT sr.id_, sr.user_id_,su.username_ username_,sr.parents_name_,sr.current_class_,sr.current_grade_,
+        SELECT sr.id_, sr.user_id_,su.username_ username_,sr.parents_name_,sr.current_class_,sr.current_grade_,sr.current_grade_date_,
         su.gender_,sr.is_allow_adjust_, s.name_ subject_name_,ss.name_
         actual_subject_name_,su.phone_ parents_phone_,sr.payment_status_,sr.remark_,sr.actual_subject_id_
         FROM student_registration sr