Merge branch 'apply_multi_order'

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

@@ -20,6 +20,9 @@ public class MusicGroupRegAndMoneyDto {
 
     @ApiModelProperty(value = "乐团状态", required = false)
     private String musicGroupStatus;
+    
+    @ApiModelProperty(value = "课程展现形式",required = false)
+	private Integer courseViewType;
 
     @ApiModelProperty(value = "预报名人数", required = false)
     private Integer preRegNum = 0;
@@ -173,4 +176,12 @@ public class MusicGroupRegAndMoneyDto {
 	public void setCloudTeacherStudentNumOfApply(Integer cloudTeacherStudentNumOfApply) {
 		this.cloudTeacherStudentNumOfApply = cloudTeacherStudentNumOfApply;
 	}
+
+	public Integer getCourseViewType() {
+		return courseViewType;
+	}
+
+	public void Integer(Integer courseViewType) {
+		this.courseViewType = courseViewType;
+	}
 }

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

@@ -821,7 +821,7 @@
     </select>
 
     <select id="getMusicGroupByStatus" resultType="com.ym.mec.biz.dal.dto.MusicGroupRegAndMoneyDto">
-        SELECT mg.id_ musicGroupId,o.name_ organName,mg.name_ musicGroupName,mg.status_ musicGroupStatus FROM
+        SELECT mg.id_ musicGroupId,o.name_ organName,mg.name_ musicGroupName,mg.status_ musicGroupStatus,mg.course_view_type_ courseViewType FROM
         music_group mg
         LEFT JOIN organization o ON mg.organ_id_ = o.id_
         WHERE status_ IN ('PRE_APPLY','PRE_BUILD_FEE','FEE_AUDIT','APPLY','PAY')

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

@@ -1514,7 +1514,7 @@
     <select id="getRegisters" resultType="com.ym.mec.biz.dal.dto.MusicGroupRegAndMoneyDto">
         SELECT music_group_id_ musicGroupId, COUNT(*) regNum,SUM(IF(payment_status_ = '2',1,0)) payNum,
         SUM(IF(paying_status_='2',1,0)) checkNum,SUM(IF((payment_status_= '2' and has_cloud_teacher_=1),1,0)) buyCloudTeacherNum,
-        SUM(IF((music_group_status_= 'NORMAL' and none_need_cloud_teacher_ = 0),1,0)) studentNumOfNormal,
+        SUM(IF((music_group_status_= 'NORMAL' and paying_status_ != 2),1,0)) studentNumOfNormal,
         SUM(IF((music_group_status_= 'NORMAL' and has_cloud_teacher_ = 0),1,0)) noCloudTeacherStudentNumOfNormal,
         SUM(IF((music_group_status_ != 'NORMAL' and none_need_cloud_teacher_ = 1),1,0)) cloudTeacherStudentNumOfApply
         FROM student_registration

mec-web/src/main/java/com/ym/mec/web/controller/education/EduRegisterController.java

@@ -1,33 +1,35 @@
 package com.ym.mec.web.controller.education;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.entity.SysUserRole;
-import com.ym.mec.biz.dal.dao.*;
+import com.ym.mec.biz.dal.dao.CooperationOrganDao;
+import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.dao.MusicGroupDao;
+import com.ym.mec.biz.dal.dao.StudentPreRegistrationDao;
+import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
 import com.ym.mec.biz.dal.dto.MusicGroupRegAndMoneyDto;
 import com.ym.mec.biz.dal.dto.MusicalListDetailDto;
 import com.ym.mec.biz.dal.entity.CooperationOrgan;
 import com.ym.mec.biz.dal.entity.Employee;
-import com.ym.mec.biz.dal.entity.MusicGroup;
-import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
-import com.ym.mec.biz.service.MusicGroupService;
-import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.biz.service.StudentPaymentOrderDetailService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
 
 @RequestMapping("eduRegister")
 @Api(tags = "乐团报名回款统计（教务端）")
@@ -110,6 +112,9 @@ public class EduRegisterController extends BaseController {
                 musicGroup.setPayNum(register.getPayNum());
                 musicGroup.setCheckNum(register.getCheckNum());
                 musicGroup.setBuyCloudTeacherNum(register.getBuyCloudTeacherNum());
+                musicGroup.setStudentNumOfNormal(register.getStudentNumOfNormal());
+                musicGroup.setNoCloudTeacherStudentNumOfNormal(register.getNoCloudTeacherStudentNumOfNormal());
+                musicGroup.setCloudTeacherStudentNumOfApply(register.getCloudTeacherStudentNumOfApply());
             }
         }
         return succeed(musicGroups);