是否云教练作业查询

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

@@ -43,6 +43,17 @@ public class ExtraExercilseReplyQueryInfo extends QueryInfo {
 	@ApiModelProperty(value = "是否存在vip课")
 	private Integer existVipCourse;
 
+	@ApiModelProperty(value = "是否云教练作业")
+	private Boolean cloudHomeworkFlag;
+
+	public Boolean getCloudHomeworkFlag() {
+		return cloudHomeworkFlag;
+	}
+
+	public void setCloudHomeworkFlag(Boolean cloudHomeworkFlag) {
+		this.cloudHomeworkFlag = cloudHomeworkFlag;
+	}
+
 	public Integer getExistVipCourse() {
 		return existVipCourse;
 	}

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

@@ -213,7 +213,7 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());
 			dataList = extracurricularExercisesReplyDao.findExtraExercises(params);
-			List<Long> replyIds = dataList.stream().map(ExtraExerciseStudentsDto::getId).collect(Collectors.toList());
+//			List<Long> replyIds = dataList.stream().map(ExtraExerciseStudentsDto::getId).collect(Collectors.toList());
 			List<Integer> teacherIds = dataList.stream().map(ExtraExerciseStudentsDto::getTeacherId).collect(Collectors.toList());
 			List<SimpleUserDto> teachers = teacherDao.findSimpleTeachers(teacherIds, queryInfo.getTenantId());
 			Map<Integer, String> idNameMap = teachers.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, SimpleUserDto::getUserName));

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

@@ -267,6 +267,12 @@
 	<sql id="queryExtraExercisesCondition">
 		<where>
 			eer.tenant_id_ = #{tenantId}
+			<if test="cloudHomeworkFlag != null and cloudHomeworkFlag == true">
+				AND eer.music_score_id_ IS NOT NULL AND eer.music_score_id_ != ''
+			</if>
+			<if test="cloudHomeworkFlag != null and cloudHomeworkFlag == false">
+				AND (eer.music_score_id_ IS NULL OR eer.music_score_id_ = '')
+			</if>
 			<if test="extracurricularExercisesId != null">
 				AND extracurricular_exercises_id_ = #{extracurricularExercisesId}
 			</if>

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

@@ -1529,13 +1529,14 @@ public class ExportController extends BaseController {
             row.setIsRepliedStr(Objects.isNull(row.getIsReplied()) || row.getIsReplied() == 0 ? "否" : "是");
             row.setIsRepliedTimelyStr(Objects.isNull(row.getIsRepliedTimely()) || row.getIsRepliedTimely() == 0 ? "否" : "是");
             row.setExistVipCourseStr(Objects.isNull(row.getExistVipCourse()) || row.getExistVipCourse() == 0 ? "否" : "是");
+            row.setMusicScoreId(StringUtils.isEmpty(row.getMusicScoreId()) ? "否" : "是");
         }
         OutputStream ouputStream = null;
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(
-                    new String[]{"布置时间", "截至时间", "训练标题", "老师名字", "分部", "学生姓名", "学生编号", "提交训练", "提交训练时间", "是否评价", "是否有vip", "及时评价"},
+                    new String[]{"布置时间", "截至时间", "训练标题", "老师名字", "分部", "学生姓名", "学生编号", "提交训练", "提交训练时间", "是否评价", "是否有vip", "及时评价", "是否云教练作业"},
                     new String[]{"createTime", "expireDate", "title", "teacherName", "organName",
-                            "user.username", "userId", "statusStr", "submitTime", "isRepliedStr", "existVipCourseStr", "isRepliedTimelyStr"}, rows);
+                            "user.username", "userId", "statusStr", "submitTime", "isRepliedStr", "existVipCourseStr", "isRepliedTimelyStr", "musicScoreId"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
             ouputStream = response.getOutputStream();

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

@@ -1,13 +1,10 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.page.ExtraExercilseReplyQueryInfo;
 import com.ym.mec.biz.service.ExtracurricularExercisesReplyService;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -24,8 +21,6 @@ public class ExtracurricularExercisesReplyController extends BaseController {
     @Autowired
     private ExtracurricularExercisesReplyService extracurricularExercisesReplyService;
     @Autowired
-    private SysUserFeignService sysUserFeignService;
-    @Autowired
     private OrganizationService organizationService;
 
     @ApiOperation(value = "获取课外训练作业列表")