Merge branch 'saas_zouxuan_04_24_course' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -133,9 +133,11 @@
 		SELECT COUNT(*) FROM course_schedule_statistics
 	</select>
     <select id="queryUpdateCourseScheduleStatistics" resultMap="CourseScheduleStatistics">
-		SELECT cssw.course_schedule_id_,cs.music_group_id_,COUNT(cssp.id_) course_student_total_num_,
-			   COUNT(CASE WHEN sa.status_ = 'NORMAL' THEN 1 ELSE NULL END) attendance_num_,
-			   COUNT(CASE WHEN sa.status_ = 'LATE' THEN 1 ELSE NULL END) late_num_,COUNT(CASE WHEN sa.qualified_flag_ = 1 THEN 1 ELSE NULL END) standard_num_,
+		SELECT cssw.course_schedule_id_,cs.music_group_id_,
+			   COUNT(DISTINCT cssp.id_) course_student_total_num_,
+			   COUNT(DISTINCT CASE WHEN sa.status_ = 'NORMAL' THEN sa.id_ ELSE NULL END) attendance_num_,
+			   COUNT(DISTINCT CASE WHEN sa.status_ = 'LATE' THEN sa.id_ ELSE NULL END) late_num_,
+			   COUNT(DISTINCT CASE WHEN sa.qualified_flag_ = 1 THEN sa.id_ ELSE NULL END) standard_num_,
 			   CASE WHEN sch.id_ IS NOT NULL THEN 1 ELSE 0 END homework_flag_,COUNT(CASE WHEN sch.status_ = 1 THEN 1 ELSE NULL END) homework_commit_num_,
 			   CASE WHEN sees.course_ids_ IS NOT NULL THEN 1 ELSE 0 END service_flag_,cs.class_date_
 		FROM course_schedule_statistics_wait cssw

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

@@ -15,6 +15,8 @@ import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.service.IdGeneratorService;
+import com.ym.mec.util.date.DateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -27,8 +29,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.IOException;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -46,6 +50,8 @@ public class StudentStatisticsController extends BaseController {
     private SysUserFeignService sysUserFeignService;
     @Autowired
     private ExportService exportService;
+    @Autowired
+    private IdGeneratorService idGeneratorService;
 
     @ApiOperation(value = "分页查询收费类型列表")
     @PostMapping("/queryPage")
@@ -102,6 +108,19 @@ public class StudentStatisticsController extends BaseController {
             throw new BizException("没有可导出的记录");
         }
         ManagerDownload managerDownload = exportService.saveManagerDownload(ExportTypeEnum.STUDENT_SMALL_CLASS_STATISTICS,sysUser.getId());
+        String name = "网管课学员统计";
+        if(Objects.equals(queryInfo.getGroupType(),"VIP")){
+            name = "VIP课学员统计";
+        }else if(Objects.equals(queryInfo.getGroupType(),"THEORY")){
+            name = "乐理课学员统计";
+        }
+        String fileName = new StringBuffer(name)
+                .append("-")
+                .append(idGeneratorService.generatorId("download"))
+                .append("-")
+                .append(DateUtil.getDate(new Date()))
+                .append(".xls").toString();
+        managerDownload.setName(fileName);
         ExecutorService executor = Executors.newCachedThreadPool();
         CompletableFuture.runAsync(()->{
             try {