管乐迷新需求一大堆

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentDao.java

@@ -212,6 +212,8 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
     List<Map<Integer, Integer>> getOrganCloudStudyLivelyStudentNum(@Param("organIds") List<Integer> organIds);
     
     List<IndexCloudStudyListDto> getCloudStudyStudentOverViewList(@Param("organIds") List<Integer> organIds);
+
+    List<IndexCloudStudyListDto> getCloudStudyStudentOverViewList1(@Param("organIds") List<Integer> organIds);
     
     List<Mapper> getOrganActiveCloudStudyStudentNum(@Param("organIds") List<Integer> organIds, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
     

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

@@ -0,0 +1,95 @@
+package com.ym.mec.biz.dal.dto;
+
+public class IndexCloudStudySumDto {
+
+	private Integer organId;
+	
+	private String organName;
+	
+	private int totalStudentNum;
+	
+	private int effectiveStudentNum;
+	
+	private int vipStudentNum;
+	
+	private double vipStudentRate;
+	
+	private int effectiveVipStudentNum;
+	
+	private int waitActivateVipStudentNum;
+	
+	private int activeStudentNum;
+
+	public Integer getOrganId() {
+		return organId;
+	}
+
+	public void setOrganId(Integer organId) {
+		this.organId = organId;
+	}
+
+	public String getOrganName() {
+		return organName;
+	}
+
+	public void setOrganName(String organName) {
+		this.organName = organName;
+	}
+
+	public int getTotalStudentNum() {
+		return totalStudentNum;
+	}
+
+	public void setTotalStudentNum(int totalStudentNum) {
+		this.totalStudentNum = totalStudentNum;
+	}
+
+	public int getEffectiveStudentNum() {
+		return effectiveStudentNum;
+	}
+
+	public void setEffectiveStudentNum(int effectiveStudentNum) {
+		this.effectiveStudentNum = effectiveStudentNum;
+	}
+
+	public int getVipStudentNum() {
+		return vipStudentNum;
+	}
+
+	public void setVipStudentNum(int vipStudentNum) {
+		this.vipStudentNum = vipStudentNum;
+	}
+
+	public double getVipStudentRate() {
+		return vipStudentRate;
+	}
+
+	public void setVipStudentRate(double vipStudentRate) {
+		this.vipStudentRate = vipStudentRate;
+	}
+
+	public int getEffectiveVipStudentNum() {
+		return effectiveVipStudentNum;
+	}
+
+	public void setEffectiveVipStudentNum(int effectiveVipStudentNum) {
+		this.effectiveVipStudentNum = effectiveVipStudentNum;
+	}
+
+	public int getWaitActivateVipStudentNum() {
+		return waitActivateVipStudentNum;
+	}
+
+	public void setWaitActivateVipStudentNum(int waitActivateVipStudentNum) {
+		this.waitActivateVipStudentNum = waitActivateVipStudentNum;
+	}
+
+	public int getActiveStudentNum() {
+		return activeStudentNum;
+	}
+
+	public void setActiveStudentNum(int activeStudentNum) {
+		this.activeStudentNum = activeStudentNum;
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/service/StudentService.java

@@ -194,4 +194,6 @@ public interface StudentService extends BaseService<Integer, Student> {
 
     //统计训练时长
     List<CloudTeacherSumDto> cloudTeacherSum(StudentCourseConsumerQueryInfo queryInfo);
+
+    List<IndexCloudStudyListDto> getCloudStudyStudentOverViewList1(String organIds);
 }

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

@@ -1334,6 +1334,12 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         return cloudTeacherSumDtos;
     }
 
+    @Override
+    public List<IndexCloudStudyListDto> getCloudStudyStudentOverViewList1(String organIds) {
+//        List<IndexCloudStudyListDto> list = studentDao.getCloudStudyStudentOverViewList(organIds);
+        return null;
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public  <T extends BaseStudentDto> void insertStudent(T baseStudent){
         Student student = new Student();

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

@@ -18,6 +18,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 @Api(tags = "学生管理")
@@ -368,7 +369,7 @@ public class StudentManageController extends BaseController {
 		});
         
         result.put("list", list);
-        
+
         CloudStudyStudentDataDto cloudStudyStudentDataDto = studentService.getCloudStudyStudentOverView(organIdsList);
 
         cloudStudyStudentDataDto.setCloudStudyLivelyStudentNum(list.stream().collect(Collectors.summingInt(IndexCloudStudyListDto :: getActiveStudentNum)));
@@ -379,10 +380,17 @@ public class StudentManageController extends BaseController {
         cloudStudyStudentDataDto.setVipStudentNum(list.stream().collect(Collectors.summingInt(IndexCloudStudyListDto :: getVipStudentNum)));
 
         result.put("overView", cloudStudyStudentDataDto);
-        
+
         return succeed(result);
     }
 
+    @ApiOperation(value = "云教练学员数据预览")
+    @GetMapping("/getCloudStudyStudentOverView1")
+    public HttpResponseResult<Object> getCloudStudyStudentOverView1(String organIds) throws Exception {
+        organIds = organizationService.getEmployeeOrgan(organIds);
+        List<IndexCloudStudyListDto> list = studentService.getCloudStudyStudentOverViewList1(organIds);
+    }
+
     @ApiOperation(value = "云教练学员数据预览列表")
     @GetMapping("/getCloudStudyStudentOverViewList")
     @PreAuthorize("@pcs.hasPermissions('studentManage/getCloudStudyStudentOverViewList')")