统计数据

mec-education/src/main/java/com/ym/mec/education/enums/ClassGroupStudentStatusEnum.java

@@ -0,0 +1,36 @@
+package com.ym.mec.education.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+/**
+ * 班级类型(普通班级、合奏班级)
+ */
+public enum ClassGroupStudentStatusEnum implements BaseEnum<String, ClassGroupStudentStatusEnum> {
+	NORMAL("NORMAL", "在读"), LEAVE("LEAVE", "请假"), QUIT("QUIT", "退学");
+
+	private String code;
+
+	private String msg;
+
+	ClassGroupStudentStatusEnum(String code, String msg) {
+		this.code = code;
+		this.msg = msg;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	@Override
+	public String getCode() {
+		return this.code;
+	}
+}

mec-education/src/main/java/com/ym/mec/education/mapper/ClassGroupStudentMapperMapper.java

@@ -1,6 +1,6 @@
 package com.ym.mec.education.mapper;
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ym.mec.education.entity.ClassGroupStudentMapper;
 
 /**

mec-education/src/main/java/com/ym/mec/education/resp/MusicGroupResp.java

@@ -93,16 +93,35 @@ public class MusicGroupResp implements Serializable {
      */
     private Date parentMeetingTime;
 
-    private Integer studentNum;
+    /**
+     * 学生数
+     */
+    private Integer studentNum = 0 ;
 
-    private Integer teacherNum;
+    /**
+     * 老师数量
+     */
+    private Integer teacherNum = 0;
 
-    private BigDecimal payments;
 
-    private BigDecimal income;
+    /**
+     * 合排
+     */
+    private Integer mergeClassNum = 0;
 
-    private Integer mergeClassNum;
+    /**
+     * 单技能
+     */
+    private Integer unitClassNum = 0;
+
+    /**
+     * 在读
+     */
+    private Integer liveStudNum = 0;
 
-    private Integer vipClassNum;
+    /**
+     * 退学
+     */
+    private Integer delStudNum = 0;
 
 }

mec-education/src/main/java/com/ym/mec/education/service/IClassGroupStudentMapperService.java

@@ -1,6 +1,6 @@
 package com.ym.mec.education.service;
 
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ym.mec.education.entity.ClassGroupStudentMapper;
 
 /**

mec-education/src/main/java/com/ym/mec/education/service/impl/ClassGroupStudentMapperServiceImpl.java

@@ -1,6 +1,6 @@
 package com.ym.mec.education.service.impl;
 
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ym.mec.education.entity.ClassGroupStudentMapper;
 import com.ym.mec.education.mapper.ClassGroupStudentMapperMapper;
 import com.ym.mec.education.service.IClassGroupStudentMapperService;

mec-education/src/main/java/com/ym/mec/education/service/impl/MusicGroupServiceImpl.java

@@ -8,6 +8,7 @@ import com.google.common.collect.Lists;
 import com.ym.mec.education.base.BaseResponse;
 import com.ym.mec.education.base.PageResponse;
 import com.ym.mec.education.entity.*;
+import com.ym.mec.education.enums.ClassGroupStudentStatusEnum;
 import com.ym.mec.education.enums.ClassGroupTypeEnum;
 import com.ym.mec.education.enums.ReturnCodeEnum;
 import com.ym.mec.education.enums.TeachTypeEnum;
@@ -25,6 +26,7 @@ import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -52,6 +54,11 @@ public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGr
 
     @Autowired
     private ISysUserService sysUserService;
+
+    @Autowired
+    private IClassGroupStudentMapperService classGroupStudentMapperService;
+
+
     @Override
     public PageResponse groupList(MusicGroupReq req) {
         PageResponse response = new PageResponse();
@@ -132,7 +139,28 @@ public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGr
             int studNum = classGroups.stream().mapToInt(ClassGroup::getStudentNum).sum();
             musicGroupResp.setStudentNum(studNum);
 
-            int mergeNum = classGroups.stream().filter(e -> ClassGroupTypeEnum.MIX.getCode().equalsIgnoreCase(e.getType()).count();
+            Long mergeNum = classGroups.stream().filter(e -> ClassGroupTypeEnum.MIX.getCode().equalsIgnoreCase(e.getType())).count();
+
+            Long unitClassNum = classGroups.stream().filter(e -> ClassGroupTypeEnum.NORMAL.getCode().equalsIgnoreCase(e.getType())).count();
+            musicGroupResp.setMergeClassNum(Optional.ofNullable(mergeNum).orElse(0L).intValue());
+            musicGroupResp.setUnitClassNum(Optional.ofNullable(unitClassNum).orElse(0L).intValue());
+
+
+            List<Integer> classId = classGroups.stream().map(e ->e.getId()).collect(Collectors.toList());
+            QueryWrapper<ClassGroupStudentMapper> queryWrapper2 = new QueryWrapper<>();
+            queryWrapper2.in("class_group_id_", classId);
+
+            List<ClassGroupStudentMapper> classGroupStudentMappers = classGroupStudentMapperService.list(queryWrapper2);
+
+            if(!CollectionUtils.isEmpty(classGroupStudentMappers)){
+
+                Long liveNum = classGroups.stream().filter(e -> ClassGroupStudentStatusEnum.NORMAL.getCode().equalsIgnoreCase(e.getType())).count();
+
+                Long delNum = classGroups.stream().filter(e -> ClassGroupStudentStatusEnum.QUIT.getCode().equalsIgnoreCase(e.getType())).count();
+                musicGroupResp.setLiveStudNum(Optional.ofNullable(liveNum).orElse(0L).intValue());
+                musicGroupResp.setDelStudNum(Optional.ofNullable(delNum).orElse(0L).intValue());
+
+            }
         }
         //老师
         SysUser  sysUser1 = sysUserService.getById(musicGroup.getTeamTeacherId());