Merge branch 'apply_multi_order'

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

@@ -17,16 +17,16 @@ public class SubjectApplyDetailDto {
     private String subjectName;
 
     @ApiModelProperty(value = "预计招收人数",required = false)
-    private Integer expectedStudentNum;
+    private Integer expectedStudentNum = 0;
 
     @ApiModelProperty(value = "报名人数",required = false)
-    private Integer applyStudentNum;
+    private Integer applyStudentNum = 0;
 
     @ApiModelProperty(value = "缴费人数",required = false)
-    private Integer payNum;
+    private Integer payNum = 0;
 
     @ApiModelProperty(value = "未分班人数",required = false)
-    private Integer notPartClassNum;
+    private Integer notPartClassNum = 0;
 
     @ApiModelProperty(value = "缴费中人数",required = false)
     private Integer payingNum=0;

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

@@ -2,11 +2,8 @@ package com.ym.mec.biz.dal.page;
 
 import io.swagger.annotations.ApiModelProperty;
 
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.common.page.QueryInfo;
 
-import javax.xml.crypto.Data;
-
 public class StudentRegistrationQueryInfo extends QueryInfo {
 
     @ApiModelProperty(value = "乐团编号",required = false)
@@ -24,6 +21,9 @@ public class StudentRegistrationQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "学员缴费状态 0-未开启缴费 1-开启缴费 2-已缴费",required = false)
     private String paymentStatus;
 
+    @ApiModelProperty(value = "学员在读状态",required = false)
+    private String studentStatus;
+
     @ApiModelProperty(value = "用户名或手机号",required = false)
     private String name;
 
@@ -103,7 +103,15 @@ public class StudentRegistrationQueryInfo extends QueryInfo {
         this.paymentStatus = paymentStatus;
     }
 
-    public String getCreateYear() {
+    public String getStudentStatus() {
+		return studentStatus;
+	}
+
+	public void setStudentStatus(String studentStatus) {
+		this.studentStatus = studentStatus;
+	}
+
+	public String getCreateYear() {
         return createYear;
     }
 

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

@@ -16,19 +16,15 @@ import org.springframework.util.CollectionUtils;
 
 import com.ym.mec.biz.dal.dao.ChargeTypeOrganizationFeeDao;
 import com.ym.mec.biz.dal.dao.MusicGroupDao;
-import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
 import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
 import com.ym.mec.biz.dal.dao.SubjectDao;
 import com.ym.mec.biz.dal.dao.SubjectGoodsMapperDao;
 import com.ym.mec.biz.dal.dto.ConditionDto;
-import com.ym.mec.biz.dal.dto.MusicGroupRegAndMoneyDto;
 import com.ym.mec.biz.dal.dto.SubFeeSettingDto;
 import com.ym.mec.biz.dal.dto.SubjectApplyDetailDto;
 import com.ym.mec.biz.dal.entity.ChargeTypeOrganizationFee;
-import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.entity.SubjectGoodsMapper;
-import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.SubjectQueryInfo;
 import com.ym.mec.biz.service.SubjectService;
@@ -92,18 +88,18 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject> implem
         Map<Integer,SubjectApplyDetailDto> map = registers.stream().collect(Collectors.toMap(SubjectApplyDetailDto :: getSubjectId, t -> t));
         
         subApplyDetail.forEach(detail -> {
+        	SubjectApplyDetailDto dto = new SubjectApplyDetailDto();
         	if(map.containsKey(detail.getSubjectId())){
-        		SubjectApplyDetailDto dto = map.get(detail.getSubjectId());
-        		
-        		detail.setPayNum(dto.getPayNum());
-                detail.setApplyStudentNum(dto.getApplyStudentNum());
-                detail.setPayingNum(dto.getPayingNum());
-                detail.setCheckNum(dto.getCheckNum());
-                detail.setNormalNum(dto.getNormalNum());
-                detail.setBuyCloudTeacherNum(dto.getBuyCloudTeacherNum());
-                detail.setCloudTeacherStudentNumOfApply(dto.getCloudTeacherStudentNumOfApply());
-                detail.setNoCloudTeacherStudentNumOfNormal(dto.getNoCloudTeacherStudentNumOfNormal());
+        		dto = map.get(detail.getSubjectId());
         	}
+    		detail.setPayNum(dto.getPayNum());
+            detail.setApplyStudentNum(dto.getApplyStudentNum());
+            detail.setPayingNum(dto.getPayingNum());
+            detail.setCheckNum(dto.getCheckNum());
+            detail.setNormalNum(dto.getNormalNum());
+            detail.setBuyCloudTeacherNum(dto.getBuyCloudTeacherNum());
+            detail.setCloudTeacherStudentNumOfApply(dto.getCloudTeacherStudentNumOfApply());
+            detail.setNoCloudTeacherStudentNumOfNormal(dto.getNoCloudTeacherStudentNumOfNormal());
         });
         return subApplyDetail;
     }