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

mec-application/src/main/java/com/ym/mec/config/WebMvcConfig.java

@@ -11,6 +11,7 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+import com.microsvc.toolkit.common.webportal.converter.EnumsConvertorFactory;
 import com.ym.mec.common.config.EnumConverterFactory;
 import com.ym.mec.common.config.LocalFastJsonHttpMessageConverter;
 import com.ym.mec.common.enums.BaseEnum;
@@ -52,6 +53,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
 	@Override
 	public void addFormatters(FormatterRegistry registry) {
 		registry.addConverterFactory(new EnumConverterFactory());
+		// 枚举映射转换
+		registry.addConverterFactory(new EnumsConvertorFactory());
 	}
 
 	@Override

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

@@ -51,7 +51,7 @@ public class MusicSheetController {
         @ApiImplicitParam(name = "id", value = "id", dataType = "long")
     })
     @GetMapping("/cbsDetail/{id}")
-    public R<MusicSheetVo.OpenMusicSheetDetail> cbsDetail(@PathVariable("id") Integer id) {
+    public R<MusicSheetVo.MusicSheetDetail> cbsDetail(@PathVariable("id") Integer id) {
         CbsMusicSheetWrapper.MusicSheet musicSheet = musicSheetService.cbsDetail(id);
         musicSheet.setBizId(Long.valueOf(id));
 
@@ -80,7 +80,7 @@ public class MusicSheetController {
                 }
             }
         }
-        return R.from(MusicSheetVo.OpenMusicSheetDetail.from(musicSheetDetail.jsonString()));
+        return R.from(musicSheetDetail);
     }
 
 }

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/teacher/controller/MusicSheetController.java

@@ -51,7 +51,7 @@ public class MusicSheetController {
         @ApiImplicitParam(name = "id", value = "id", dataType = "long")
     })
     @GetMapping("/cbsDetail/{id}")
-    public R<MusicSheetVo.OpenMusicSheetDetail> cbsDetail(@PathVariable("id") Integer id) {
+    public R<MusicSheetVo.MusicSheetDetail> cbsDetail(@PathVariable("id") Integer id) {
         CbsMusicSheetWrapper.MusicSheet musicSheet = musicSheetService.cbsDetail(id);
         musicSheet.setBizId(Long.valueOf(id));
 
@@ -80,7 +80,7 @@ public class MusicSheetController {
                 }
             }
         }
-        return R.from(MusicSheetVo.OpenMusicSheetDetail.from(musicSheetDetail.jsonString()));
+        return R.from(musicSheetDetail);
     }
 
 }

mec-application/src/main/java/com/ym/mec/vo/MusicSheetVo.java

@@ -454,7 +454,7 @@ public class MusicSheetVo {
         private EMusicSourceType sourceType;
 
         @ApiModelProperty("音频类型(HOMEMODE: 自制 COMMON: 普通)")
-        private com.dayaedu.cbs.common.enums.music.EAudioType audioType;
+        private EAudioType audioType;
 
         @ApiModelProperty("曲目状态（0：停用，1：启用）")
         private Boolean status;

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

@@ -1,7 +1,6 @@
 package com.ym.mec.web.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.dayaedu.cbs.domain.wrapper.MusicSheetWrapper;
 import com.dayaedu.cbs.openfeign.client.MusicFeignClientService;
 import com.dayaedu.cbs.openfeign.properties.OpenFeignClientConfigProperties;
 import com.dayaedu.cbs.openfeign.service.CbsMusicSheetService;
@@ -13,6 +12,7 @@ import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.microsvc.toolkit.common.response.template.R;
 import com.microsvc.toolkit.common.webportal.exception.BizException;
 import com.ym.mec.biz.dal.entity.SysMusicScore;
+import com.ym.mec.biz.dal.wrapper.MusicSheetWrapper;
 import com.ym.mec.biz.service.SysMusicScoreService;
 import com.ym.mec.vo.PageUtil;
 import io.swagger.annotations.Api;

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

@@ -51,7 +51,7 @@ public class MusicSheetController {
         @ApiImplicitParam(name = "id", value = "id", dataType = "long")
     })
     @GetMapping("/cbsDetail/{id}")
-    public R<MusicSheetVo.OpenMusicSheetDetail> cbsDetail(@PathVariable("id") Integer id) {
+    public R<MusicSheetVo.MusicSheetDetail> cbsDetail(@PathVariable("id") Integer id) {
         CbsMusicSheetWrapper.MusicSheet musicSheet = musicSheetService.cbsDetail(id);
         musicSheet.setBizId(Long.valueOf(id));
 
@@ -80,7 +80,7 @@ public class MusicSheetController {
                 }
             }
         }
-        return R.from(MusicSheetVo.OpenMusicSheetDetail.from(musicSheetDetail.jsonString()));
+        return R.from(musicSheetDetail);
     }
 
 }

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

@@ -1,11 +1,11 @@
 package com.ym.mec.web.controller;
 
-import com.dayaedu.cbs.domain.wrapper.MusicSheetWrapper;
 import com.ym.mec.biz.dal.dto.ReasonDto;
 import com.ym.mec.biz.dal.entity.SysMusicScore;
 import com.ym.mec.biz.dal.enums.ClientTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
+import com.ym.mec.biz.dal.wrapper.MusicSheetWrapper;
 import com.ym.mec.biz.service.SysMusicScoreService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;

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

@@ -22,8 +22,6 @@ public class CourseHomeworkListDto {
     /** 作业内容 */
     private String title;
 
-    private String memo;
-
     /**  */
     private java.util.Date createTime;
 

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/StudentCourseHomeworkDto.java

@@ -31,6 +31,4 @@ public class StudentCourseHomeworkDto {
     private Integer isView;
 
     private Long studentCourseHomeworkId;
-
-    private String memo;
 }

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

@@ -74,6 +74,4 @@ public class StudentHomeworkRecordDto {
 
     @ApiModelProperty("提交时间")
     private Date submitTime;
-
-    private String memo;
 }

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

@@ -57,5 +57,7 @@ public class StudentLessonExaminationDetailDto {
     @ApiModelProperty(value = "曲目是否有效")
     private Boolean validFlag;
 
+    private String memo;
+
 }
 

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

@@ -50,6 +50,4 @@ public class StudentServiceDetailDto {
     private String attachments;
 
     private String musicScoreId;
-
-    private String memo;
 }

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

@@ -19,8 +19,6 @@ public class StudentServiceHomeworkDto {
 
     private Integer isReplied;
 
-    private String memo;
-
     private Integer isRepliedTimely;
 
     private Integer isView;

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

@@ -30,8 +30,6 @@ public class StudentVisitCourseHomeWorkDto {
     @ApiModelProperty(value = "作业内容",required = false)
     private String content;
 
-    private String memo;
-
     @ApiModelProperty(value = "提交状态",required = false)
     private YesOrNoEnum status;
 

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

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

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/dal/wrapper/LessonCoursewareWrapper.java

@@ -223,9 +223,6 @@ public class LessonCoursewareWrapper {
 
         @ApiModelProperty(value = "老师ID",hidden = true)
         private Integer teacherId;
-
-        @ApiModelProperty(value = "课程ID")
-        private String courseScheduleId;
     }
 
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/MusicSheetWrapper.java

@@ -5,7 +5,6 @@ import com.dayaedu.cbs.common.enums.music.*;
 import com.dayaedu.cbs.common.enums.school.EMusicSheetType;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
-import com.ym.mec.biz.dal.wrapper.MusicSheetAccompanimentWrapper;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -57,9 +56,6 @@ public class MusicSheetWrapper {
     }
 
     @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
     @ApiModel(" MusicSheet-曲谱表")
     public static class MusicSheet {
 

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/SysMusicScoreService.java

@@ -4,7 +4,6 @@ package com.ym.mec.biz.service;
 import java.util.List;
 import java.util.Map;
 
-import com.dayaedu.cbs.domain.wrapper.MusicSheetWrapper;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
 import com.dayaedu.cbs.openfeign.wrapper.musicInstrument.CbsMusicalInstrumentWrapper;
 import com.ym.mec.biz.dal.dao.SysMusicScoreDao;
@@ -12,6 +11,7 @@ import com.ym.mec.biz.dal.dto.MusicScoreDto;
 import com.ym.mec.biz.dal.dto.ReasonDto;
 import com.ym.mec.biz.dal.entity.SysMusicScore;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
+import com.ym.mec.biz.dal.wrapper.MusicSheetWrapper;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 

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

@@ -120,7 +120,6 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
                 // 原本作业逻辑
                 for (Integer userId : musicScoreSubjectDto.getUserIdList()) {
                     studentExtraExercise.setUserId(userId);
-                    studentExtraExercise.setMemo(musicScoreSubjectDto.getMemo());
                     studentExtraExercise.setMusicScoreId(StringUtils.join(musicScoreSubjectDto.getMusicScoreIdList(),","));
                     studentExtraExercise.setMusicScoreContent(JSONObject.toJSONString(musicScoreSubjectDto.getMusicScoreHomeworkDtoList()));
                     extracurricularExercisesReplies.add(JSON.parseObject(JSON.toJSONString(studentExtraExercise),ExtracurricularExercisesReply.class));
@@ -133,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 {
@@ -145,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/LessonCoursewareServiceImpl.java

@@ -212,12 +212,18 @@ public class LessonCoursewareServiceImpl extends ServiceImpl<LessonCoursewareMap
         if (lessonCoursewareDetail == null) {
             throw new BizException("课件未找到");
         }
+        CbsLessonCoursewareWrapper.LessonCourseware lessonCourseware =
+                coursewareFeignService.lessonCoursewareDetail(lessonCoursewareDetail.getLessonCoursewareId()).feignData();
+        if (lessonCourseware == null) {
+            throw new BizException("课件未找到");
+        }
         Teacher teacher = teacherDao.get(query.getTeacherId());
         if (teacher == null) {
             throw new BizException("老师信息不存在");
         }
         if (lessonCoursewareDetail.getLevel() == null || teacher.getCoursewareFlag()) {
-            return new ArrayList<>();
+            result.add(this.initRefLevelDetailInfo(lessonCoursewareDetail,lessonCourseware));
+            return result;
         }
         LessonCoursewareWrapper.LessonCoursewareQuery query1 = new LessonCoursewareWrapper.LessonCoursewareQuery();
         query1.setPage(1);
@@ -226,24 +232,20 @@ public class LessonCoursewareServiceImpl extends ServiceImpl<LessonCoursewareMap
         query1.setEnable(true);
         List<LessonCoursewareWrapper.LessonCoursewareDto> dtos = baseMapper.list(query1);
         if(CollectionUtils.isEmpty(dtos)){
-            return new ArrayList<>();
+            result.add(this.initRefLevelDetailInfo(lessonCoursewareDetail,lessonCourseware));
+            return result;
         }
         List<Long> lessonCoursewareIds = dtos.stream().map(LessonCoursewareWrapper.LessonCoursewareDto::getLessonCoursewareId).collect(Collectors.toList());
-        CbsLessonCoursewareWrapper.LessonCourseware lessonCourseware =
-                coursewareFeignService.lessonCoursewareDetail(lessonCoursewareDetail.getLessonCoursewareId()).feignData();
-        if (lessonCourseware == null) {
-            throw new BizException("课件未找到");
-        }
         // 查询当前能使用的课件
         CbsLessonCoursewareWrapper.LessonCoursewareQuery lambdaQuery = new CbsLessonCoursewareWrapper.LessonCoursewareQuery();
         lambdaQuery.setPage(1);
         lambdaQuery.setRows(9999);
         lambdaQuery.setLevel(lessonCourseware.getLevel());
-        lambdaQuery.setOrchestraType(lessonCourseware.getOrchestraType());
         lambdaQuery.setLessonCoursewareIds(lessonCoursewareIds);
         List<CbsLessonCoursewareWrapper.LessonCourseware> lessonCoursewareList = coursewareFeignService.lessonCoursewarePage(lambdaQuery).feignData().getRows();
         if (CollectionUtils.isEmpty(lessonCoursewareList)) {
-            return new ArrayList<>();
+            result.add(this.initRefLevelDetailInfo(lessonCoursewareDetail,lessonCourseware));
+            return result;
         }
         List<Long> courseIds = lessonCoursewareList.stream().map(CbsLessonCoursewareWrapper.LessonCourseware::getId).collect(Collectors.toList());
         Map<Long, CbsLessonCoursewareWrapper.LessonCourseware> lessonCoursewareMap =
@@ -257,7 +259,8 @@ public class LessonCoursewareServiceImpl extends ServiceImpl<LessonCoursewareMap
         lessonCoursewareDetailQuery.setLevel(lessonCoursewareDetail.getLevel());
         List<CbsLessonCoursewareDetailWrapper.LessonCoursewareDetail> lessonCoursewareDetails = coursewareFeignService.lessonCoursewareDetailPage(lessonCoursewareDetailQuery).feignData().getRows();
         if (CollectionUtils.isEmpty(lessonCoursewareDetails)) {
-            return new ArrayList<>();
+            result.add(this.initRefLevelDetailInfo(lessonCoursewareDetail,lessonCourseware));
+            return result;
         }
         for (CbsLessonCoursewareDetailWrapper.LessonCoursewareDetail coursewareDetail : lessonCoursewareDetails) {
             LessonCoursewareWrapper.RefLevelDetailInfo refLevelDetailInfo = new LessonCoursewareWrapper.RefLevelDetailInfo();
@@ -277,6 +280,19 @@ public class LessonCoursewareServiceImpl extends ServiceImpl<LessonCoursewareMap
         return result;
     }
 
+    private LessonCoursewareWrapper.RefLevelDetailInfo initRefLevelDetailInfo(CbsLessonCoursewareDetailWrapper.LessonCoursewareDetail coursewareDetail,
+                                                                              CbsLessonCoursewareWrapper.LessonCourseware lessonCourseware) {
+        LessonCoursewareWrapper.RefLevelDetailInfo refLevelDetailInfo = new LessonCoursewareWrapper.RefLevelDetailInfo();
+        refLevelDetailInfo.setId(coursewareDetail.getId());
+        refLevelDetailInfo.setLessonCoursewareId(coursewareDetail.getLessonCoursewareId());
+        refLevelDetailInfo.setCoverImg(lessonCourseware.getCoverImg());
+        refLevelDetailInfo.setCourseTypeCode(lessonCourseware.getCourseTypeCode());
+        refLevelDetailInfo.setLockFlag(false);
+        refLevelDetailInfo.setLessonCoursewareName(lessonCourseware.getName());
+        refLevelDetailInfo.setUseFlag(true);
+        return refLevelDetailInfo;
+    }
+
     //递归处理CbsLessonCoursewareDetailWrapper.KnowledgePointSmall
     private void setTreeResourceId(List<CbsLessonCoursewareDetailWrapper.KnowledgePointSmall> knowledgePointList,List<Integer> categoryIdList){
         if(CollectionUtils.isNotEmpty(knowledgePointList)){

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

@@ -835,8 +835,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());
                 }
             }
         }

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/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/SysMusicScoreServiceImpl.java

@@ -9,7 +9,6 @@ import com.dayaedu.cbs.common.enums.music.EMusicAvailableType;
 import com.dayaedu.cbs.common.enums.music.EMusicPlayMode;
 import com.dayaedu.cbs.common.enums.music.EMusicSourceType;
 import com.dayaedu.cbs.common.enums.school.EMusicSheetType;
-import com.dayaedu.cbs.domain.wrapper.MusicSheetWrapper;
 import com.dayaedu.cbs.openfeign.client.MusicFeignClientService;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetApplicationExtendClientWrapper;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
@@ -22,6 +21,7 @@ import com.ym.mec.biz.dal.dto.ReasonDto;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
+import com.ym.mec.biz.dal.wrapper.MusicSheetWrapper;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;

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()));
-							studentCourseHomeworks.forEach(studentCourseHomework -> studentCourseHomework.setMemo(scoreSubjectDto.getMemo()));
+                                                                    .homeWorkDetail(scoreSubjectDto.getStudentLessonTrainingDetails(),
+																			userIdList,
+																			courseHomework.getId(),
+																			ELessonTrainingType.HOMEWORK,
+																			scoreSubjectDto.getGroup(),
+																			scoreSubjectDto.getMemo()));
 						}
 					}else {
 						studentCourseHomeworks.addAll(studentCourseHomeworkDao.constructInitialStudentHomeworkRecordsWithPayment(teacherAttendance.getCourseScheduleId(),
@@ -437,8 +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));
-						studentCourseHomeworks.forEach(studentCourseHomework -> studentCourseHomework.setMemo(courseHomeworkInfo.getMemo()));
+                                                                .homeWorkDetail(courseHomeworkInfo.getStudentLessonTrainingDetails(),
+																		userIdList,
+																		courseHomework.getId(),
+																		ELessonTrainingType.HOMEWORK,
+																		null,
+																		courseHomeworkInfo.getMemo()));
 
 					}
 					if(CollectionUtils.isEmpty(studentCourseHomeworks)){

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

@@ -297,7 +297,7 @@
 		<result property="versionTag" column="versionTag"/>
 	</resultMap>
     <select id="queryHomePage" resultMap="WebCourseHomeworkListDtoMap">
-		SELECT ch.id_,cs.id_ course_schedule_id_,cs.name_ course_schedule_name_,sch.memo_,
+		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_,

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

@@ -31,7 +31,6 @@
 		<result column="type" property="type" />
 		<result column="push_flag_" property="pushFlag" />
 		<result column="group_type_" property="groupType" />
-		<result column="memo_" property="memo" />
 	</resultMap>
 
 	<sql id="queryPageCondition">
@@ -155,7 +154,7 @@
 	<!-- 分页查询 -->
 	<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_,eer.memo_,
+		       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
 		FROM extracurricular_exercises ee LEFT JOIN sys_user u ON ee.teacher_id_ = u.id_

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

@@ -14,7 +14,6 @@
 		<result column="username_" property="user.username" />
 		<result column="attachments_" property="attachments" />
 		<result column="create_time_" property="createTime" />
-		<result column="memo_" property="memo" />
 		<result column="update_time_" property="updateTime" />
 		<result column="remark_" property="remark" />
 		<result column="status_" property="status" />
@@ -36,7 +35,6 @@
 		<result column="teacher_name_" property="teacherName"/>
 		<result column="avatar_" property="headUrl"/>
 		<result column="phone_" property="phone"/>
-		<result column="memo_" property="memo"/>
 		<result column="title_" property="title"/>
 		<result column="content_" property="content"/>
 		<result column="expire_date_" property="expireDate"/>
@@ -103,21 +101,21 @@
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO extracurricular_exercises_reply (extracurricular_exercises_id_,user_id_,attachments_,create_time_,
 		                                             update_time_,remark_,status_,is_replied_,is_view_,is_replied_timely_,
-		                                             music_score_id_,music_score_content_,tenant_id_,standard_flag_,memo_)
+		                                             music_score_id_,music_score_content_,tenant_id_,standard_flag_)
 		VALUES(#{extracurricularExercisesId},#{userId},#{attachments},NOW(),NOW(),#{remark},#{status},#{isReplied},#{isView},
-		       #{isRepliedTimely},#{musicScoreId},#{musicScoreContent},#{tenantId},#{standardFlag},#{memo})
+		       #{isRepliedTimely},#{musicScoreId},#{musicScoreContent},#{tenantId},#{standardFlag})
 	</insert>
 
 	<insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO extracurricular_exercises_reply (extracurricular_exercises_id_,user_id_,attachments_,
 		                                             create_time_,update_time_,remark_,status_,is_replied_,is_view_,
-		                                             is_replied_timely_,music_score_id_,music_score_content_,tenant_id_,standard_flag_,memo_)
+		                                             is_replied_timely_,music_score_id_,music_score_content_,tenant_id_,standard_flag_)
 		VALUES
 		<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.memo})
+			 #{replay.standardFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
 		</foreach>
 	</insert>
 
@@ -146,9 +144,6 @@
 			<if test="remark != null">
 			remark_ = #{remark},
 			</if>
-			<if test="memo != null">
-				memo_ = #{memo},
-			</if>
 			<if test="id != null">
 			id_ = #{id},
 			</if>
@@ -407,7 +402,6 @@
 		<result column="id_" property="id" />
 		<result column="user_id_" property="userId" />
 		<result column="status_" property="status" />
-		<result column="memo_" property="memo" />
 		<result column="is_replied_" property="isReplied" />
 		<result column="is_replied_timely_" property="isRepliedTimely" />
 		<result column="is_view_" property="isView" />
@@ -423,7 +417,6 @@
 			eer.submit_time_,
 			eer.is_replied_,
 			eer.is_replied_timely_,
-			eer.memo_,
 			'EXTRA' type_
 		FROM
 			extracurricular_exercises_reply eer
@@ -437,7 +430,6 @@
 			sch.submit_time_,
 			sch.is_replied_,
 			sch.is_replied_timely_,
-			sch.memo_,
 			'HOMEWORK' type_
 		FROM
 			student_course_homework sch
@@ -466,7 +458,6 @@
 		<result property="isReplied" column="is_replied_"/>
 		<result property="attachments" column="attachments_"/>
 		<result property="musicScoreId" column="music_score_id_"/>
-		<result property="memo" column="memo_"/>
 	</resultMap>
 
 	<select id="findStudentHomeworkDetailsInTimeZone" resultMap="StudentServiceDetailDto">
@@ -489,7 +480,6 @@
 			eer.attachments_,
 			eer.submit_time_,
 			eer.is_replied_,
-			eer.memo_,
 			'EXTRA' homework_type_
 		FROM
 			extracurricular_exercises_reply eer
@@ -517,7 +507,6 @@
 			sch.attachments_,
 			sch.submit_time_,
 			sch.is_replied_,
-			sch.memo_,
 			'HOMEWORK' homework_type_
 		FROM
 			student_course_homework sch
@@ -558,7 +547,6 @@
 			eer.is_replied_timely_,
 			ee.teacher_id_ ee_teacher_id_,
 			eer.music_score_id_,
-			eer.memo_,
 			ee.music_group_id_ ee_music_group_id_
 		FROM
 			extracurricular_exercises_reply eer
@@ -607,8 +595,7 @@
 			COUNT( eer.user_id_ ) exceptStudentNum,
 			SUM( eer.status_ ) submitStudentNum,
 			SUM( eer.is_replied_ ) repliedStudentNum,
-			eer.music_score_id_ musicScoreId,
-			eer.memo_ memo
+			eer.music_score_id_ musicScoreId
 		FROM
 			extracurricular_exercises ee
 			LEFT JOIN sys_user su ON ee.teacher_id_ = su.id_

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

@@ -29,7 +29,6 @@
         <result column="music_score_content_" property="musicScoreContent"/>
         <result column="tenant_id_" property="tenantId"/>
         <result column="subject_id_" property="subjectId"/>
-        <result column="memo_" property="memo"/>
         <result column="standard_flag_" property="standardFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
 
@@ -40,7 +39,6 @@
         <result column="course_schedule_id_" property="courseScheduleId"/>
         <result column="studentCourseHomeworkId" property="studentCourseHomeworkId"/>
         <result column="content_" property="content"/>
-        <result column="memo_" property="memo"/>
         <result column="expiry_date_" property="expiryDate"/>
         <result column="completed_num_" property="completedNum"/>
         <result column="expect_num_" property="expectNum"/>
@@ -92,7 +90,7 @@
         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_,memo_)
+         music_score_content_,tenant_id_,standard_flag_,group_type_)
         VALUE
         <foreach collection="list" item="homework" separator=",">
             (#{homework.userId},#{homework.courseScheduleId},#{homework.courseHomeworkId},#{homework.attachments},
@@ -101,7 +99,7 @@
             #{homework.isView,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{homework.isRepliedTimely},
             #{homework.musicScoreId},#{homework.musicScoreContent},#{homework.tenantId},
             #{homework.standardFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            #{homework.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{homework.memo})
+            #{homework.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
         </foreach>
     </insert>
 
@@ -134,9 +132,6 @@
             <if test="remark != null">
                 remark_ = #{remark},
             </if>
-            <if test="memo != null">
-                memo_ = #{memo},
-            </if>
             <if test="status != null">
                 status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
@@ -167,7 +162,6 @@
         <result column="id_" property="id"/>
         <result column="course_schedule_id_" property="courseScheduleId"/>
         <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="expiry_date_" property="expiryDate"/>
@@ -210,7 +204,6 @@
     <select id="queryPage" resultMap="CourseHomeworkDto" parameterType="map">
         SELECT
         sch.id_,
-        sch.memo_,
         ch.*,
         IF(cs.group_type_='MUSIC',mg.name_,NULL) music_group_name_,
         cg.name_ class_group_name_,
@@ -260,8 +253,7 @@
                sch.is_replied_,
                sch.course_schedule_id_,
                sch.standard_flag_,
-               sch.submit_time_,
-               sch.memo_
+               sch.submit_time_
         FROM course_homework ch
                  LEFT JOIN student_course_homework sch ON ch.id_ = sch.course_homework_id_
                  LEFT JOIN music_group mg ON ch.music_group_id_ = mg.id_
@@ -347,7 +339,6 @@
         <result column="username_" property="studentName"/>
         <result column="phone_" property="phone"/>
         <result column="subject_name_" property="subjectNames"/>
-        <result column="memo_" property="memo"/>
         <result column="attachments_" property="url"/>
         <result column="is_replied_" property="isReplied"/>
         <result column="is_view_" property="isView"/>
@@ -355,7 +346,7 @@
         <result column="submit_time_" property="submitTime"/>
     </resultMap>
     <select id="findStudentCourseHomeworks" resultMap="StudentCourseHomeworkDtoMap">
-        SELECT sch.id_ student_course_homework_id_,sch.attachments_,sch.is_replied_,sch.is_view_,sch.memo_,
+        SELECT sch.id_ student_course_homework_id_,sch.attachments_,sch.is_replied_,sch.is_view_,
         sch.update_time_,cssp.user_id_,su.username_,su.phone_,sch.submit_time_,s.name_ subject_name_
         FROM student_course_homework sch
         LEFT JOIN course_schedule_student_payment cssp ON sch.course_schedule_id_ = cssp.course_schedule_id_ AND cssp.user_id_ =
@@ -372,7 +363,6 @@
         <result property="studentCourseHomeworkId" column="student_course_homework_id_"/>
         <result property="courseScheduleId" column="course_schedule_id_"/>
         <result property="courseName" column="course_name_"/>
-        <result property="memo" column="memo_"/>
         <result property="startClassTime" column="start_class_time_"/>
         <result property="teacherId" column="actual_teacher_id_"/>
         <result property="status" column="status_"/>
@@ -391,7 +381,6 @@
         sch.id_ student_course_homework_id_,
         sch.course_schedule_id_,
         cs.name_ course_name_,
-        sch.memo_,
         CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
         CONCAT(cs.class_date_,' ',cs.end_class_time_) endClassTime,
         cs.actual_teacher_id_,
@@ -540,7 +529,6 @@
         <result column="courseName" property="courseName"/>
         <result column="createTime" property="createTime"/>
         <result column="teacherName" property="teacherName"/>
-        <result column="memo_" property="memo"/>
         <result column="content" property="content"/>
         <result column="status" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="isReplied" property="isReplied" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
@@ -556,8 +544,7 @@
         ch.content_ content,
         sch.status_ status,
         sch.is_replied_ isReplied,
-        sch.is_view_ isView,
-        sch.memo_
+        sch.is_view_ isView
         FROM student_course_homework sch
         LEFT JOIN course_homework ch ON ch.id_ = sch.course_homework_id_
         LEFT JOIN course_schedule cs ON cs.id_ = sch.course_schedule_id_
@@ -601,8 +588,7 @@
             COUNT( sch.user_id_ ) exceptStudentNum,
             SUM( sch.status_ ) submitStudentNum,
             SUM( sch.is_replied_ ) repliedStudentNum,
-            sch.music_score_id_ musicScoreId,
-            sch.memo_ memo
+            sch.music_score_id_ musicScoreId
         FROM
             course_homework ch
             LEFT JOIN music_group mg ON mg.id_ = ch.music_group_id_

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

@@ -16,6 +16,7 @@
         <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="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
     </resultMap>
@@ -23,18 +24,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_)
         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})
         </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
         from student_lesson_examination_detail sled
         left join sys_music_score sms ON sms.id_ = sled.music_score_id_
         <where>

mec-common/common-core/src/main/java/com/ym/mec/common/config/LocalFastJsonHttpMessageConverter.java

@@ -6,6 +6,7 @@ import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.microsvc.toolkit.common.enums.ConverterEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpOutputMessage;
@@ -69,6 +70,10 @@ class EnumFilter implements ValueFilter {
 		if (BaseEnum.class.isAssignableFrom(value.getClass())) {
 			return ((BaseEnum<?, ?>) value).getCode();
 		}
+		// ConverterEnum枚举映射转换
+		if (ConverterEnum.class.isAssignableFrom(value.getClass())) {
+			return ((ConverterEnum<?>) value).getCode();
+		}
 		return value;
 	}
 }

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

@@ -54,12 +54,7 @@ public class OmsOrderController {
         try {
             boolean b = lock.tryLock(60, 60, TimeUnit.SECONDS);
             if (b) {
-                Map<String, String> delivery = orderService.delivery(deliveryParamList);
-                if (delivery.isEmpty()) {
-                    return CommonResult.success(delivery);
-                }else {
-                    return CommonResult.failed(ResultCode.FAILED,ResultCode.FAILED.getMessage(),delivery);
-                }
+                return CommonResult.success(orderService.delivery(deliveryParamList));
             }
         } catch (InterruptedException e) {
             log.error("批量发货异常", e);