Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_courseware_1014

mec-application/src/main/java/com/ym/mec/student/controller/LessonExaminationController.java

@@ -16,6 +16,8 @@ import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -65,7 +67,11 @@ public class LessonExaminationController extends BaseController {
     @PostMapping("queryDetailAll")
     public HttpResponseResult<List<StudentLessonExaminationDetailDto>> queryAll(@RequestBody StudentLessonExaminationQueryDto query) {
         query.setUserId(sysUserService.getUserId());
-        return succeed(studentLessonExaminationDetailService.queryAll(query));
+        List<StudentLessonExaminationDetailDto> dtos = studentLessonExaminationDetailService.queryAll(query);
+        if(CollectionUtils.isEmpty(dtos)){
+            return failed(HttpStatus.NO_CONTENT,"作业不存在");
+        }
+        return succeed(dtos);
     }
 
     @ApiOperation(value = "获取学员单个作业详情")

mec-application/src/main/java/com/ym/mec/student/controller/StudentCourseHomeworkController.java

@@ -118,7 +118,7 @@ public class StudentCourseHomeworkController extends BaseController {
     public HttpResponseResult<CourseHomeworkWrapper.CourseHomeworkList>
             findStudentHomeworkRecordDetail(CourseHomeworkWrapper.StudentCourseHomeworkQuery query){
         query.setUserId(sysUserService.getUserId().longValue());
-        return succeed(studentCourseHomeworkService.findStudentHomeworkRecordDetail(query));
+        return studentCourseHomeworkService.findStudentHomeworkRecordDetail(query);
     }
 
     @ApiOperation(value = "获取学生作业课件列表")

mec-application/src/main/java/com/ym/mec/student/controller/open/OpenLessonExaminationController.java

@@ -0,0 +1,98 @@
+package com.ym.mec.student.controller.open;
+
+
+import com.ym.mec.biz.dal.dto.CourseHomeworkWrapper;
+import com.ym.mec.biz.dal.dto.LessonExaminationResultDto;
+import com.ym.mec.biz.dal.dto.StudentLessonExaminationDto;
+import com.ym.mec.biz.dal.dto.StudentLessonTrainingDetailWrapper;
+import com.ym.mec.biz.dal.entity.StudentCourseHomework;
+import com.ym.mec.biz.dal.entity.Subject;
+import com.ym.mec.biz.dal.enums.ELessonTrainingType;
+import com.ym.mec.biz.dal.page.LessonExaminationQueryInfo;
+import com.ym.mec.biz.dal.page.StudentLessonExaminationQueryInfo;
+import com.ym.mec.biz.service.*;
+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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.util.CollectionUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@Api(tags = "进度评测表")
+@RestController
+@RequestMapping("${app-config.url.student:}/open/")
+public class OpenLessonExaminationController extends BaseController {
+
+    @Resource
+    private LessonExaminationService lessonExaminationService;
+    @Resource
+    private StudentLessonExaminationService studentLessonExaminationService;
+    @Resource
+    private CourseHomeworkService courseHomeworkService;
+    @Resource
+    private StudentCourseHomeworkService studentCourseHomeworkService;
+    @Resource
+    private SubjectService subjectService;
+
+    @ApiOperation(value = "获取学员列表")
+    @PostMapping("studentLessonExamination/queryPage")
+    public HttpResponseResult<PageInfo<StudentLessonExaminationDto>> queryPage(@RequestBody StudentLessonExaminationQueryInfo queryInfo) {
+        return succeed(studentLessonExaminationService.queryPage(queryInfo));
+    }
+
+    @ApiOperation(value = "获取单个作业")
+    @GetMapping("lessonExamination/getOne")
+    public HttpResponseResult<LessonExaminationResultDto> queryPage(Long lessonExaminationId) {
+        LessonExaminationQueryInfo queryInfo = new LessonExaminationQueryInfo();
+        queryInfo.setLessonExaminationId(lessonExaminationId);
+        LessonExaminationResultDto resultDto = lessonExaminationService.queryPage(queryInfo).getRows().get(0);
+        return succeed(resultDto);
+    }
+
+    @ApiOperation(value = "获取作业详情")
+    @GetMapping(value = "courseHomework/findCourseHomeworkDetail")
+    public HttpResponseResult<CourseHomeworkWrapper.CourseHomeworkList> findCourseHomeworkDetail(Integer courseScheduleId, ELessonTrainingType type){
+        if (ELessonTrainingType.HOMEWORK.equals(type)) {
+
+            return succeed(courseHomeworkService.findCourseHomeworkDetail(courseScheduleId));
+        } else {
+            return succeed(courseHomeworkService.findCourseExtraHomeworkDetail(courseScheduleId));
+        }
+    }
+
+    @ApiOperation(value = "根据课程计划获取需要交作业的学生声部-公用")
+    @PostMapping("findCourseStudentsSubjectPublic/v2")
+    public HttpResponseResult<List<Subject>> findCourseStudentsSubjectPublicV2(@Validated @RequestBody StudentLessonTrainingDetailWrapper.StudentLessonTrainingQuery query){
+        List<StudentCourseHomework> studentCourseHomeworkByCourseV2;
+        if(ELessonTrainingType.HOMEWORK.equals(query.getType())){
+            if (Objects.isNull(query.getCourseScheduleId())) {
+                throw new BizException("请指定课程");
+            }
+            studentCourseHomeworkByCourseV2 = studentCourseHomeworkService.findStudentCourseHomeworkByCourseV2(
+                    query);
+        }else{
+            studentCourseHomeworkByCourseV2 = studentCourseHomeworkService.findExtraExerciseStudentsV2(query);
+        }
+
+        if (CollectionUtils.isEmpty(studentCourseHomeworkByCourseV2)) {
+            return succeed(new ArrayList<>());
+        }
+        // 获取声部
+        List<Integer> collect = studentCourseHomeworkByCourseV2.stream().map(StudentCourseHomework::getSubjectId).collect(
+                Collectors.toList());
+
+        return succeed(subjectService.findBySubjectByIdList(collect));
+
+    }
+
+}
+

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

@@ -2118,7 +2118,7 @@ public class ExportController extends BaseController {
         }
 
         try {
-            String[] header = {"分部", "老师编号", "老师姓名", "服务周期", "课后训练(节)", "课后训练(人)", "课外训练(人)", "预计训练布置(人次)", "实际训练布置(人次)", "提交次数", "评价次数", "及时评价次数", "及时评价率", "作业点评率",
+            String[] header = {"分部", "老师编号", "老师姓名", "服务周期", "课后训练(节)", "课后训练(人)", "课外训练(人)", "预计训练布置(人次)", "实际训练布置(人次)", "提交次数", "评价次数", "及时评价次数", "及时评价率", "训练点评率",
                     "训练布置", "训练点评", "训练提交率",
                     "提醒时间", "操作人"};
             String[] body = {"organName", "teacherId", "teacherName", "dateRange", "homeworkNum", "homeworkStuNum", "exerciseNum", "expectExercisesNum", "actualExercisesNum", "exercisesReplyNum", "exercisesMessageNum", "exercisesMessageTimelyNum", "exercisesMessageTimelyRate", "exercisesMessageRate",

mec-application/src/main/java/com/ym/mec/web/controller/education/CourseHomeworkTemplateController.java

@@ -45,7 +45,7 @@ public class CourseHomeworkTemplateController extends BaseController {
     @PostMapping("/update")
     public Object update(CourseHomeworkTemplate courseHomeworkTemplate){
         if(Objects.isNull(courseHomeworkTemplate.getId())){
-            return failed("请指定作业模板");
+            return failed("请指定训练模板");
         }
         courseHomeworkTemplateService.update(courseHomeworkTemplate);
         return succeed();

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

@@ -3,13 +3,11 @@ package com.ym.mec.biz.dal.dto;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.Date;
 
-/**
- * @Author Joburgess
- * @Date 2019/9/19
- */
+@Data
 public class CourseHomeworkListDto {
 
     /**  */
@@ -71,156 +69,4 @@ public class CourseHomeworkListDto {
 
     @ApiModelProperty(value = "实际上课老师头像",required = false)
     private String headUrl;
-
-    public Integer getTeacherId() {
-        return teacherId;
-    }
-
-    public void setTeacherId(Integer teacherId) {
-        this.teacherId = teacherId;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getTeacherName() {
-        return teacherName;
-    }
-
-    public void setTeacherName(String teacherName) {
-        this.teacherName = teacherName;
-    }
-
-    public String getHeadUrl() {
-        return headUrl;
-    }
-
-    public void setHeadUrl(String headUrl) {
-        this.headUrl = headUrl;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getCourseScheduleId() {
-        return courseScheduleId;
-    }
-
-    public void setCourseScheduleId(Long courseScheduleId) {
-        this.courseScheduleId = courseScheduleId;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getExpiryDate() {
-        return expiryDate;
-    }
-
-    public void setExpiryDate(Date expiryDate) {
-        this.expiryDate = expiryDate;
-    }
-
-    public Date getStartClassTime() {
-        return startClassTime;
-    }
-
-    public void setStartClassTime(Date startClassTime) {
-        this.startClassTime = startClassTime;
-    }
-
-    public String getMusicGroupId() {
-        return musicGroupId;
-    }
-
-    public void setMusicGroupId(String musicGroupId) {
-        this.musicGroupId = musicGroupId;
-    }
-
-    public String getMusicGroupName() {
-        return musicGroupName;
-    }
-
-    public void setMusicGroupName(String musicGroupName) {
-        this.musicGroupName = musicGroupName;
-    }
-
-    public Integer getClassGroupId() {
-        return classGroupId;
-    }
-
-    public void setClassGroupId(Integer classGroupId) {
-        this.classGroupId = classGroupId;
-    }
-
-    public String getClassGroupName() {
-        return classGroupName;
-    }
-
-    public void setClassGroupName(String classGroupName) {
-        this.classGroupName = classGroupName;
-    }
-
-    public Integer getCompletedNum() {
-        return completedNum;
-    }
-
-    public void setCompletedNum(Integer completedNum) {
-        this.completedNum = completedNum;
-    }
-
-    public Integer getExpectNum() {
-        return expectNum;
-    }
-
-    public void setExpectNum(Integer expectNum) {
-        this.expectNum = expectNum;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public YesOrNoEnum getStatus() {
-        return status;
-    }
-
-    public void setStatus(YesOrNoEnum status) {
-        this.status = status;
-    }
-
-    public YesOrNoEnum getIsReplied() {
-        return isReplied;
-    }
-
-    public void setIsReplied(YesOrNoEnum isReplied) {
-        this.isReplied = isReplied;
-    }
 }

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

@@ -242,6 +242,7 @@ public class CourseHomeworkWrapper {
         @ApiModelProperty("达标人数")
         private Integer passNum;
 
+        private String memo;
 
         @ApiModelProperty("练习内容")
         private List<StudentLessonTrainingDetailWrapper.StudentLessonTrainingDetail> trainingDetailList;

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

@@ -1,11 +1,14 @@
 package com.ym.mec.biz.dal.dto;
 
+import lombok.Data;
+
 import java.util.Date;
 
 /**
  * @Author Joburgess
  * @Date 2021/5/24 0024
  */
+@Data
 public class EduHomeworkCardDto {
 
     private String groupId;
@@ -38,123 +41,5 @@ public class EduHomeworkCardDto {
 
     private String musicScoreId;
 
-    public String getMusicScoreId() {
-        return musicScoreId;
-    }
-
-    public void setMusicScoreId(String musicScoreId) {
-        this.musicScoreId = musicScoreId;
-    }
-
-    public String getTeacherAvatar() {
-        return teacherAvatar;
-    }
-
-    public void setTeacherAvatar(String teacherAvatar) {
-        this.teacherAvatar = teacherAvatar;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public Integer getSubjectId() {
-        return subjectId;
-    }
-
-    public void setSubjectId(Integer subjectId) {
-        this.subjectId = subjectId;
-    }
-
-    public String getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getHomeworkId() {
-        return homeworkId;
-    }
-
-    public void setHomeworkId(Long homeworkId) {
-        this.homeworkId = homeworkId;
-    }
-
-    public Long getCourseId() {
-        return courseId;
-    }
-
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public Date getCourseStartTime() {
-        return courseStartTime;
-    }
-
-    public void setCourseStartTime(Date courseStartTime) {
-        this.courseStartTime = courseStartTime;
-    }
-
-    public Integer getTeacherId() {
-        return teacherId;
-    }
-
-    public void setTeacherId(Integer teacherId) {
-        this.teacherId = teacherId;
-    }
-
-    public String getTeacherName() {
-        return teacherName;
-    }
-
-    public void setTeacherName(String teacherName) {
-        this.teacherName = teacherName;
-    }
-
-    public Integer getExceptStudentNum() {
-        return exceptStudentNum;
-    }
-
-    public void setExceptStudentNum(Integer exceptStudentNum) {
-        this.exceptStudentNum = exceptStudentNum;
-    }
-
-    public Integer getSubmitStudentNum() {
-        return submitStudentNum;
-    }
-
-    public void setSubmitStudentNum(Integer submitStudentNum) {
-        this.submitStudentNum = submitStudentNum;
-    }
-
-    public Integer getRepliedStudentNum() {
-        return repliedStudentNum;
-    }
-
-    public void setRepliedStudentNum(Integer repliedStudentNum) {
-        this.repliedStudentNum = repliedStudentNum;
-    }
+    private String memo;
 }

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 
+import com.ym.mec.biz.dal.entity.StudentLessonExaminationDetail;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -57,5 +58,8 @@ public class LessonExaminationResultDto{
 
     @ApiModelProperty(value = "学员姓名")
     private String studentNames;
+
+    @ApiModelProperty("作业分组")
+    private Integer group;
 }
 

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

@@ -1,76 +1,29 @@
 package com.ym.mec.biz.dal.dto;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.List;
 
+@Data
 public class MusicScoreSubjectDto {
 
-//    @ApiModelProperty(value = "声部",required = false)
-//    private Integer subjectId;
-
     @ApiModelProperty(value = "学员编号",required = false)
     private List<Integer> userIdList;
 
-
     @ApiModelProperty(value = "分组号")
     private Integer group;
 
+    @ApiModelProperty(value = "训练说明",required = false)
+    private String memo;
+
     @ApiModelProperty(value = "曲目编号（兼容旧数据）",required = false)
     private List<Integer> musicScoreIdList;
 
     @ApiModelProperty(value = "曲目编号、分谱（新版布置作业需要）",required = false)
     private List<MusicScoreHomeworkDto> musicScoreHomeworkDtoList;
 
-
     @ApiModelProperty("新版作业 time:2023-03-31")
     private List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> studentLessonTrainingDetails;
 
-    public List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> getStudentLessonTrainingDetails() {
-        return studentLessonTrainingDetails;
-    }
-
-    public void setStudentLessonTrainingDetails(List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> studentLessonTrainingDetails) {
-        this.studentLessonTrainingDetails = studentLessonTrainingDetails;
-    }
-
-    public List<MusicScoreHomeworkDto> getMusicScoreHomeworkDtoList() {
-        return musicScoreHomeworkDtoList;
-    }
-
-    public void setMusicScoreHomeworkDtoList(List<MusicScoreHomeworkDto> musicScoreHomeworkDtoList) {
-        this.musicScoreHomeworkDtoList = musicScoreHomeworkDtoList;
-    }
-
-//    public Integer getSubjectId() {
-//        return subjectId;
-//    }
-//
-//    public void setSubjectId(Integer subjectId) {
-//        this.subjectId = subjectId;
-//    }
-
-    public List<Integer> getUserIdList() {
-        return userIdList;
-    }
-
-    public void setUserIdList(List<Integer> userIdList) {
-        this.userIdList = userIdList;
-    }
-
-    public List<Integer> getMusicScoreIdList() {
-        return musicScoreIdList;
-    }
-
-    public void setMusicScoreIdList(List<Integer> musicScoreIdList) {
-        this.musicScoreIdList = musicScoreIdList;
-    }
-
-    public Integer getGroup() {
-        return group;
-    }
-
-    public void setGroup(Integer group) {
-        this.group = group;
-    }
 }

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

@@ -1,8 +1,11 @@
 package com.ym.mec.biz.dal.dto;
 
 
+import lombok.Data;
+
 import java.util.Date;
 
+@Data
 public class StudentCourseHomeworkDto {
 
     private Integer studentId;
@@ -28,100 +31,4 @@ public class StudentCourseHomeworkDto {
     private Integer isView;
 
     private Long studentCourseHomeworkId;
-
-    public Long getStudentCourseHomeworkId() {
-        return studentCourseHomeworkId;
-    }
-
-    public void setStudentCourseHomeworkId(Long studentCourseHomeworkId) {
-        this.studentCourseHomeworkId = studentCourseHomeworkId;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public Integer getStudentId() {
-        return studentId;
-    }
-
-    public void setStudentId(Integer studentId) {
-        this.studentId = studentId;
-    }
-
-    public String getAttachments() {
-        return attachments;
-    }
-
-    public void setAttachments(String attachments) {
-        this.attachments = attachments;
-    }
-
-    public Date getSubmitTime() {
-        return submitTime;
-    }
-
-    public void setSubmitTime(Date submitTime) {
-        this.submitTime = submitTime;
-    }
-
-    public String getStudentName() {
-        return studentName;
-    }
-
-    public void setStudentName(String studentName) {
-        this.studentName = studentName;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Integer getIsReplied() {
-        return isReplied;
-    }
-
-    public void setIsReplied(Integer isReplied) {
-        this.isReplied = isReplied;
-    }
-
-    public String getSubjectIds() {
-        return subjectIds;
-    }
-
-    public void setSubjectIds(String subjectIds) {
-        this.subjectIds = subjectIds;
-    }
-
-    public String getSubjectNames() {
-        return subjectNames;
-    }
-
-    public void setSubjectNames(String subjectNames) {
-        this.subjectNames = subjectNames;
-    }
-
-    public Integer getIsView() {
-        return isView;
-    }
-
-    public void setIsView(Integer isView) {
-        this.isView = isView;
-    }
 }

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dto;
 import com.ym.mec.biz.dal.enums.ELessonTrainingType;
 import com.ym.mec.biz.dal.enums.StandardEnum;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.Date;
 
@@ -10,6 +11,7 @@ import java.util.Date;
  * @Author Joburgess
  * @Date 2020/3/20
  */
+@Data
 public class StudentHomeworkRecordDto {
 
     @ApiModelProperty(value = "学生作业ID")
@@ -72,164 +74,4 @@ public class StudentHomeworkRecordDto {
 
     @ApiModelProperty("提交时间")
     private Date submitTime;
-
-    public Date getSubmitTime() {
-        return submitTime;
-    }
-
-    public void setSubmitTime(Date submitTime) {
-        this.submitTime = submitTime;
-    }
-
-    public StandardEnum getStandardFlag() {
-        return standardFlag;
-    }
-
-    public void setStandardFlag(StandardEnum standardFlag) {
-        this.standardFlag = standardFlag;
-    }
-
-    public ELessonTrainingType getType() {
-        return type;
-    }
-
-    public void setType(ELessonTrainingType type) {
-        this.type = type;
-    }
-
-    public Boolean getFinishStatus() {
-        return finishStatus;
-    }
-
-    public void setFinishStatus(Boolean finishStatus) {
-        this.finishStatus = finishStatus;
-    }
-
-    public Date getEndClassTime() {
-        return endClassTime;
-    }
-
-    public void setEndClassTime(Date endClassTime) {
-        this.endClassTime = endClassTime;
-    }
-
-    public String getMusicGroupId() {
-        return musicGroupId;
-    }
-
-    public void setMusicGroupId(String musicGroupId) {
-        this.musicGroupId = musicGroupId;
-    }
-
-    public String getMusicGroupName() {
-        return musicGroupName;
-    }
-
-    public void setMusicGroupName(String musicGroupName) {
-        this.musicGroupName = musicGroupName;
-    }
-
-    public String getMusicGroupImg() {
-        return musicGroupImg;
-    }
-
-    public void setMusicGroupImg(String musicGroupImg) {
-        this.musicGroupImg = musicGroupImg;
-    }
-
-    public Integer getClassGroupId() {
-        return classGroupId;
-    }
-
-    public void setClassGroupId(Integer classGroupId) {
-        this.classGroupId = classGroupId;
-    }
-
-    public String getClassGroupName() {
-        return classGroupName;
-    }
-
-    public void setClassGroupName(String classGroupName) {
-        this.classGroupName = classGroupName;
-    }
-
-    public String getTeachMode() {
-        return teachMode;
-    }
-
-    public void setTeachMode(String teachMode) {
-        this.teachMode = teachMode;
-    }
-
-    public String getHeadUrl() {
-        return headUrl;
-    }
-
-    public void setHeadUrl(String headUrl) {
-        this.headUrl = headUrl;
-    }
-
-    public Date getExpiryDate() {
-        return expiryDate;
-    }
-
-    public void setExpiryDate(Date expiryDate) {
-        this.expiryDate = expiryDate;
-    }
-
-    public Integer getStudentCourseHomeworkId() {
-        return studentCourseHomeworkId;
-    }
-
-    public void setStudentCourseHomeworkId(Integer studentCourseHomeworkId) {
-        this.studentCourseHomeworkId = studentCourseHomeworkId;
-    }
-
-    public Long getCourseScheduleId() {
-        return courseScheduleId;
-    }
-
-    public void setCourseScheduleId(Long courseScheduleId) {
-        this.courseScheduleId = courseScheduleId;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public Date getStartClassTime() {
-        return startClassTime;
-    }
-
-    public void setStartClassTime(Date startClassTime) {
-        this.startClassTime = startClassTime;
-    }
-
-    public Integer getTeacherId() {
-        return teacherId;
-    }
-
-    public void setTeacherId(Integer teacherId) {
-        this.teacherId = teacherId;
-    }
-
-    public String getTeacherName() {
-        return teacherName;
-    }
-
-    public void setTeacherName(String teacherName) {
-        this.teacherName = teacherName;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
 }

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.ym.mec.biz.dal.enums.HardLevelEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -57,5 +58,10 @@ public class StudentLessonExaminationDetailDto {
     @ApiModelProperty(value = "曲目是否有效")
     private Boolean validFlag;
 
+    private String memo;
+
+    @ApiModelProperty("作业分组")
+    private Integer group;
+
 }
 

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

@@ -30,5 +30,8 @@ public class StudentLessonExaminationDetailDto1 {
 
     @ApiModelProperty(value = "评测难度")
     private HardLevelEnum heardLevel;
+
+    @ApiModelProperty(value = "训练说明")
+    private String memo;
 }
 

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 
+import com.ym.mec.biz.dal.entity.StudentLessonExaminationDetail;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -40,5 +41,11 @@ public class StudentLessonExaminationDto {
 
     @ApiModelProperty(value = "声部")
     private String subjectName;
+
+    @ApiModelProperty("作业分组")
+    private Integer group;
+
+    @ApiModelProperty("作业详情")
+    private StudentLessonExaminationDetailDto studentLessonExaminationDetail;
 }
 

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

@@ -33,6 +33,9 @@ public class StudentLessonExaminationDto1 {
     @ApiModelProperty(value = "训练时间")
     private Date trainingTime;
 
+    @ApiModelProperty("作业分组")
+    private Integer group;
+
     private List<StudentLessonExaminationDetailDto1> detailDtos;
 }
 

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

@@ -21,6 +21,8 @@ public class StudentLessonExaminationSaveDto {
     @ApiModelProperty("作业分组")
     private Integer group;
 
+    private String memo;
+
     @ApiModelProperty(value = "作业内容")
     private List<LessonExaminationDetailDto> examinationDetailDtos;
 }

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

@@ -111,6 +111,8 @@ public class StudentLessonTrainingDetailWrapper {
 
         @ApiModelProperty("资源是否有效")
         private Boolean validFlag = false;
+
+        private String memo;
         
         public String jsonString() {
             return JSON.toJSONString(this);

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.enums.GroupType;
+import lombok.Data;
 
 import java.util.Date;
 
@@ -8,6 +9,8 @@ import java.util.Date;
  * @Author Joburgess
  * @Date 2020.04.29
  */
+
+@Data
 public class StudentServiceDetailDto {
 
     private Long homeworkId;
@@ -47,156 +50,4 @@ public class StudentServiceDetailDto {
     private String attachments;
 
     private String musicScoreId;
-
-    public String getMusicScoreId() {
-        return musicScoreId;
-    }
-
-    public void setMusicScoreId(String musicScoreId) {
-        this.musicScoreId = musicScoreId;
-    }
-
-    public Date getCourseEndTime() {
-        return courseEndTime;
-    }
-
-    public void setCourseEndTime(Date courseEndTime) {
-        this.courseEndTime = courseEndTime;
-    }
-
-    public Long getStudentHomeworkId() {
-        return studentHomeworkId;
-    }
-
-    public void setStudentHomeworkId(Long studentHomeworkId) {
-        this.studentHomeworkId = studentHomeworkId;
-    }
-
-    public String getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
-
-    public GroupType getGroupType() {
-        return groupType;
-    }
-
-    public void setGroupType(GroupType groupType) {
-        this.groupType = groupType;
-    }
-
-    public Integer getIsSubmit() {
-        return isSubmit;
-    }
-
-    public void setIsSubmit(Integer isSubmit) {
-        this.isSubmit = isSubmit;
-    }
-
-    public Long getHomeworkId() {
-        return homeworkId;
-    }
-
-    public void setHomeworkId(Long homeworkId) {
-        this.homeworkId = homeworkId;
-    }
-
-    public String getHomeworkType() {
-        return homeworkType;
-    }
-
-    public void setHomeworkType(String homeworkType) {
-        this.homeworkType = homeworkType;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public Long getCourseScheduleId() {
-        return courseScheduleId;
-    }
-
-    public void setCourseScheduleId(Long courseScheduleId) {
-        this.courseScheduleId = courseScheduleId;
-    }
-
-    public String getGroupName() {
-        return groupName;
-    }
-
-    public void setGroupName(String groupName) {
-        this.groupName = groupName;
-    }
-
-    public Date getCourseStartTime() {
-        return courseStartTime;
-    }
-
-    public void setCourseStartTime(Date courseStartTime) {
-        this.courseStartTime = courseStartTime;
-    }
-
-    public Integer getTeacherId() {
-        return teacherId;
-    }
-
-    public void setTeacherId(Integer teacherId) {
-        this.teacherId = teacherId;
-    }
-
-    public String getTeacherName() {
-        return teacherName;
-    }
-
-    public void setTeacherName(String teacherName) {
-        this.teacherName = teacherName;
-    }
-
-    public Date getHomeworkCreateTime() {
-        return homeworkCreateTime;
-    }
-
-    public void setHomeworkCreateTime(Date homeworkCreateTime) {
-        this.homeworkCreateTime = homeworkCreateTime;
-    }
-
-    public Date getSubmitTime() {
-        return submitTime;
-    }
-
-    public void setSubmitTime(Date submitTime) {
-        this.submitTime = submitTime;
-    }
-
-    public Integer getIsReplied() {
-        return isReplied;
-    }
-
-    public void setIsReplied(Integer isReplied) {
-        this.isReplied = isReplied;
-    }
-
-    public String getAttachments() {
-        return attachments;
-    }
-
-    public void setAttachments(String attachments) {
-        this.attachments = attachments;
-    }
 }

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

@@ -1,11 +1,14 @@
 package com.ym.mec.biz.dal.dto;
 
+import lombok.Data;
+
 import java.util.Date;
 
 /**
  * @Author Joburgess
  * @Date 2020.04.29
  */
+@Data
 public class StudentServiceHomeworkDto {
 
     private Integer id;
@@ -23,68 +26,4 @@ public class StudentServiceHomeworkDto {
     private Date submitTime;
 
     private String type;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Integer getIsReplied() {
-        return isReplied;
-    }
-
-    public void setIsReplied(Integer isReplied) {
-        this.isReplied = isReplied;
-    }
-
-    public Integer getIsRepliedTimely() {
-        return isRepliedTimely;
-    }
-
-    public void setIsRepliedTimely(Integer isRepliedTimely) {
-        this.isRepliedTimely = isRepliedTimely;
-    }
-
-    public Integer getIsView() {
-        return isView;
-    }
-
-    public void setIsView(Integer isView) {
-        this.isView = isView;
-    }
-
-    public Date getSubmitTime() {
-        return submitTime;
-    }
-
-    public void setSubmitTime(Date submitTime) {
-        this.submitTime = submitTime;
-    }
 }

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

@@ -3,9 +3,11 @@ package com.ym.mec.biz.dal.dto;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.Date;
 
+@Data
 public class StudentVisitCourseHomeWorkDto {
     @ApiModelProperty(value = "课程id",required = false)
     private Long courseScheduleId;
@@ -39,92 +41,4 @@ public class StudentVisitCourseHomeWorkDto {
 
     @ApiModelProperty(value = "布置时间")
     private Date createTime;
-
-    public GroupType getGroupType() {
-        return groupType;
-    }
-
-    public void setGroupType(GroupType groupType) {
-        this.groupType = groupType;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getGroupName() {
-        return groupName;
-    }
-
-    public void setGroupName(String groupName) {
-        this.groupName = groupName;
-    }
-
-    public String getTeacherName() {
-        return teacherName;
-    }
-
-    public void setTeacherName(String teacherName) {
-        this.teacherName = teacherName;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public String getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
-
-    public Long getCourseScheduleId() {
-        return courseScheduleId;
-    }
-
-    public void setCourseScheduleId(Long courseScheduleId) {
-        this.courseScheduleId = courseScheduleId;
-    }
-
-    public YesOrNoEnum getStatus() {
-        return status;
-    }
-
-    public void setStatus(YesOrNoEnum status) {
-        this.status = status;
-    }
-
-    public YesOrNoEnum getIsReplied() {
-        return isReplied;
-    }
-
-    public void setIsReplied(YesOrNoEnum isReplied) {
-        this.isReplied = isReplied;
-    }
-
-    public YesOrNoEnum getIsView() {
-        return isView;
-    }
-
-    public void setIsView(YesOrNoEnum isView) {
-        this.isView = isView;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
 }

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.codehaus.jackson.annotate.JsonIgnore;
 
 import java.util.Date;
@@ -9,6 +10,7 @@ import java.util.Date;
  * @Author Joburgess
  * @Date 2019/10/20
  */
+@Data
 public class TeacherHomeworkListDto {
 
     @ApiModelProperty(value = "课程编号")
@@ -61,156 +63,4 @@ public class TeacherHomeworkListDto {
     private int isSubmit;
 
     private int status;
-
-    public Integer getHomeworkId() {
-        return homeworkId;
-    }
-
-    public void setHomeworkId(Integer homeworkId) {
-        this.homeworkId = homeworkId;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public Date getEndClassTime() {
-        return endClassTime;
-    }
-
-    public void setEndClassTime(Date endClassTime) {
-        this.endClassTime = endClassTime;
-    }
-
-    public Date getExpiryDate() {
-        return expiryDate;
-    }
-
-    public void setExpiryDate(Date expiryDate) {
-        this.expiryDate = expiryDate;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public Date getStartClassTime() {
-        return startClassTime;
-    }
-
-    public void setStartClassTime(Date startClassTime) {
-        this.startClassTime = startClassTime;
-    }
-
-    public int getIsSubmit() {
-        return isSubmit;
-    }
-
-    public void setIsSubmit(int isSubmit) {
-        this.isSubmit = isSubmit;
-    }
-
-    public int getIsReplied() {
-        return isReplied;
-    }
-
-    public void setIsReplied(int isReplied) {
-        this.isReplied = isReplied;
-    }
-
-    public String getDay() {
-        return day;
-    }
-
-    public void setDay(String day) {
-        this.day = day;
-    }
-
-    public Integer getCourseScheduleId() {
-        return courseScheduleId;
-    }
-
-    public void setCourseScheduleId(Integer courseScheduleId) {
-        this.courseScheduleId = courseScheduleId;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Integer getExpectNum() {
-        return expectNum;
-    }
-
-    public void setExpectNum(Integer expectNum) {
-        this.expectNum = expectNum;
-    }
-
-    public Integer getCompletedNum() {
-        return completedNum;
-    }
-
-    public void setCompletedNum(Integer completedNum) {
-        this.completedNum = completedNum;
-    }
-
-    public String getCourseScheduleName() {
-        return courseScheduleName;
-    }
-
-    public void setCourseScheduleName(String courseScheduleName) {
-        this.courseScheduleName = courseScheduleName;
-    }
-
-    public Integer getTotalClassTimes() {
-        return totalClassTimes;
-    }
-
-    public void setTotalClassTimes(Integer totalClassTimes) {
-        this.totalClassTimes = totalClassTimes;
-    }
-
-    public Integer getCurrentClassTimes() {
-        return currentClassTimes;
-    }
-
-    public void setCurrentClassTimes(Integer currentClassTimes) {
-        this.currentClassTimes = currentClassTimes;
-    }
-
-    public String getMusicGroupId() {
-        return musicGroupId;
-    }
-
-    public void setMusicGroupId(String musicGroupId) {
-        this.musicGroupId = musicGroupId;
-    }
-
-    public String getMusicGroupName() {
-        return musicGroupName;
-    }
-
-    public void setMusicGroupName(String musicGroupName) {
-        this.musicGroupName = musicGroupName;
-    }
 }

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

@@ -2,13 +2,11 @@ package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.enums.GroupType;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.Date;
 
-/**
- * @Author Joburgess
- * @Date 2019/9/19
- */
+@Data
 public class WebCourseHomeworkListDto {
 
     @ApiModelProperty(value = "作业编号",required = false)
@@ -73,171 +71,5 @@ public class WebCourseHomeworkListDto {
 
     private String versionTag;
 
-    public String getVersionTag() {
-        return versionTag;
-    }
-
-    public void setVersionTag(String versionTag) {
-        this.versionTag = versionTag;
-    }
-
-    public Date getExpiryDate() {
-        return expiryDate;
-    }
-
-    public void setExpiryDate(Date expiryDate) {
-        this.expiryDate = expiryDate;
-    }
-
-    public String getMusicGroupName() {
-        return musicGroupName;
-    }
-
-    public void setMusicGroupName(String musicGroupName) {
-        this.musicGroupName = musicGroupName;
-    }
-
-    public String getMusicScoreId() {
-        return musicScoreId;
-    }
-
-    public void setMusicScoreId(String musicScoreId) {
-        this.musicScoreId = musicScoreId;
-    }
-
-    public String getClassDate() {
-        return classDate;
-    }
-
-    public void setClassDate(String classDate) {
-        this.classDate = classDate;
-    }
-
-    public String getClassStartDate() {
-        return classStartDate;
-    }
-
-    public void setClassStartDate(String classStartDate) {
-        this.classStartDate = classStartDate;
-    }
-
-    public String getClassEndDate() {
-        return classEndDate;
-    }
-
-    public void setClassEndDate(String classEndDate) {
-        this.classEndDate = classEndDate;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getCourseScheduleId() {
-        return courseScheduleId;
-    }
-
-    public void setCourseScheduleId(Long courseScheduleId) {
-        this.courseScheduleId = courseScheduleId;
-    }
-
-    public String getCourseScheduleName() {
-        return courseScheduleName;
-    }
-
-    public void setCourseScheduleName(String courseScheduleName) {
-        this.courseScheduleName = courseScheduleName;
-    }
-
-    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 String getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
-
-    public String getGroupName() {
-        return groupName;
-    }
-
-    public void setGroupName(String groupName) {
-        this.groupName = groupName;
-    }
-
-    public GroupType getGroupType() {
-        return groupType;
-    }
-
-    public void setGroupType(GroupType groupType) {
-        this.groupType = groupType;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Integer getActualTeacherId() {
-        return actualTeacherId;
-    }
-
-    public void setActualTeacherId(Integer actualTeacherId) {
-        this.actualTeacherId = actualTeacherId;
-    }
-
-    public String getActualTeacherName() {
-        return actualTeacherName;
-    }
-
-    public void setActualTeacherName(String actualTeacherName) {
-        this.actualTeacherName = actualTeacherName;
-    }
-
-    public Integer getCompletedNum() {
-        return completedNum;
-    }
-
-    public void setCompletedNum(Integer completedNum) {
-        this.completedNum = completedNum;
-    }
-
-    public Integer getExpectNum() {
-        return expectNum;
-    }
-
-    public void setExpectNum(Integer expectNum) {
-        this.expectNum = expectNum;
-    }
-
-    public Integer getRepliedNum() {
-        return repliedNum;
-    }
-
-    public void setRepliedNum(Integer repliedNum) {
-        this.repliedNum = repliedNum;
-    }
+    private String memo;
 }

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

@@ -2,14 +2,12 @@ package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.dto.LessonExaminationSaveDto;
 import com.ym.mec.biz.dal.dto.MusicScoreSubjectDto;
-
 import com.ym.mec.biz.dal.dto.StudentLessonTrainingDetailWrapper;
-import io.swagger.annotations.ApiModelProperty;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.Date;
 import java.util.List;
@@ -17,6 +15,7 @@ import java.util.List;
 /**
  * 对应数据库表(course_homework):
  */
+@Data
 public class CourseHomework extends BaseEntity {
 
 	/**  */
@@ -37,6 +36,8 @@ public class CourseHomework extends BaseEntity {
 
 	/** 作业内容 */
 	private String title;
+
+	private String memo;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -76,174 +77,6 @@ public class CourseHomework extends BaseEntity {
 	@ApiModelProperty(value = "课后评测信息")
 	private LessonExaminationSaveDto lessonExaminationSaveDto;
 
-	public LessonExaminationSaveDto getLessonExaminationSaveDto() {
-		return lessonExaminationSaveDto;
-	}
-
-    public Boolean getPushFlag() {
-        return pushFlag;
-    }
-
-    public void setPushFlag(Boolean pushFlag) {
-        this.pushFlag = pushFlag;
-    }
-
-    public void setLessonExaminationSaveDto(LessonExaminationSaveDto lessonExaminationSaveDto) {
-		this.lessonExaminationSaveDto = lessonExaminationSaveDto;
-	}
-
-	public List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> getStudentLessonTrainingDetails() {
-        return studentLessonTrainingDetails;
-    }
-
-    public void setStudentLessonTrainingDetails(List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> studentLessonTrainingDetails) {
-        this.studentLessonTrainingDetails = studentLessonTrainingDetails;
-    }
-
-    public String getVersionTag() {
-        return versionTag;
-    }
-
-    public void setVersionTag(String versionTag) {
-        this.versionTag = versionTag;
-    }
-
-    public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public List<MusicScoreSubjectDto> getMusicScoreSubjectDto() {
-		return musicScoreSubjectDto;
-	}
-
-	public void setMusicScoreSubjectDto(List<MusicScoreSubjectDto> musicScoreSubjectDto) {
-		this.musicScoreSubjectDto = musicScoreSubjectDto;
-	}
-
-	public String getMusicScoreId() {
-		return musicScoreId;
-	}
-
-	public void setMusicScoreId(String musicScoreId) {
-		this.musicScoreId = musicScoreId;
-	}
-
-	public Date getExpiryDate() {
-		return expiryDate;
-	}
-
-	public void setExpiryDate(Date expiryDate) {
-		this.expiryDate = expiryDate;
-	}
-
-	public Integer getCompletedNum() {
-		return completedNum;
-	}
-
-	public void setCompletedNum(Integer completedNum) {
-		this.completedNum = completedNum;
-	}
-
-	public Integer getExpectNum() {
-		return expectNum;
-	}
-
-	public void setExpectNum(Integer expectNum) {
-		this.expectNum = expectNum;
-	}
-
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public GroupType getGroupType() {
-		return groupType;
-	}
-
-	public void setGroupType(GroupType groupType) {
-		this.groupType = groupType;
-	}
-
-	public void setCourseScheduleId(Long courseScheduleId){
-		this.courseScheduleId = courseScheduleId;
-	}
-	
-	public Long getCourseScheduleId(){
-		return this.courseScheduleId;
-	}
-
-	public String getAttachments() {
-		return attachments;
-	}
-
-	public void setAttachments(String attachments) {
-		this.attachments = attachments;
-	}
-
-	public void setContent(String content){
-		this.content = content;
-	}
-	
-	public String getContent(){
-		return this.content;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	public void setMusicGroupId(String musicGroupId){
-		this.musicGroupId = musicGroupId;
-	}
-	
-	public String getMusicGroupId(){
-		return this.musicGroupId;
-	}
-			
-	public void setClassGroupId(Integer classGroupId){
-		this.classGroupId = classGroupId;
-	}
-	
-	public Integer getClassGroupId(){
-		return this.classGroupId;
-	}
-			
-	public MusicGroup getMusicGroup() {
-		return musicGroup;
-	}
-
-	public void setMusicGroup(MusicGroup musicGroup) {
-		this.musicGroup = musicGroup;
-	}
-
-	public ClassGroup getClassGroup() {
-		return classGroup;
-	}
-
-	public void setClassGroup(ClassGroup classGroup) {
-		this.classGroup = classGroup;
-	}
-
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -8,6 +8,7 @@ import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
 import com.ym.mec.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import javax.validation.constraints.NotNull;
@@ -17,6 +18,7 @@ import java.util.List;
 /**
  * 对应数据库表(extracurricular_exercises):
  */
+@Data
 public class ExtracurricularExercises extends BaseEntity {
 
 	/**  */
@@ -49,6 +51,9 @@ public class ExtracurricularExercises extends BaseEntity {
 	/** 标题 */
 	@ApiModelProperty(value="标题")
 	private String title;
+
+	@ApiModelProperty(value = "训练说明",required = false)
+	private String memo;
 	
 	/** 附件地址（多个用逗号分隔） */
 	@ApiModelProperty(value="附件地址（多个用逗号分隔）")
@@ -114,254 +119,6 @@ public class ExtracurricularExercises extends BaseEntity {
     @ApiModelProperty("新版作业 time:2023-03-31")
     private List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> studentLessonTrainingDetails;
 
-    public Boolean getPushFlag() {
-        return pushFlag;
-    }
-
-    public void setPushFlag(Boolean pushFlag) {
-        this.pushFlag = pushFlag;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getVersionTag() {
-        return versionTag;
-    }
-
-    public void setVersionTag(String versionTag) {
-        this.versionTag = versionTag;
-    }
-
-    public String getMusicGroupName() {
-        return musicGroupName;
-    }
-
-    public void setMusicGroupName(String musicGroupName) {
-        this.musicGroupName = musicGroupName;
-    }
-
-    public String getClassGroupName() {
-        return classGroupName;
-    }
-
-    public void setClassGroupName(String classGroupName) {
-        this.classGroupName = classGroupName;
-    }
-
-    public Date getAssignTime() {
-        return assignTime;
-    }
-
-    public void setAssignTime(Date assignTime) {
-        this.assignTime = assignTime;
-    }
-
-    public Integer getClassGroupId() {
-        return classGroupId;
-    }
-
-    public void setClassGroupId(Integer classGroupId) {
-        this.classGroupId = classGroupId;
-    }
-
-    public String getGroupType() {
-        return groupType;
-    }
-
-    public void setGroupType(String groupType) {
-        this.groupType = groupType;
-    }
-
-    public List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> getStudentLessonTrainingDetails() {
-        return studentLessonTrainingDetails;
-    }
-
-    public void setStudentLessonTrainingDetails(List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> studentLessonTrainingDetails) {
-        this.studentLessonTrainingDetails = studentLessonTrainingDetails;
-    }
-
-	public List<MusicScoreSubjectDto> getMusicScoreSubjectDtos() {
-		return musicScoreSubjectDtos;
-	}
-
-	public void setMusicScoreSubjectDtos(List<MusicScoreSubjectDto> musicScoreSubjectDtos) {
-		this.musicScoreSubjectDtos = musicScoreSubjectDtos;
-	}
-
-	public String getMusicScoreName() {
-		return musicScoreName;
-	}
-
-	public void setMusicScoreName(String musicScoreName) {
-		this.musicScoreName = musicScoreName;
-	}
-
-	public String getMusicScoreId() {
-		return musicScoreId;
-	}
-
-	public void setMusicScoreId(String musicScoreId) {
-		this.musicScoreId = musicScoreId;
-	}
-
-	public ImSendTypeEnum getMsgType() {
-		return msgType;
-	}
-
-	public void setMsgType(ImSendTypeEnum msgType) {
-		this.msgType = msgType;
-	}
-
-	public int getStatus() {
-		return status;
-	}
-
-	public void setStatus(int status) {
-		this.status = status;
-	}
-
-	public int getIsReplied() {
-		return isReplied;
-	}
-
-	public void setIsReplied(int isReplied) {
-		this.isReplied = isReplied;
-	}
-
-	public int getIsSubmit() {
-		return isSubmit;
-	}
-
-	public void setIsSubmit(int isSubmit) {
-		this.isSubmit = isSubmit;
-	}
-
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setTeacherId(Integer teacherId){
-		this.teacherId = teacherId;
-	}
-	
-	public Integer getTeacherId(){
-		return this.teacherId;
-	}
-			
-	public void setStudentIdList(String studentIdList){
-		this.studentIdList = studentIdList;
-	}
-	
-	public String getStudentIdList(){
-		return this.studentIdList;
-	}
-			
-	public void setBatchNo(String batchNo){
-		this.batchNo = batchNo;
-	}
-	
-	public String getBatchNo(){
-		return this.batchNo;
-	}
-			
-	public void setTitle(String title){
-		this.title = title;
-	}
-	
-	public String getTitle(){
-		return this.title;
-	}
-			
-	public void setAttachments(String attachments){
-		this.attachments = attachments;
-	}
-	
-	public String getAttachments(){
-		return this.attachments;
-	}
-			
-	public void setContent(String content){
-		this.content = content;
-	}
-	
-	public String getContent(){
-		return this.content;
-	}
-			
-	public void setExpireDate(java.util.Date expireDate){
-		this.expireDate = expireDate;
-	}
-	
-	public java.util.Date getExpireDate(){
-		return this.expireDate;
-	}
-			
-	public void setCompletedNum(Integer completedNum){
-		this.completedNum = completedNum;
-	}
-	
-	public Integer getCompletedNum(){
-		return this.completedNum;
-	}
-			
-	public void setExpectNum(Integer expectNum){
-		this.expectNum = expectNum;
-	}
-	
-	public Integer getExpectNum(){
-		return this.expectNum;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	public SysUser getTeacher() {
-		return teacher;
-	}
-
-	public void setTeacher(SysUser teacher) {
-		this.teacher = teacher;
-	}
-
-	public String getOrganName() {
-		return organName;
-	}
-
-	public void setOrganName(String organName) {
-		this.organName = organName;
-	}
-
-	public String getMusicGroupId() {
-		return musicGroupId;
-	}
-
-	public void setMusicGroupId(String musicGroupId) {
-		this.musicGroupId = musicGroupId;
-	}
-
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -72,6 +72,7 @@ public class ExtracurricularExercisesReply extends BaseEntity {
 	@ApiModelProperty(value = "作业评级",required = true)
 	private StandardEnum standardFlag;
 
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -1,15 +1,9 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.dto.StudentLessonTrainingDetailWrapper;
-import com.ym.mec.biz.dal.enums.ELessonTrainingType;
-import com.ym.mec.biz.dal.enums.GroupType;
-import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
-import com.ym.mec.biz.dal.enums.StandardEnum;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.common.entity.BaseEntity;
-
 import io.swagger.annotations.ApiModelProperty;
-
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -117,29 +111,7 @@ public class StudentCourseHomework extends BaseEntity {
 	@ApiModelProperty(value = "是否已查看")
 	private YesOrNoEnum isView;
 
-	public Integer getIsRepliedTimely() {
-		return isRepliedTimely;
-	}
-
-	public void setIsRepliedTimely(Integer isRepliedTimely) {
-		this.isRepliedTimely = isRepliedTimely;
-	}
-
-	public YesOrNoEnum getIsView() {
-		return isView;
-	}
-
-	public void setIsView(YesOrNoEnum isView) {
-		this.isView = isView;
-	}
-
-	public YesOrNoEnum getIsReplied() {
-		return isReplied;
-	}
-
-	public void setIsReplied(YesOrNoEnum isReplied) {
-		this.isReplied = isReplied;
-	}
+	private String memo;
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -47,6 +47,10 @@ public class StudentLessonExamination {
     @ApiModelProperty(value = "声部")
     private Integer subjectId;
 
+    @ApiModelProperty("作业分组")
+    @TableField("group_")
+    private Integer group;
+
     @TableField("create_time_")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;

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

@@ -82,6 +82,10 @@ public class StudentLessonExaminationDetail implements Serializable {
     @ApiModelProperty(value = "最后提交时间")
     private Date trainingTime;
 
+    @TableField("memo_")
+    @ApiModelProperty(value = "备注")
+    private String memo;
+
     @TableField("create_time_")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;

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

@@ -88,6 +88,10 @@ public class StudentLessonTrainingDetail implements Serializable {
     @TableField(value = "music_score_name_")
     private String musicScoreName;
 
+    @ApiModelProperty("训练说明")
+    @TableField(value = "memo_")
+    private String memo;
+
     @ApiModelProperty("创建时间") 
 	@TableField(value = "create_time_")
     private Date createTime;

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

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.entity.StudentCourseHomework;
 import com.ym.mec.biz.dal.enums.ELessonTrainingType;
 import com.ym.mec.biz.dal.page.CourseHomeworkQueryInfo;
 import com.ym.mec.biz.dal.page.StudentCourseHomeWorkQueryInfo;
+import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
@@ -124,7 +125,7 @@ public interface StudentCourseHomeworkService extends BaseService<Long, StudentC
      *
      * @return
      */
-    CourseHomeworkWrapper.CourseHomeworkList findStudentHomeworkRecordDetail(CourseHomeworkWrapper.StudentCourseHomeworkQuery query);
+    HttpResponseResult<CourseHomeworkWrapper.CourseHomeworkList> findStudentHomeworkRecordDetail(CourseHomeworkWrapper.StudentCourseHomeworkQuery query);
 
     List<StudentLessonTrainingDetailWrapper.StudentLessonTrainingDetail> findStudentHomeworkCourseware(CourseHomeworkWrapper.StudentCourseHomeworkQuery query);
 

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

@@ -45,7 +45,12 @@ public interface StudentLessonTrainingDetailService extends IService<StudentLess
      * @param userIdList                   学生ID
      * @param group
      */
-    List<StudentLessonTrainingDetail> homeWorkDetail(List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> studentLessonTrainingDetails, List<Integer> userIdList, Long homeworkId, ELessonTrainingType type, Integer group);
+    List<StudentLessonTrainingDetail> homeWorkDetail(List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> studentLessonTrainingDetails,
+                                                     List<Integer> userIdList,
+                                                     Long homeworkId,
+                                                     ELessonTrainingType type,
+                                                     Integer group,
+                                                     String memo);
 
     /**
      * 查询布置的作业详情

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

@@ -2442,12 +2442,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
         MusicGroupStudentClassAdjust classAdjust = musicGroupStudentClassAdjustDao.get(classGroup4MixDto.getMusicGroupStudentClassAdjustId());
         ClassGroup classGroup = classGroup4MixDto.getClassGroup();
+        List<ClassGroupStudentMapper> classGroupStudentMapperList = new ArrayList<>();
         if (classGroup == null) {
             //建班
             classGroup = createClassGroup(classGroup4MixDto);
             classGroup4MixDto.setClassGroup(classGroup);
             //2、将学生加入新班级（学生注册表，关联表
-            List<ClassGroupStudentMapper> classGroupStudentMapperList = new ArrayList<>();
             List<Integer> userIds = new ArrayList<>(); //用户ids
             for (StudentRegistration studentRegistration : studentList) {
                 if (classGroup4MixDto.getType().equals(ClassGroupTypeEnum.NORMAL)) {
@@ -2466,7 +2466,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
                 userIds.add(studentRegistration.getUserId());
             }
-            classGroupStudentMapperDao.classGroupStudentsInsert(classGroupStudentMapperList);
 
             List<Integer> teacherIds = new ArrayList<>();
             for (ClassGroupTeacherMapper groupTeacherMapper : classGroupTeacherMapperList) {
@@ -2485,7 +2484,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         getCourseSchedules(classGroup4MixDto, courseScheduleList, classAdjust);
 
         //自动排课，校验冲突
-        if (courseScheduleList.size() > 0) {
+        if (CollectionUtils.isNotEmpty(courseScheduleList)) {
             //冲突校验
             courseScheduleList = autoAdjust(classGroup4MixDto, courseScheduleList, classAdjust);
 
@@ -2511,9 +2510,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     courseScheduleTeacherSalaryList.add(courseScheduleTeacherSalary);
                 }
             }
-
+            if (CollectionUtils.isNotEmpty(classGroupStudentMapperList)){
+                classGroupStudentMapperDao.classGroupStudentsInsert(classGroupStudentMapperList);
+            }
             //老师结算表
-            if (courseScheduleTeacherSalaryList.size() > 0) {
+            if (CollectionUtils.isNotEmpty(courseScheduleTeacherSalaryList)) {
                 courseScheduleTeacherSalaryService.batchInsert(courseScheduleTeacherSalaryList);
             }
             Integer musicGroupStudentClassAdjustId = classGroup4MixDto.getMusicGroupStudentClassAdjustId();

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

@@ -295,8 +295,8 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
         query.setCourseScheduleId(extraId);
         query.setPage(1);
         query.setRows(1);
-        PageInfo<CourseHomeworkWrapper.CourseHomeworkList> courseHomeworkListPageInfo = studentExtracurricularExercisesSituationService.queryTeacherExtraHomeworkDetailV2(
-            query);
+        PageInfo<CourseHomeworkWrapper.CourseHomeworkList> courseHomeworkListPageInfo =
+				studentExtracurricularExercisesSituationService.queryTeacherExtraHomeworkDetailV2(query);
         List<CourseHomeworkWrapper.CourseHomeworkList> rows = courseHomeworkListPageInfo.getRows();
         if (CollectionUtils.isEmpty(rows)) {
             throw new BizException("作业不存在");

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

@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
+
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -131,8 +132,13 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
                 }
                 // 作业详情
                 studentLessonTrainingDetailList.addAll(studentLessonTrainingDetailService
-                                   .homeWorkDetail(musicScoreSubjectDto.getStudentLessonTrainingDetails(), musicScoreSubjectDto.getUserIdList(), exercises.getId(),
-                                                   ELessonTrainingType.valueOf(exercises.getGroupType()),musicScoreSubjectDto.getGroup()));
+                                   .homeWorkDetail(musicScoreSubjectDto.getStudentLessonTrainingDetails(),
+                                           musicScoreSubjectDto.getUserIdList(),
+                                           exercises.getId(),
+                                           ELessonTrainingType.valueOf(exercises.getGroupType()),
+                                           musicScoreSubjectDto.getGroup(),
+                                           musicScoreSubjectDto.getMemo()
+                                   ));
 
             }
         } else {
@@ -143,8 +149,12 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
             }
             // 作业详情
             studentLessonTrainingDetailList.addAll(studentLessonTrainingDetailService
-                                                       .homeWorkDetail(exercises.getStudentLessonTrainingDetails(), studentIds,exercises.getId(),
-                                                       ELessonTrainingType.valueOf(exercises.getGroupType()), null));
+                                                       .homeWorkDetail(exercises.getStudentLessonTrainingDetails(),
+                                                               studentIds,
+                                                               exercises.getId(),
+                                                               ELessonTrainingType.valueOf(exercises.getGroupType()),
+                                                               null,
+                                                               exercises.getMemo()));
         }
         for (ExtracurricularExercisesReply extracurricularExercisesReply : extracurricularExercisesReplies) {
             extracurricularExercisesReplyDao.insert(extracurricularExercisesReply);

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

@@ -11,7 +11,9 @@ import com.ym.mec.biz.dal.page.CourseHomeworkQueryInfo;
 import com.ym.mec.biz.dal.page.StudentCourseHomeWorkQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.constant.CommonConstants;
+import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.dal.BaseDAO;
+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.page.QueryInfo;
@@ -23,6 +25,7 @@ import com.ym.mec.util.date.DateUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
@@ -835,8 +838,10 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
 
             for (StudentCourseHomework studentCourseHomework1 : studentCourseHomeworkByCourse) {
                 if (studentLessonTrainingDetailMap.containsKey(studentCourseHomework1.getUserId().longValue())) {
-                    List<StudentLessonTrainingDetailWrapper.StudentLessonTrainingDetail> studentLessonTrainingDetails1 = studentLessonTrainingDetailMap.get(studentCourseHomework1.getUserId().longValue());
+                    List<StudentLessonTrainingDetailWrapper.StudentLessonTrainingDetail> studentLessonTrainingDetails1 =
+                            studentLessonTrainingDetailMap.get(studentCourseHomework1.getUserId().longValue());
                     studentCourseHomework1.setStudentLessonTrainingDetail(studentLessonTrainingDetails1);
+                    studentCourseHomework1.setMemo(studentLessonTrainingDetails1.get(0).getMemo());
                 }
             }
         }
@@ -865,7 +870,7 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
      * @return
      */
     @Override
-    public CourseHomeworkWrapper.CourseHomeworkList findStudentHomeworkRecordDetail(CourseHomeworkWrapper.StudentCourseHomeworkQuery query) {
+    public HttpResponseResult<CourseHomeworkWrapper.CourseHomeworkList> findStudentHomeworkRecordDetail(CourseHomeworkWrapper.StudentCourseHomeworkQuery query) {
         CourseHomeworkWrapper.CourseHomeworkList courseHomeworkDetail = null;
         if (ELessonTrainingType.HOMEWORK.equals(query.getType())) {
             courseHomeworkDetail= courseHomeworkService.findCourseHomeworkDetail(
@@ -874,14 +879,14 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
             StudentCourseHomework homework = studentCourseHomeworkDao
                     .getHomeworkByUserIdAndCourseHomeworkId(query.getUserId(), courseHomeworkDetail.getCourseHomeworkId());
             if (homework == null) {
-                throw new BizException("作业不存在");
+                return BaseController.failed(HttpStatus.NO_CONTENT,"作业不存在");
             }
             courseHomeworkDetail.setSubmitTime(homework.getSubmitTime());
         } else {
             courseHomeworkDetail = courseHomeworkService.findCourseExtraHomeworkDetail(query.getCourseScheduleId());
             ExtracurricularExercisesReply exercisesReply = extracurricularExercisesReplyDao.getByExtraIdAndUserId(courseHomeworkDetail.getCourseHomeworkId(), query.getUserId());
             if (exercisesReply == null) {
-                throw new BizException("作业不存在");
+                return BaseController.failed(HttpStatus.NO_CONTENT,"作业不存在");
             }
             courseHomeworkDetail.setSubmitTime(exercisesReply.getSubmitTime());
         }
@@ -898,8 +903,7 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
         }
         courseHomeworkDetail.setTrainingDetailList(detailList);
 
-        return courseHomeworkDetail;
-
+        return BaseController.succeed(courseHomeworkDetail);
     }
 
     @Override

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

@@ -53,6 +53,7 @@ public class StudentLessonExaminationDetailServiceImpl extends ServiceImpl<Stude
                     LessonExaminationDetailDto vo = detailDtos.get(i);
                     StudentLessonExaminationDetail studentLessonExaminationDetail = new StudentLessonExaminationDetail();
                     studentLessonExaminationDetail.setUserId(studentId);
+                    studentLessonExaminationDetail.setMemo(dto.getMemo());
                     studentLessonExaminationDetail.setLessonExaminationId(lessonExaminationId);
                     studentLessonExaminationDetail.setMusicScoreId(vo.getMusicScoreId());
                     studentLessonExaminationDetail.setHeardLevel(vo.getHeardLevel());

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

@@ -1,21 +1,18 @@
 package com.ym.mec.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ym.mec.biz.dal.dao.LessonExaminationDao;
-import com.ym.mec.biz.dal.dao.StudentExtracurricularExercisesSituationDao;
-import com.ym.mec.biz.dal.dao.StudentLessonExaminationDao;
-import com.ym.mec.biz.dal.dao.StudentLessonExaminationDetailDao;
+import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
-import com.ym.mec.biz.dal.entity.LessonExamination;
-import com.ym.mec.biz.dal.entity.StudentLessonExamination;
-import com.ym.mec.biz.dal.entity.StudentLessonExaminationDetail;
-import com.ym.mec.biz.dal.entity.StudentLessonTrainingDetail;
+import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.page.StudentLessonExaminationQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,9 +41,10 @@ public class StudentLessonExaminationServiceImpl extends ServiceImpl<StudentLess
     private LessonExaminationService lessonExaminationService;
     @Autowired
     private StudentExtracurricularExercisesSituationService studentExtracurricularExercisesSituationService;
-
     @Autowired
     private StudentLessonTrainingDetailService studentLessonTrainingDetailService;
+    @Autowired
+    private SysMusicScoreDao sysMusicScoreDao;
 
     @Override
     public StudentLessonExaminationDao getDao() {
@@ -63,6 +61,7 @@ public class StudentLessonExaminationServiceImpl extends ServiceImpl<StudentLess
             for (String studentId : studentIds) {
                 StudentLessonExamination studentLessonExamination = new StudentLessonExamination();
                 studentLessonExamination.setLessonExaminationId(lessonExaminationId);
+                studentLessonExamination.setGroup(dto.getGroup());
                 Integer parseInt = Integer.parseInt(studentId);
                 studentIdList.add(parseInt);
                 studentLessonExamination.setUserId(parseInt);
@@ -106,6 +105,36 @@ public class StudentLessonExaminationServiceImpl extends ServiceImpl<StudentLess
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());
             dataList = baseMapper.queryPage(params);
+            if(queryInfo.getLessonExaminationId() != null){
+                Map<Integer, StudentLessonExaminationDetail> examinationIdMap = new HashMap<>();
+                if(queryInfo.getLessonExaminationId() != null){
+                    List<StudentLessonExaminationDetail> list = studentLessonExaminationDetailService.lambdaQuery().
+                            eq(StudentLessonExaminationDetail::getLessonExaminationId, queryInfo.getLessonExaminationId()).list();
+                    String musicScoreIds = list.stream().map(e->e.getMusicScoreId().toString()).collect(Collectors.joining(","));
+                    Map<Integer, SysMusicScore> musicScoreMap = new HashMap<>();
+                    if (StringUtils.isNotEmpty(musicScoreIds)) {
+                        List<SysMusicScore> musicScores = sysMusicScoreDao.findByIds(musicScoreIds);
+                        if (CollectionUtils.isNotEmpty(musicScores)) {
+                            musicScoreMap = musicScores.stream().collect(Collectors.toMap(SysMusicScore::getId, e -> e));
+                        }
+                    }
+                    examinationIdMap = list.stream().collect(Collectors.groupingBy(StudentLessonExaminationDetail::getUserId,
+                            Collectors.collectingAndThen(Collectors.toList(), e -> e.get(0))));
+                    for (StudentLessonExaminationDto dto : dataList) {
+                        StudentLessonExaminationDetail detail = examinationIdMap.get(dto.getUserId());
+                        if (detail != null) {
+                            StudentLessonExaminationDetailDto detailDto = JSON.parseObject(JSON.toJSONString(detail), StudentLessonExaminationDetailDto.class);
+                            if(detail.getMusicScoreId() != null){
+                                SysMusicScore musicScore = musicScoreMap.get(detail.getMusicScoreId().intValue());
+                                if (musicScore != null){
+                                    detailDto.setMusicScoreName(musicScore.getName());
+                                }
+                            }
+                            dto.setStudentLessonExaminationDetail(detailDto);
+                        }
+                    }
+                }
+            }
         }
         if (count == 0) {
             dataList = new ArrayList<>();

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

@@ -93,7 +93,11 @@ public class StudentLessonTrainingDetailServiceImpl extends ServiceImpl<StudentL
      */
     @Override
     public List<StudentLessonTrainingDetail> homeWorkDetail(List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> detailList,
-                                                            List<Integer> userIdList, Long homeworkId, ELessonTrainingType type, Integer group) {
+                                                            List<Integer> userIdList,
+                                                            Long homeworkId,
+                                                            ELessonTrainingType type,
+                                                            Integer group,
+                                                            String memo) {
         log.info("将作业标准 转换为 需要的作业详情 {},{}", detailList, userIdList);
         // 保存作业标准
         if (CollectionUtils.isEmpty(detailList) || CollectionUtils.isEmpty(userIdList)) {
@@ -121,6 +125,7 @@ public class StudentLessonTrainingDetailServiceImpl extends ServiceImpl<StudentL
             studentLessonTrainingDetail.setUpdateTime(date);
             studentLessonTrainingDetail.setGroup(group);
             studentLessonTrainingDetail.setType(type);
+            studentLessonTrainingDetail.setMemo(memo);
         }
         return result;
     }
@@ -337,7 +342,8 @@ public class StudentLessonTrainingDetailServiceImpl extends ServiceImpl<StudentL
 
             }
 
-            studentLessonTrainingStat.setSubjectName(subjectNameList.stream().collect(Collectors.joining(",")));
+            studentLessonTrainingStat.setMemo(v.get(0).getMemo());
+            studentLessonTrainingStat.setSubjectName(String.join(",", subjectNameList));
             studentLessonTrainingStat.setStudentNum(userIds.size());
             studentLessonTrainingStat.setShouldSubmitNum(userIds.size());
             studentLessonTrainingStat.setSubmitNum(submitNum);

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

@@ -422,9 +422,12 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
                                 studentLessonTrainingDetail.setSubjectId(0);
                             }
                             studentLessonTrainingDetails.addAll(studentLessonTrainingDetailService
-                                                                    .homeWorkDetail(scoreSubjectDto.getStudentLessonTrainingDetails(), userIdList,
-                                                                            courseHomework.getId(),ELessonTrainingType.HOMEWORK, scoreSubjectDto.getGroup()));
-
+                                                                    .homeWorkDetail(scoreSubjectDto.getStudentLessonTrainingDetails(),
+																			userIdList,
+																			courseHomework.getId(),
+																			ELessonTrainingType.HOMEWORK,
+																			scoreSubjectDto.getGroup(),
+																			scoreSubjectDto.getMemo()));
 						}
 					}else {
 						studentCourseHomeworks.addAll(studentCourseHomeworkDao.constructInitialStudentHomeworkRecordsWithPayment(teacherAttendance.getCourseScheduleId(),
@@ -437,7 +440,12 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
                                                                       .map(StudentCourseHomework::getUserId)
                                                                       .collect(Collectors.toList());
                         studentLessonTrainingDetails.addAll(studentLessonTrainingDetailService
-                                                                .homeWorkDetail(courseHomeworkInfo.getStudentLessonTrainingDetails(), userIdList,courseHomework.getId(),ELessonTrainingType.HOMEWORK,null));
+                                                                .homeWorkDetail(courseHomeworkInfo.getStudentLessonTrainingDetails(),
+																		userIdList,
+																		courseHomework.getId(),
+																		ELessonTrainingType.HOMEWORK,
+																		null,
+																		courseHomeworkInfo.getMemo()));
 
 					}
 					if(CollectionUtils.isEmpty(studentCourseHomeworks)){

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

@@ -13,6 +13,7 @@
 		<result column="attachments_" property="attachments" />
 		<result column="title_" property="title" />
 		<result column="content_" property="content" />
+		<result column="memo_" property="memo" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="music_group_id_" property="musicGroupId" />
@@ -30,6 +31,7 @@
 		<result column="course_schedule_id_" property="courseScheduleId" />
 		<result column="title_" property="title" />
 		<result column="content_" property="content" />
+		<result column="memo_" property="memo" />
 		<result column="create_time_" property="createTime" />
 		<result column="start_class_time_" property="startClassTime" />
 		<result column="music_group_id_" property="musicGroupId" />
@@ -63,7 +65,8 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.CourseHomework" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO course_homework (group_type_,course_schedule_id_,attachments_,
-		                             title_,content_,create_time_,update_time_,music_group_id_,class_group_id_,completed_num_,expect_num_,expiry_date_,tenant_id_)
+		                             title_,content_,create_time_,update_time_,music_group_id_,
+		                             class_group_id_,completed_num_,expect_num_,expiry_date_,tenant_id_)
 		VALUES(#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		       #{courseScheduleId},#{attachments},#{title},#{content},now(),now(),#{musicGroupId},
 		       #{classGroupId},#{completedNum},#{expectNum},#{expiryDate},#{tenantId})
@@ -88,7 +91,6 @@
 			<if test="groupType != null">
 				group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 			</if>
-
 			<if test="expectNum != null">
 				expect_num_ = #{expectNum},
 			</if>
@@ -278,6 +280,7 @@
 		<result property="organId" column="organ_id_"/>
 		<result property="groupType" column="group_type_"/>
 		<result property="groupName" column="group_name_"/>
+		<result property="memo" column="memo_"/>
 		<result property="groupId" column="group_id_"/>
 		<result property="courseScheduleName" column="course_schedule_name_"/>
 		<result property="courseScheduleId" column="course_schedule_id_"/>
@@ -297,7 +300,8 @@
 		SELECT ch.id_,cs.id_ course_schedule_id_,cs.name_ course_schedule_name_,
 		cs.class_date_,cs.start_class_time_,cs.end_class_time_,cs.organ_id_,o.name_ organ_name_,
 		mg.id_ group_id_,mg.name_ group_name_,ch.create_time_,cs.actual_teacher_id_,
-		su.real_name_ actual_teacher_name_,ch.completed_num_,ch.expect_num_,cs.group_type_,sch.music_score_id_,mg.name_ as musicGroupName,ch.expiry_date_ as expiryDate,ch.version_tag_ as versionTag
+		su.real_name_ actual_teacher_name_,ch.completed_num_,ch.expect_num_,cs.group_type_,
+		sch.music_score_id_,mg.name_ as musicGroupName,ch.expiry_date_ as expiryDate,ch.version_tag_ as versionTag
 		FROM course_homework ch
 		LEFT JOIN student_course_homework sch ON ch.id_ = sch.course_homework_id_
 		LEFT JOIN course_schedule cs ON cs.id_ = ch.course_schedule_id_

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

@@ -99,7 +99,8 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ExtracurricularExercises" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO extracurricular_exercises (music_group_id_,teacher_id_,student_id_list_,batch_no_,
-		                                       title_,attachments_,content_,expire_date_,completed_num_,expect_num_,create_time_,update_time_,tenant_id_,group_type_)
+		                                       title_,attachments_,content_,expire_date_,completed_num_,expect_num_,
+		                                       create_time_,update_time_,tenant_id_,group_type_)
 		VALUES(#{musicGroupId},#{teacherId},#{studentIdList},#{batchNo},#{title},#{attachments},
 		       #{content},#{expireDate},#{completedNum},#{expectNum},NOW(), NOW(),#{tenantId},#{groupType})
 	</insert>
@@ -154,7 +155,8 @@
 	<select id="queryPage" resultMap="ExtracurricularExercises" parameterType="map">
 		SELECT ee.id_,ee.teacher_id_,ee.student_id_list_,ee.group_type_ as type,ee.batch_no_,ee.title_,ee.attachments_,ee.music_group_id_,
 		       ee.content_,ee.expire_date_,ee.completed_num_,ee.expect_num_,ee.create_time_,ee.update_time_,ee.tenant_id_
-		     ,u.real_name_ username_,o.name_ organ_name_,eer.music_score_id_,ee.create_time_ as assignTime,mg.name_ as musicGroupName,ee.class_group_id_ as classGroupId,ee.version_tag_ as versionTag
+		     ,u.real_name_ username_,o.name_ organ_name_,eer.music_score_id_,ee.create_time_ as assignTime,
+		      mg.name_ as musicGroupName,ee.class_group_id_ as classGroupId,ee.version_tag_ as versionTag
 		FROM extracurricular_exercises ee LEFT JOIN sys_user u ON ee.teacher_id_ = u.id_
 		LEFT JOIN teacher t ON t.id_ = ee.teacher_id_
         left join sys_user su on t.id_ = su.id_

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

@@ -114,7 +114,8 @@
 		<foreach collection="replies" item="reply" separator=",">
 			(#{reply.extracurricularExercisesId},#{reply.userId},#{reply.attachments},NOW(),NOW(),
 			 #{reply.remark},#{reply.status},#{reply.isReplied},#{reply.isView},#{reply.isRepliedTimely},
-			 #{reply.musicScoreId},#{reply.musicScoreContent},#{replay.tenantId},#{replay.standardFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
+			 #{reply.musicScoreId},#{reply.musicScoreContent},#{replay.tenantId},
+			 #{replay.standardFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
 		</foreach>
 	</insert>
 

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

@@ -89,7 +89,8 @@
             keyColumn="id" keyProperty="id">
         INSERT INTO student_course_homework
         (user_id_,course_schedule_id_,course_homework_id_,attachments_,score_,create_time_,
-         update_time_,remark_,status_,is_replied_,is_view_,is_replied_timely_,music_score_id_,music_score_content_,tenant_id_,standard_flag_,group_type_)
+         update_time_,remark_,status_,is_replied_,is_view_,is_replied_timely_,music_score_id_,
+         music_score_content_,tenant_id_,standard_flag_,group_type_)
         VALUE
         <foreach collection="list" item="homework" separator=",">
             (#{homework.userId},#{homework.courseScheduleId},#{homework.courseHomeworkId},#{homework.attachments},

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

@@ -16,6 +16,8 @@
         <result column="actual_avg_score_" property="actualAvgScore"/>
         <result column="part_index_" property="partIndex"/>
         <result column="training_time_" property="trainingTime"/>
+        <result column="memo_" property="memo"/>
+        <result column="group_" property="group"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
     </resultMap>
@@ -23,18 +25,18 @@
     <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"
             parameterType="com.ym.mec.biz.dal.entity.StudentLessonExaminationDetail">
         insert into student_lesson_examination_detail(user_id_, lesson_examination_id_, music_score_id_, heard_level_,standard_score_,
-                                                      avg_score_, part_index_,start_,end_)
+                                                      avg_score_, part_index_,start_,end_,memo_,group_)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.userId}, #{entity.lessonExaminationId},#{entity.musicScoreId}, #{entity.heardLevel,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-             #{entity.standardScore}, #{entity.avgScore},#{entity.partIndex},#{entity.start},#{entity.end})
+             #{entity.standardScore}, #{entity.avgScore},#{entity.partIndex},#{entity.start},#{entity.end},#{entity.memo},#{entity.group})
         </foreach>
     </insert>
     <select id="queryAll" resultType="com.ym.mec.biz.dal.dto.StudentLessonExaminationDetailDto">
         select sms.name_ musicScoreName,sled.id_ studentLessonExaminationDetailId, sled.user_id_ userId, sled.lesson_examination_id_ lessonExaminationId, sled.music_score_id_ musicScoreId,
                sled.heard_level_ heardLevel, sled.training_score_ trainingScore,sled.avg_score_ avgScore, sled.actual_avg_score_ actualAvgScore, sled.start_ start, sled.end_ end,
                sled.standard_score_ standardScore, sled.part_index_ partIndex,CASE WHEN sled.training_time_ IS NULL THEN 0 ELSE 1 END trainingFlag,
-               sms.del_flag_ = 0 AND sms.show_flag_ = 1 validFlag
+               sms.del_flag_ = 0 AND sms.show_flag_ = 1 validFlag,sled.memo_ memo,sled.group_ 'group'
         from student_lesson_examination_detail sled
         left join sys_music_score sms ON sms.id_ = sled.music_score_id_
         <where>

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

@@ -9,16 +9,17 @@
         <result column="training_time_" property="trainingTime"/>
         <result column="training_flag_" property="trainingFlag"/>
         <result column="subject_id_" property="subjectId"/>
+        <result column="group_" property="group"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
     </resultMap>
 
     <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"
             parameterType="com.ym.mec.biz.dal.entity.StudentLessonExamination">
-        insert into student_lesson_examination(user_id_, lesson_examination_id_,subject_id_)
+        insert into student_lesson_examination(user_id_, lesson_examination_id_,subject_id_,group_)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.userId}, #{entity.lessonExaminationId}, #{entity.subjectId})
+            (#{entity.userId}, #{entity.lessonExaminationId}, #{entity.subjectId},#{entity.group})
         </foreach>
     </insert>
     <update id="updateTrainingScore">
@@ -53,7 +54,7 @@
     <select id="queryPage" resultType="com.ym.mec.biz.dal.dto.StudentLessonExaminationDto">
         select su.avatar_ avatar,su.username_ username,sle.training_time_ trainingTime,sle.training_score_ trainingScore,
                CASE WHEN s.membership_end_time_ > NOW() THEN 1 ELSE 0 END memberFlag,sle.training_flag_ trainingFlag,
-               sle.user_id_ userId,sle.lesson_examination_id_ lessonExaminationId,sb.name_ subjectName
+               sle.user_id_ userId,sle.lesson_examination_id_ lessonExaminationId,sb.name_ subjectName,sle.group_ 'group'
         from student_lesson_examination sle
         left join student s ON s.user_id_ = sle.user_id_
         left join subject sb ON s.subject_id_list_ = sb.id_
@@ -74,19 +75,21 @@
         <result property="username" column="username_"/>
         <result property="trainingScore" column="trainingScore"/>
         <result property="trainingTime" column="training_time_"/>
+        <result property="group" column="group_"/>
         <collection property="detailDtos" ofType="com.ym.mec.biz.dal.dto.StudentLessonExaminationDetailDto1">
             <result property="standardScore" column="standard_score_"/>
             <result property="trainingScore" column="training_score_"/>
             <result property="actualAvgScore" column="actual_avg_score_"/>
             <result property="avgScore" column="avg_score_"/>
             <result property="musicScoreName" column="musicScoreName"/>
+            <result property="memo" column="memo_"/>
             <result property="heardLevel" column="heard_level_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         </collection>
     </resultMap>
     <select id="queryStudentPage" resultMap="StudentLessonExaminationDtoMap">
         select sle.user_id_,su.username_,su.phone_,sb.name_ subjectName,sle.training_score_ trainingScore,
                sms.name_ musicScoreName,sled.actual_avg_score_,sled.standard_score_,sled.training_score_,
-               sled.avg_score_,sled.heard_level_,sle.training_time_
+               sled.avg_score_,sled.heard_level_,sle.training_time_,sle.group_,sled.memo_
         from student_lesson_examination sle
         left join student_lesson_examination_detail sled ON sled.lesson_examination_id_ = sle.lesson_examination_id_ AND sled.user_id_ = sle.user_id_
         left join sys_music_score sms ON sms.id_ = sled.music_score_id_

mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/controller/OmsOrderController.java

@@ -5,6 +5,7 @@ import com.yonge.cooleshow.mall.common.api.CommonPage;
 import com.yonge.cooleshow.mall.common.api.CommonResult;
 import com.yonge.cooleshow.admin.dto.*;
 import com.yonge.cooleshow.admin.service.OmsOrderService;
+import com.yonge.cooleshow.mall.common.api.ResultCode;
 import com.yonge.cooleshow.mall.common.enums.OrderCacheEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -17,6 +18,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -52,10 +54,7 @@ public class OmsOrderController {
         try {
             boolean b = lock.tryLock(60, 60, TimeUnit.SECONDS);
             if (b) {
-                int count = orderService.delivery(deliveryParamList);
-                if (count > 0) {
-                    return CommonResult.success(count);
-                }
+                return CommonResult.success(orderService.delivery(deliveryParamList));
             }
         } catch (InterruptedException e) {
             log.error("批量发货异常", e);

mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/dao/OmsOrderDao.java

@@ -48,4 +48,6 @@ public interface OmsOrderDao {
                                                      @Param("dateFormat") String dateFormat);
 
     List<OrderDetailVo> queryOrderDetail(@Param("queryParam") OmsOrderQueryParam queryParam);
+
+    List<String> getDeliveryList(@Param("orderIds") List<Long> orderIds);
 }

mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/dto/OmsOrderQueryParam.java

@@ -3,6 +3,8 @@ package com.yonge.cooleshow.admin.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 
 /**
  * 订单查询参数
@@ -25,4 +27,6 @@ public class OmsOrderQueryParam {
     private String createTime;
     @ApiModelProperty(value = "订单提交时间")
     private String endTime;
+    @ApiModelProperty(value = "订单编号")
+    private List<String> orderSns;
 }

mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/OmsOrderService.java

@@ -23,8 +23,7 @@ public interface OmsOrderService {
     /**
      * 批量发货
      */
-    @Transactional
-    int delivery(List<OmsOrderDeliveryParam> deliveryParamList);
+    Map<String,String> delivery(List<OmsOrderDeliveryParam> deliveryParamList);
 
     void syncSkuStock(List<Long> skuIds);
 

mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/OmsOrderServiceImpl.java

@@ -22,10 +22,10 @@ import com.yonge.cooleshow.admin.wrapper.OmsOrderWrapper;
 import com.yonge.cooleshow.mbg.mapper.*;
 import com.yonge.cooleshow.mbg.model.*;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
@@ -99,7 +99,7 @@ public class OmsOrderServiceImpl implements OmsOrderService {
                 orderVo.setUsername("");
             }
         }
-        if (!CollectionUtils.isEmpty(schoolIds)) {
+        if (CollectionUtils.isNotEmpty(schoolIds)) {
             try {
                 HttpResponseResult<List<SchoolDto>> schoolDtoHttpResponseResult = webFeignService.schoolListByIds(schoolIds);
                 if (schoolDtoHttpResponseResult.getCode() == 200 && schoolDtoHttpResponseResult.getStatus()) {
@@ -127,10 +127,7 @@ public class OmsOrderServiceImpl implements OmsOrderService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int delivery(List<OmsOrderDeliveryParam> deliveryParamList) {
-        //批量发货
-        int count = orderDao.delivery(deliveryParamList);
-
+    public Map<String,String> delivery(List<OmsOrderDeliveryParam> deliveryParamList) {
         // 扣减库存
         //库存扣减规则更新
         //扣减顺序：内部库存>税务库存>进货批次
@@ -142,7 +139,20 @@ public class OmsOrderServiceImpl implements OmsOrderService {
         // 查询出所有订单关联的skuId
         // 订单ID集合
         List<Long> orderIds = deliveryParamList.stream().map(OmsOrderDeliveryParam::getOrderId).collect(Collectors.toList());
-        updateSkuStock( orderIds);
+        //获取所有已发货的订单
+        List<String> orderNos = orderDao.getDeliveryList(orderIds);
+        Map<String,String> resultMap = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(orderNos)) {
+            orderNos.forEach(orderNo->{
+                resultMap.put(orderNo,orderNo+"已发货");
+            });
+        }
+        updateSkuStock(orderIds,resultMap);
+        if (!resultMap.isEmpty()){
+            return resultMap;
+        }
+        //批量发货
+        int count = orderDao.delivery(deliveryParamList);
 
 
         //添加操作记录
@@ -158,7 +168,7 @@ public class OmsOrderServiceImpl implements OmsOrderService {
             }).collect(Collectors.toList());
         orderOperateHistoryDao.insertList(operateHistoryList);
 
-        return count;
+        return resultMap;
     }
 
     /**
@@ -166,8 +176,7 @@ public class OmsOrderServiceImpl implements OmsOrderService {
      */
 //    @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateSkuStock(List<Long> orderIds) {
-
+    public void updateSkuStock(List<Long> orderIds,Map<String,String> resultMap) {
         // 查询订单详情
         OmsOrderItemExample example = new OmsOrderItemExample();
         example.createCriteria().andOrderIdIn(orderIds);
@@ -202,15 +211,19 @@ public class OmsOrderServiceImpl implements OmsOrderService {
         Map<String, List<OmsOrderItem>> map = omsOrderItems.stream().collect(Collectors.groupingBy(o -> o.getOrderSn()));
         List<OrderSkuSync> skuSyncList = new ArrayList<>();
         List<OmsOrderItem> updateItems = new ArrayList<>();
-        map.forEach((sn,v) -> {
+        for (String sn : map.keySet()) {
+            List<OmsOrderItem> v = map.get(sn);
             OrderSkuSync skuSync = new OrderSkuSync();
             skuSync.setOrderNo(sn);
             List<OrderSkuSync.SkuSync> skuSyncs = new ArrayList<>();
             skuSync.setSkuSyncList(skuSyncs);
-            v.stream().forEach(o -> {
-
+            for (OmsOrderItem o : v) {
                 List<PmsProductSkuStockRecord> skuStockRecords = skuStockRecordMap.get(o.getProductSkuId());
                 if (CollectionUtils.isEmpty(skuStockRecords)) {
+                    if (resultMap != null){
+                        resultMap.put(o.getProductSkuId().toString(),skuMap.get(o.getProductSkuId()) +"库存不足");
+                        continue;
+                    }
                     throw new BizException(skuMap.get(o.getProductSkuId()) +"库存不足");
                 }
                 List<OrderSkuSync.SkuSync> itemSkus = new ArrayList<>();
@@ -277,6 +290,10 @@ public class OmsOrderServiceImpl implements OmsOrderService {
                     }
                 }
                 if (count1 > 0) {
+                    if (resultMap != null){
+                        resultMap.put(o.getProductSkuId().toString(),skuMap.get(o.getProductSkuId()) +"库存不足");
+                        continue;
+                    }
                     throw new BizException(skuMap.get(o.getProductSkuId())+"库存不足");
                 }
                 if (CollUtil.isNotEmpty(itemSkus)) {
@@ -286,9 +303,12 @@ public class OmsOrderServiceImpl implements OmsOrderService {
                     orderItem.setStockJson(JSON.toJSONString(itemSkus));
                     updateItems.add(orderItem);
                 }
-            });
+            }
             skuSyncList.add(skuSync);
-        });
+        }
+        if(resultMap != null && !resultMap.isEmpty()){
+            return;
+        }
         for (Map.Entry<Long, PmsProductSkuStockRecord> entry : updateMap.entrySet()) {
             PmsProductSkuStockRecord v = entry.getValue();
             PmsProductSkuStockRecord update = new PmsProductSkuStockRecord();
@@ -805,8 +825,7 @@ public class OmsOrderServiceImpl implements OmsOrderService {
 
         // 如果订单状态是已发货，扣减库存
         if (order.getStatus() ==2 || order.getStatus() == 3) {
-
-            updateSkuStock(Lists.newArrayList(detail.getId()));
+            updateSkuStock(Lists.newArrayList(detail.getId()),null);
         }
     }
 

mec-mall/mall-admin/src/main/resources/config/mybatis/OmsOrderDao.xml

@@ -27,6 +27,12 @@
         <if test="queryParam.orderSn!=null and queryParam.orderSn!=''">
             AND o.order_sn = #{queryParam.orderSn}
         </if>
+        <if test="queryParam.orderSns != null and queryParam.orderSns.size > 0">
+            AND o.order_sn IN
+            <foreach collection="queryParam.orderSns" item="orderSn" separator="," open="(" close=")">
+                #{orderSn}
+            </foreach>
+        </if>
         <if test="queryParam.status!=null">
             AND o.`status` = #{queryParam.status}
         </if>
@@ -219,4 +225,10 @@
         </where>
         order by oo.id desc
     </select>
+    <select id="getDeliveryList" resultType="java.lang.String">
+        select order_sn from oms_order where status != 1 AND id IN
+        <foreach collection="orderIds" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </select>
 </mapper>

mec-mall/mall-common/src/main/java/com/yonge/cooleshow/mall/common/api/CommonResult.java

@@ -69,6 +69,15 @@ public class CommonResult<T> {
 
     /**
      * 失败返回结果
+     * @param errorCode 错误码
+     * @param message 错误信息
+     */
+    public static <T> CommonResult<T> failed(IErrorCode errorCode,String message,T data) {
+        return new CommonResult<T>(errorCode.getCode(), message, data);
+    }
+
+    /**
+     * 失败返回结果
      * @param message 提示信息
      */
     public static <T> CommonResult<T> failed(String message) {