1、课外训练

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentCourseHomework.java

@@ -45,14 +45,14 @@ public class StudentCourseHomework {
 	/**  */
 	private java.util.Date updateTime;
 
-	private boolean isExtra;
+	private boolean extra;
 
 	public boolean isExtra() {
-		return isExtra;
+		return extra;
 	}
 
-	public void setIsExtra(boolean isExtra) {
-		isExtra = isExtra;
+	public void setExtra(boolean extra) {
+		this.extra = extra;
 	}
 
 	public String getAvatar() {

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentCourseHomeworkReply.java

@@ -30,14 +30,14 @@ public class StudentCourseHomeworkReply {
 	@ApiModelProperty(value = "父级编号",required = true)
 	private Long parentId;
 
-	private boolean isExtra;
+	private boolean extra;
 
 	public boolean isExtra() {
-		return isExtra;
+		return extra;
 	}
 
-	public void setIsExtra(boolean isExtra) {
-		isExtra = isExtra;
+	public void setExtra(boolean extra) {
+		this.extra = extra;
 	}
 
 	public void setId(Long id){

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

@@ -1,8 +1,8 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.dto.CourseHomeworkStudentDetailDto;
-import com.ym.mec.biz.dal.dto.ExtraExerciseStudentsDto;
 import com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply;
+import com.ym.mec.biz.dal.entity.StudentCourseHomework;
 import com.ym.mec.biz.dal.page.ExtraExercilseQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
@@ -18,7 +18,7 @@ public interface ExtracurricularExercisesReplyService extends BaseService<Long,
      * @param extraExerciseId: 课外训练编号
      * @return java.util.List<com.ym.mec.biz.dal.dto.ExtraExerciseStudentsDto>
      */
-    List<ExtraExerciseStudentsDto> findExtraExerciseStudents(Long extraExerciseId,String studentName);
+    List<StudentCourseHomework> findExtraExerciseStudents(Long extraExerciseId, String studentName);
 
     /**
      * @describe 获取学生的课外训练列表

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

@@ -2,9 +2,11 @@ package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.entity.ExtracurricularExercises;
 import com.ym.mec.biz.dal.page.ExtraExercilseQueryInfo;
-import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
+import java.util.List;
+import java.util.Map;
+
 public interface ExtracurricularExercisesService extends BaseService<Long, ExtracurricularExercises> {
 
     /**
@@ -23,6 +25,6 @@ public interface ExtracurricularExercisesService extends BaseService<Long, Extra
      * @param queryInfo:
      * @return com.ym.mec.common.page.PageInfo
      */
-    PageInfo findExtraExercilses(ExtraExercilseQueryInfo queryInfo);
+    List<Map<String, Object>> findExtraExercilses(ExtraExercilseQueryInfo queryInfo);
 
 }

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

@@ -6,6 +6,7 @@ import com.ym.mec.biz.dal.dto.CourseHomeworkStudentDetailDto;
 import com.ym.mec.biz.dal.dto.ExtraExerciseStudentsDto;
 import com.ym.mec.biz.dal.entity.ExtracurricularExercises;
 import com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply;
+import com.ym.mec.biz.dal.entity.StudentCourseHomework;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.ExtraExercilseQueryInfo;
 import com.ym.mec.biz.service.ExtracurricularExercisesReplyService;
@@ -35,11 +36,23 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 	}
 
 	@Override
-	public List<ExtraExerciseStudentsDto> findExtraExerciseStudents(Long extraExerciseId,String studentName) {
+	public List<StudentCourseHomework> findExtraExerciseStudents(Long extraExerciseId, String studentName) {
 		if(Objects.isNull(extraExerciseId)){
 			throw new BizException("请选择课外训练");
 		}
-		return extracurricularExercisesReplyDao.findExtraExerciseStudents(extraExerciseId,studentName);
+		List<ExtraExerciseStudentsDto> extraExerciseStudents = extracurricularExercisesReplyDao.findExtraExerciseStudents(extraExerciseId, studentName);
+		List<StudentCourseHomework> studentCourseHomeworks=new ArrayList<>();
+		for (ExtraExerciseStudentsDto extraExerciseStudent : extraExerciseStudents) {
+			StudentCourseHomework studentCourseHomework=new StudentCourseHomework();
+			studentCourseHomework.setId(extraExerciseStudent.getId());
+			studentCourseHomework.setUserId(extraExerciseStudent.getUserId());
+			studentCourseHomework.setUserName(extraExerciseStudent.getStudentName());
+			studentCourseHomework.setStatus(extraExerciseStudent.getStatus()==0?YesOrNoEnum.NO:YesOrNoEnum.YES);
+			studentCourseHomework.setIsReplied(extraExerciseStudent.getIsReplied()==0?YesOrNoEnum.NO:YesOrNoEnum.YES);
+			studentCourseHomework.setIsView(extraExerciseStudent.getIsView()==0?YesOrNoEnum.NO:YesOrNoEnum.YES);
+			studentCourseHomeworks.add(studentCourseHomework);
+		}
+		return studentCourseHomeworks;
 	}
 
 	@Override
@@ -82,7 +95,7 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void submitExtraExercise(ExtracurricularExercisesReply extracurricularExercisesReply) {
-		if(Objects.nonNull(extracurricularExercisesReply.getId())){
+		if(Objects.isNull(extracurricularExercisesReply.getId())){
 			throw new BizException("请选择课外训练");
 		}
 		if(StringUtils.isBlank(extracurricularExercisesReply.getAttachments())){

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

@@ -11,6 +11,7 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
+import com.ym.mec.util.date.DateUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -68,22 +69,27 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 	}
 
 	@Override
-	public PageInfo findExtraExercilses(ExtraExercilseQueryInfo queryInfo) {
+	public List<Map<String, Object>> findExtraExercilses(ExtraExercilseQueryInfo queryInfo) {
 		PageInfo<ExtracurricularExercises> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<>();
 		MapUtil.populateMap(params, queryInfo);
 
-		List<ExtracurricularExercises> dataList = null;
-		int count = extracurricularExercisesDao.countExtraExercises(params);
-		if (count > 0) {
-			pageInfo.setTotal(count);
-			params.put("offset", pageInfo.getOffset());
-			dataList = extracurricularExercisesDao.findExtraExercises(params);
-		}
-		if (count == 0) {
-			dataList = new ArrayList<>();
+		List<ExtracurricularExercises> dataList = extracurricularExercisesDao.findExtraExercises(params);
+		Map<String, List<ExtracurricularExercises>> collect = dataList.stream().collect(Collectors.groupingBy(e -> DateUtil.dateToString(e.getCreateTime(), "yyyy-MM-dd")));
+
+		List<Map<String, Object>> result = new ArrayList<>();
+		List<Date> dates=new ArrayList<>();
+		collect.keySet().forEach(ds-> dates.add(DateUtil.stringToDate(ds,"yyyy-MM-dd")));
+		dates.sort(Comparator.comparing(Date::getTime));
+		dates.sort(Comparator.reverseOrder());
+		for (Date date : dates) {
+			String key=DateUtil.dateToString(date, "yyyy-MM-dd");
+			Map<String, Object> r = new HashMap<>();
+			r.put("day", key);
+			collect.get(key).sort(Comparator.comparing(ExtracurricularExercises::getCreateTime).reversed());
+			r.put("list", collect.get(key));
+			result.add(r);
 		}
-		pageInfo.setRows(dataList);
-		return pageInfo;
+		return result;
 	}
 }

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

@@ -106,7 +106,7 @@
 	<select id="findExtraExerciseStudents" resultMap="ExtraExerciseStudentsDto">
 		SELECT
 			eer.*,
-			su.student_name_
+			su.username_ student_name_
 		FROM
 			extracurricular_exercises_reply eer
 			LEFT JOIN sys_user su ON su.id_ = eer.user_id_
@@ -121,7 +121,7 @@
 			ee.title_,
 			ee.content_,
 			ee.teacher_id_,
-			su.student_name_
+			su.username_ student_name_
 		FROM
 			extracurricular_exercises_reply eer
 			LEFT JOIN extracurricular_exercises ee ON ee.id_=eer.extracurricular_exercises_id_

mec-teacher/src/main/java/com/ym/mec/teacher/controller/CourseHomeworkController.java

@@ -56,6 +56,16 @@ public class CourseHomeworkController extends BaseController {
         return succeed(studentCourseHomeworkService.findStudentCourseHomeworkByCourse(courseScheduleId,userName));
     }
 
+    @ApiOperation(value = "根据课程计划获取需要交作业的学生-公用")
+    @GetMapping("/findCourseStudentsPublic")
+    public Object findCourseStudentsPublic(Long courseScheduleId,String userName, boolean isExtra){
+        if(!isExtra){
+            return succeed(studentCourseHomeworkService.findStudentCourseHomeworkByCourse(courseScheduleId,userName));
+        }else{
+            return succeed(extracurricularExercisesReplyService.findExtraExerciseStudents(courseScheduleId,userName));
+        }
+    }
+
     @ApiOperation(value = "获取学生作业界面详细信息")
     @GetMapping(value = "/findCourseHomeworkStudentDetail")
     public Object findCourseHomeworkStudentDetail(Long courseScheduleID,Long userId){

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ExtracurricularExercisesController.java

@@ -64,14 +64,6 @@ public class ExtracurricularExercisesController extends BaseController {
         if(Objects.isNull(studentExerciseId)){
             return failed("请选择课外训练作业");
         }
-//        ExtraExerciseStudentsDto studentExtraExerciseDetail = extracurricularExercisesReplyService.findStudentExtraExerciseDetail(studentExerciseId);
-//        if(Objects.isNull(studentExtraExerciseDetail)){
-//            return failed("作业不存在");
-//        }
-//        if(Objects.nonNull(studentExtraExerciseDetail.getAttachments())){
-//            studentExtraExerciseDetail.setIsView(1);
-//            extracurricularExercisesReplyService.update(studentExtraExerciseDetail);
-//        }
         return succeed(extracurricularExercisesReplyService.findStudentExtraExerciseDetail(studentExerciseId));
     }
 }