Merge remote-tracking branch 'origin/master'

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

@@ -601,12 +601,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         PageInfo<TeacherMusicClassInfoDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
         Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);
-        List<TeacherMusicClassInfoDto> dataList = null;
         int count = classGroupDao.countGroupCourses(params);
-        if (count > 0) {
-            pageInfo.setTotal(count);
-            params.put("offset", pageInfo.getOffset());
-            dataList = classGroupDao.queryGroupCourses(params);
+        pageInfo.setTotal(count);
+        params.put("offset", pageInfo.getOffset());
+        List<TeacherMusicClassInfoDto> dataList = classGroupDao.queryGroupCourses(params);
+        if (!CollectionUtils.isEmpty(dataList)) {
             HashMap<String, Object> param = new HashMap<>();
             param.put("teacherId", queryInfo.getSearch());
             param.put("attendanceStatus", YesOrNoEnum.YES);
@@ -633,10 +632,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         MapUtil.populateMap(params, queryInfo);
         List<TeacherVipClassInfoDto> dataList = null;
         int count = vipGroupDao.countTeacherVipClass(queryInfo.getTeacherId());
-        if (count > 0) {
-            pageInfo.setTotal(count);
-            params.put("offset", pageInfo.getOffset());
-            dataList = vipGroupDao.getTeacherVipClass(params);
+        pageInfo.setTotal(count);
+        params.put("offset", pageInfo.getOffset());
+        dataList = vipGroupDao.getTeacherVipClass(params);
+        if (!CollectionUtils.isEmpty(dataList)) {
 //            Set<Integer> activityIds = dataList.stream().map(e -> e.getActivityId()).collect(Collectors.toSet());
 //            List<Map<Integer, String>> names = vipGroupActivityDao.queryNamesById(StringUtils.join(activityIds, ","));
 //            Map<Integer, String> nameMap = MapUtil.convertMybatisMap(names);

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

@@ -4719,10 +4719,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         if(queryInfo.getIsExport() && count > 50000){
             throw new BizException("数据集太大，不能导出.最大数据集不能超过50000");
         }
-        if (count > 0) {
-            pageInfo.setTotal(count);
-			params.put("offset", pageInfo.getOffset());
-            results = courseScheduleDao.endFindCourseSchedules(params);
+		pageInfo.setTotal(count);
+		params.put("offset", pageInfo.getOffset());
+		results = courseScheduleDao.endFindCourseSchedules(params);
+        if (!CollectionUtils.isEmpty(results)) {
             List<Long> courseScheduleIds = results.stream().map(CourseScheduleEndDto::getId).collect(Collectors.toList());
             List<Integer> teacherIds=results.stream().filter(t->Objects.nonNull(t.getActualTeacherId())).map(CourseSchedule::getActualTeacherId).collect(Collectors.toList());
 

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

@@ -509,6 +509,9 @@
 			<if test="monday!=null and monday!='' and sunday!=null and sunday!=''">
 				AND sees.monday_ BETWEEN #{monday} AND #{sunday}
 			</if>
+			<if test="unDone!=null and unDone==1">
+				AND tm.teacher_id_ IS NULL
+			</if>
 			<if test="teacherId!=null">
 				AND sees.teacher_id_ = #{teacherId}
 			</if>
@@ -541,6 +544,9 @@
 		FROM
 			student_extracurricular_exercises_situation_ sees
 			LEFT JOIN teacher tea ON tea.id_=sees.teacher_id_
+			<if test="unDone!=null and unDone==1">
+				LEFT JOIN teacher_remind tm ON sees.monday_=tm.monday_ AND sees.teacher_id_=tm.teacher_id_
+			</if>
 			LEFT JOIN organization organ ON organ.id_=tea.organ_id_
 			LEFT JOIN sys_user su ON tea.id_=su.id_
 		<include refid="queryTeacherServeInfoCondition" />
@@ -565,6 +571,9 @@
 			FROM
 				student_extracurricular_exercises_situation_ sees
 				LEFT JOIN teacher tea ON tea.id_=sees.teacher_id_
+				<if test="unDone!=null and unDone==1">
+					LEFT JOIN teacher_remind tm ON sees.monday_=tm.monday_ AND sees.teacher_id_=tm.teacher_id_
+				</if>
 			<include refid="queryTeacherServeInfoCondition" />
 			GROUP BY sees.monday_,sees.sunday_,sees.teacher_id_
 			<if test="unDone!=null">

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

@@ -2568,7 +2568,7 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "首页异常统计导出")
     @RequestMapping("export/exportIndexErrData")
     @PreAuthorize("@pcs.hasPermissions('export/exportIndexErrData')")
-    public void exportIndexErrData(String organId, HttpServletResponse response) throws IOException {
+    public void exportIndexErrData(String organId, IndexErrorType errorType, HttpServletResponse response) throws IOException {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
@@ -2584,7 +2584,7 @@ public class ExportController extends BaseController {
                 throw new BizException("非法请求");
             }
         }
-        List<IndexErrorDataExportDto> result = indexService.exportIndexErrData(organId, null);
+        List<IndexErrorDataExportDto> result = indexService.exportIndexErrData(organId, errorType);
         if (CollectionUtils.isEmpty(result)) {
             response.setStatus(200);
             response.setContentType("Content-Type: application/json;charset=UTF-8");