Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupStudentsDto.java
#	mec-biz/src/main/resources/config/mybatis/StudentManageDao.xml

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.entity.SubjectChange;
 import com.ym.mec.biz.dal.enums.PaymentFlagEnum;
 import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
@@ -33,9 +34,18 @@ public class MusicGroupStudentsDto{
     @ApiModelProperty(value = "班级",required = false)
     private String currentClass;
 
-    @ApiModelProperty(value = "专业",required = false)
+    @ApiModelProperty(value = "实际专业id",required = false)
+    private Integer subjectId;
+
+    @ApiModelProperty(value = "实际专业",required = false)
     private String subjectName;
 
+    @ApiModelProperty(value = "报名专业id",required = false)
+    private Integer regSubjectId;
+
+    @ApiModelProperty(value = "报名专业",required = false)
+    private String regSubjectName;
+
     @ApiModelProperty(value = "下次缴费日期",required = false)
     private Date nextPaymentDate;
 
@@ -95,6 +105,13 @@ public class MusicGroupStudentsDto{
         this.studentRegistrationId = studentRegistrationId;
     }
 
+    @ApiModelProperty(value = "备注信息",required = false)
+    private String remark;
+
+
+    @ApiModelProperty(value = "声部更换详情",required = false)
+    private SubjectChange subjectChange;
+
     public String getCarePackageStr() {
         return carePackageStr;
     }
@@ -326,4 +343,44 @@ public class MusicGroupStudentsDto{
     public void setRegisterTime(Date registerTime) {
         this.registerTime = registerTime;
     }
+
+    public String getRegSubjectName() {
+        return regSubjectName;
+    }
+
+    public void setRegSubjectName(String regSubjectName) {
+        this.regSubjectName = regSubjectName;
+    }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public Integer getRegSubjectId() {
+        return regSubjectId;
+    }
+
+    public void setRegSubjectId(Integer regSubjectId) {
+        this.regSubjectId = regSubjectId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public SubjectChange getSubjectChange() {
+        return subjectChange;
+    }
+
+    public void setSubjectChange(SubjectChange subjectChange) {
+        this.subjectChange = subjectChange;
+    }
 }

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

@@ -10,9 +10,7 @@ import java.util.stream.Collectors;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
-import com.ym.mec.biz.dal.enums.CourseStatusEnum;
-import com.ym.mec.biz.dal.enums.SporadicChargeTypeEnum;
-import com.ym.mec.biz.dal.enums.StudentMusicGroupStatusEnum;
+import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.SysConfigService;
 
@@ -48,7 +46,6 @@ import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.entity.SubjectChange;
 import com.ym.mec.biz.dal.entity.SysUserCashAccount;
 import com.ym.mec.biz.dal.entity.Teacher;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.service.StudentManageService;
 import com.ym.mec.biz.service.StudentService;
 import com.ym.mec.common.entity.HttpResponseResult;
@@ -497,9 +494,14 @@ public class StudentManageServiceImpl implements StudentManageService {
             }
             List<Integer> collect = dataList.stream().map(e -> e.getUserId()).collect(Collectors.toList());
             List<Integer> hasCourseStudent = courseScheduleDao.findHasCourseStudent(collect,"VIP,PRACTICE");
+            List<SubjectChange> waitPayChange = subjectChangeDao.getMusicGroupWaitPay(queryInfo.getMusicGroupId());
+            Map<Integer, List<SubjectChange>> studentWaitPayChange = waitPayChange.stream().collect(Collectors.groupingBy(SubjectChange::getStudentId));
             dataList.forEach(e->{
                 e.setHasCourse(hasCourseStudent.contains(e.getUserId()));
                 e.setNoPaymentAmount(totalAmountMap.get(e.getUserId()));
+                if (studentWaitPayChange.containsKey(e.getUserId())) {
+                    e.setSubjectChange(studentWaitPayChange.get(e.getUserId()).get(0));
+                }
             });
         }
         pageInfo.setRows(dataList);

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

@@ -492,7 +492,10 @@
         <result property="currentGrade" column="current_grade_"/>
         <result property="currentGradeDate" column="current_grade_date_"/>
         <result property="currentClass" column="current_class_"/>
+        <result property="subjectId" column="subject_id_"/>
         <result property="subjectName" column="subject_name_"/>
+        <result property="regSubjectId" column="reg_subject_id_"/>
+        <result property="regSubjectName" column="regSubjectName"/>
         <result property="studentStatus" column="student_status_"/>
         <result property="paymentStatus" column="payment_status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="musicGroupId" column="music_group_id_"/>
@@ -505,16 +508,18 @@
         <result column="care_package_" property="carePackage"/>
         <result column="come_on_package_" property="comeOnPackage"/>
         <result column="registerTime" property="registerTime"/>
+        <result column="remark_" property="remark"/>
     </resultMap>
     <select id="queryMusicGroupStudent" resultMap="MusicGroupStudentsDto">
         SELECT sr.id_ student_registration_id_,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_,sr.payment_status_,
-        s.name_ subject_name_,sr.music_group_id_,CASE WHEN su.password_ IS NULL THEN 0 ELSE 1 END isActive_,
+        sr.current_class_,sr.music_group_status_ student_status_,sr.payment_status_,sr.subject_id_ reg_subject_id_,rs.name_ regSubjectName,sr.remark_,
+        sr.actual_subject_id_ subject_id_,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_,
         stu.care_package_,stu.come_on_package_,sr.create_time_ registerTime
         FROM student_registration sr
         LEFT JOIN sys_user su ON sr.user_id_ = su.id_
-        LEFT JOIN `subject` s ON s.id_ = sr.actual_subject_id_
+        LEFT JOIN subject s ON s.id_ = sr.actual_subject_id_
+        LEFT JOIN subject rs ON rs.id_ = sr.subject_id_
         LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
         LEFT JOIN student stu ON sr.user_id_ = stu.user_id_
         <if test="classGroupId != null">

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

@@ -1147,7 +1147,7 @@ public class ExportController extends BaseController {
         managerDownload.setUpdateTime(nowDate);
         managerDownloadDao.insert(managerDownload);
         exportService.orderList(params, managerDownload);
-        return succeed(fileName+"导出申请已提交,请到【报表中心-下载列表查看】");
+        return succeed(fileName+"导出申请已提交,请到【运营管理-报名中心-下载列表查看】");
     }
 
 
@@ -2087,7 +2087,7 @@ public class ExportController extends BaseController {
         managerDownload.setUpdateTime(nowDate);
         managerDownloadDao.insert(managerDownload);
         exportService.routeOrderList(params, managerDownload);
-        return succeed(fileName+"导出申请已提交,请到【报表中心-下载列表查看】");
+        return succeed(fileName+"导出申请已提交,请到【运营管理-报表中心-下载列表查看】");
     }
 
 

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

@@ -6,8 +6,10 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -351,4 +353,17 @@ public class StudentManageController extends BaseController {
         studentService.batchUpdateAdviser(teacherId,studentIds);
         return succeed();
     }
+
+    @ApiOperation(value = "检查乐团是否能补招")
+    @GetMapping("/checkCanReg")
+    @PreAuthorize("@pcs.hasPermissions('studentManage/checkCanReg')")
+    public HttpResponseResult<Boolean> checkCanReg(String musicGroupId) {
+        List<String> musicGroupIds = new ArrayList<>();
+        musicGroupIds.add(musicGroupId);
+        Map<String, Boolean> viewMap = studentRegistrationService.checkMusicGroupsRegOrPayStatus(new ArrayList<>(musicGroupIds));
+        if (viewMap.size() > 0) {
+            return succeed(true);
+        }
+        return succeed(false);
+    }
 }