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

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

@@ -18,6 +18,7 @@ import com.ym.mec.biz.dal.page.TeacherServeHomeworkQueryInfo;
 import com.ym.mec.biz.service.ExtracurricularExercisesReplyService;
 import com.ym.mec.biz.service.ExtracurricularExercisesService;
 import com.ym.mec.biz.service.StudentExtracurricularExercisesSituationService;
+import com.ym.mec.biz.service.SysUserService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
@@ -48,25 +49,18 @@ public class ExtracurricularExercisesController extends BaseController {
     @Autowired
     private StudentExtracurricularExercisesSituationService studentExtracurricularExercisesSituationService;
     @Autowired
-    private SysUserFeignService sysUserFeignService;
+    private SysUserService sysUserService;
     @Autowired
     private StudentRegistrationDao studentRegistrationDao;
     @Autowired
     private ClassGroupStudentMapperDao classGroupStudentMapperDao;
     @Autowired
-    private StudentDao studentDao;
-
-    @Autowired
     private SubjectDao subjectDao;
 
     @ApiOperation(value = "获取教师有服务指标的课程列表")
     @GetMapping("/queryTeacherServeHomeworkDetail")
     public HttpResponseResult queryTeacherServeHomeworkDetail(TeacherServeHomeworkQueryInfo queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed("用户信息获取失败");
-        }
-        queryInfo.setTeacherId(sysUser.getId());
+        queryInfo.setTeacherId(sysUserService.getUserId());
         return succeed(studentExtracurricularExercisesSituationService.queryTeacherServeHomeworkDetail1(queryInfo));
     }
 
@@ -74,22 +68,14 @@ public class ExtracurricularExercisesController extends BaseController {
     @ApiOperation(value = "获取教师有服务指标的课程列表")
     @GetMapping("/queryTeacherServeHomeworkDetail/v2")
     public HttpResponseResult<PageInfo<CourseHomeworkWrapper.CourseHomeworkList>> queryTeacherServeHomeworkDetailV2(CourseHomeworkWrapper.CourseHomeworkQuery queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed("用户信息获取失败");
-        }
-        queryInfo.setTeacherId(sysUser.getId());
+        queryInfo.setTeacherId(sysUserService.getUserId());
         return succeed(studentExtracurricularExercisesSituationService.queryTeacherServeHomeworkDetailV2(queryInfo));
     }
 
     @ApiOperation(value = "获取教师课外作业列表")
     @GetMapping("/queryTeacherExtraHomeworkDetail/v2")
     public HttpResponseResult<PageInfo<CourseHomeworkWrapper.CourseHomeworkList>> queryTeacherExtraHomeworkDetailV2(CourseHomeworkWrapper.CourseHomeworkQuery queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed("用户信息获取失败");
-        }
-        queryInfo.setTeacherId(sysUser.getId());
+        queryInfo.setTeacherId(sysUserService.getUserId());
         return succeed(studentExtracurricularExercisesSituationService.queryTeacherExtraHomeworkDetailV2(queryInfo));
     }
 
@@ -97,11 +83,7 @@ public class ExtracurricularExercisesController extends BaseController {
     @ApiOperation(value = "获取老师训练统计")
     @GetMapping("/getStatistics")
     public HttpResponseResult getStatistics(ExtraExercilseQueryInfo queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed("用户信息获取失败");
-        }
-        queryInfo.setTeacherId(sysUser.getId());
+        queryInfo.setTeacherId(sysUserService.getUserId());
         return succeed(studentExtracurricularExercisesSituationService.getStatistics(queryInfo));
     }
 
@@ -115,11 +97,7 @@ public class ExtracurricularExercisesController extends BaseController {
     @PostMapping("/createExtraExercises")
     @AuditLogAnnotation(operateName = "创建课外训练")
     private HttpResponseResult createExtraExercises(ExtracurricularExercises exercises){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(sysUser)){
-            return failed(HttpStatus.FORBIDDEN,"请登录");
-        }
-        exercises.setTeacherId(sysUser.getId());
+        exercises.setTeacherId(sysUserService.getUserId());
         exercises.setGroupType(ELessonTrainingType.EXTRACURRICULAR.getCode());
         extracurricularExercisesService.createExtraExercises(exercises);
         return succeed();
@@ -129,17 +107,13 @@ public class ExtracurricularExercisesController extends BaseController {
     @PostMapping("/createExtraExercisesForJson")
     @AuditLogAnnotation(operateName = "创建课外训练")
     private HttpResponseResult createExtraExercisesForJson(@RequestBody ExtracurricularExercises exercises){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(sysUser)){
-            return failed(HttpStatus.FORBIDDEN,"请登录");
-        }
         if(null == exercises.getExpireDate()){
             Calendar instance = Calendar.getInstance();
             instance.add(Calendar.WEEK_OF_MONTH,1);
             exercises.setExpireDate(instance.getTime());
         }
 
-        exercises.setTeacherId(sysUser.getId());
+        exercises.setTeacherId(sysUserService.getUserId());
         extracurricularExercisesService.createExtraExercises(exercises);
         return succeed();
     }
@@ -147,22 +121,14 @@ public class ExtracurricularExercisesController extends BaseController {
     @ApiOperation(value = "获取课外训练列表")
     @GetMapping("/findExtraExercilses")
     private HttpResponseResult findExtraExercilses(ExtraExercilseQueryInfo queryInfo){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(sysUser)){
-            return failed(HttpStatus.FORBIDDEN,"请登录");
-        }
-        queryInfo.setTeacherId(sysUser.getId());
+        queryInfo.setTeacherId(sysUserService.getUserId());
         return succeed(extracurricularExercisesService.findExtraExercilses(queryInfo));
     }
 
     @ApiOperation(value = "获取已布置训练列表（包含课后，课外）")
     @GetMapping("/findExtraExercilsesHomeworks")
     private HttpResponseResult findExtraExercilsesHomeworks(ExtraExercilseQueryInfo queryInfo){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(sysUser)){
-            return failed(HttpStatus.FORBIDDEN,"请登录");
-        }
-        queryInfo.setTeacherId(sysUser.getId());
+        queryInfo.setTeacherId(sysUserService.getUserId());
         return succeed(extracurricularExercisesService.findExtraExercilsesHomeworks(queryInfo));
     }
 
@@ -178,21 +144,13 @@ public class ExtracurricularExercisesController extends BaseController {
     @ApiOperation(value = "获取待布置学员列表")
     @GetMapping("/getDontServeStudents")
     public HttpResponseResult getDontServeStudents(String search, String musicGroupId, Long classGroupId, Integer subjectId,Integer hasMember,String studentIds){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(sysUser)){
-            return failed(HttpStatus.FORBIDDEN,"请登录");
-        }
-        return succeed(extracurricularExercisesService.getDontServeStudents(sysUser.getId(), search, musicGroupId, classGroupId, subjectId,hasMember,studentIds));
+        return succeed(extracurricularExercisesService.getDontServeStudents(sysUserService.getUserId(), search, musicGroupId, classGroupId, subjectId,hasMember,studentIds));
     }
 
     @ApiOperation(value = "获取待布置学员乐团列表")
     @GetMapping("/getDontServeStudentMusicGroups")
     public HttpResponseResult getDontServeStudentMusicGroups(String search){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(sysUser)){
-            return failed(HttpStatus.FORBIDDEN,"请登录");
-        }
-        List<BasicUserDto> dontServeStudents = extracurricularExercisesService.getDontServeStudents(sysUser.getId(), search, null, null,null,null,null);
+        List<BasicUserDto> dontServeStudents = extracurricularExercisesService.getDontServeStudents(sysUserService.getUserId(), search, null, null,null,null,null);
         if(CollectionUtils.isEmpty(dontServeStudents)){
             return succeed(Collections.emptyList());
         }
@@ -204,12 +162,9 @@ public class ExtracurricularExercisesController extends BaseController {
     @ApiOperation(value = "获取服务学员查询条件")
     @GetMapping("/getDontServeStudentQueryCondition")
     public HttpResponseResult getDontServeStudentQueryCondition(String musicGroupId){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(sysUser)){
-            return failed(HttpStatus.FORBIDDEN,"请登录");
-        }
         Map<String, Object> result = new HashMap<>();
-        List<BasicUserDto> dontServeStudents = extracurricularExercisesService.getDontServeStudents(sysUser.getId(), null, musicGroupId, null, null,null,null);
+        Integer userId = sysUserService.getUserId();
+        List<BasicUserDto> dontServeStudents = extracurricularExercisesService.getDontServeStudents(userId, null, musicGroupId, null, null,null,null);
         if(CollectionUtils.isEmpty(dontServeStudents)){
             result.put("musicGroups", Collections.emptyList());
             result.put("classGroups", Collections.emptyList());
@@ -220,7 +175,7 @@ public class ExtracurricularExercisesController extends BaseController {
         List<MusicGroup> studentNormalMusicGroups = studentRegistrationDao.getStudentNormalMusicGroups(studentIds);
         result.put("musicGroups", studentNormalMusicGroups);
 
-        List<ClassGroup> classGroups = classGroupStudentMapperDao.getStudentClassGroupWithTeacher(studentIds, sysUser.getId(), musicGroupId);
+        List<ClassGroup> classGroups = classGroupStudentMapperDao.getStudentClassGroupWithTeacher(studentIds, userId, musicGroupId);
         result.put("classGroups", classGroups);
 
 //        List<Subject> studentSubjects = studentDao.getStudentSubjects(studentIds);

mec-application/src/main/java/com/ym/mec/teacher/controller/TeacherManageController.java

@@ -1,6 +1,6 @@
 package com.ym.mec.teacher.controller;
 
-import com.ksyun.ks3.dto.PostObjectFormFields;
+import com.microsvc.toolkit.middleware.oss.wrapper.OssWrapper;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.CashAccountDetail;
@@ -21,42 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.microsvc.toolkit.middleware.oss.wrapper.OssWrapper;
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dto.CashAccountDetail;
-import com.ym.mec.biz.dal.entity.CooperationOrgan;
-import com.ym.mec.biz.dal.entity.SysSuggestion;
-import com.ym.mec.biz.dal.entity.SysUserBankCard;
-import com.ym.mec.biz.service.ClassGroupService;
-import com.ym.mec.biz.service.CooperationOrganService;
-import com.ym.mec.biz.service.StudentRegistrationService;
-import com.ym.mec.biz.service.SysSuggestionService;
-import com.ym.mec.biz.service.SysUserBankCardService;
-import com.ym.mec.biz.service.SysUserCashAccountDetailService;
-import com.ym.mec.biz.service.SysUserCashAccountService;
-import com.ym.mec.biz.service.UploadFileService;
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.entity.UploadReturnBean;
-import com.ym.mec.thirdparty.entity.UploadSign;
-import com.ym.mec.util.upload.UploadUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
 import java.util.List;
 
 @Api(tags = "教师管理")

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

@@ -1,5 +1,8 @@
 package com.ym.mec.biz.dal.dto;
 
+import lombok.Data;
+
+@Data
 public class CountStudentTrainDataDto {
     private Integer userId;
 
@@ -25,83 +28,5 @@ public class CountStudentTrainDataDto {
 
     private Integer visitFlag;
 
-    public Integer getVisitFlag() {
-        return visitFlag;
-    }
-
-    public void setVisitFlag(Integer visitFlag) {
-        this.visitFlag = visitFlag;
-    }
-
-    public String getMusicGroupName() {
-        return musicGroupName;
-    }
-
-    public void setMusicGroupName(String musicGroupName) {
-        this.musicGroupName = musicGroupName;
-    }
-
-    public Integer getRecordNum() {
-        return recordNum;
-    }
-
-    public void setRecordNum(Integer recordNum) {
-        this.recordNum = recordNum;
-    }
-
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
-    public String getAvatar() {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public Integer getTotalPlayTime() {
-        return totalPlayTime;
-    }
-
-    public void setTotalPlayTime(Integer totalPlayTime) {
-        this.totalPlayTime = totalPlayTime;
-    }
-
-    public Integer getTrainDay() {
-        return trainDay;
-    }
-
-    public void setTrainDay(Integer trainDay) {
-        this.trainDay = trainDay;
-    }
-
-    public Integer getTrainNum() {
-        return trainNum;
-    }
-
-    public void setTrainNum(Integer trainNum) {
-        this.trainNum = trainNum;
-    }
+    private Boolean memberFlag;
 }

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

@@ -24,5 +24,11 @@ public class LessonExaminationDetailDto{
 
     @ApiModelProperty(value = "合格分数")
     private Integer score;
+
+    @ApiModelProperty("开始小节")
+    private Integer start;
+
+    @ApiModelProperty("结束小节")
+    private Integer end;
 }
 

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

@@ -1,7 +1,9 @@
 package com.ym.mec.biz.dal.dto;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
+@Data
 public class MusicScoreHomeworkDto {
 
     @ApiModelProperty(value = "曲目编号",required = false)
@@ -10,19 +12,9 @@ public class MusicScoreHomeworkDto {
     @ApiModelProperty(value = "分谱",required = false)
     private Integer partIndex = 0;
 
-    public Integer getMusicScoreId() {
-        return musicScoreId;
-    }
+    @ApiModelProperty("开始小节")
+    private Integer start;
 
-    public void setMusicScoreId(Integer musicScoreId) {
-        this.musicScoreId = musicScoreId;
-    }
-
-    public Integer getPartIndex() {
-        return partIndex;
-    }
-
-    public void setPartIndex(Integer partIndex) {
-        this.partIndex = partIndex;
-    }
+    @ApiModelProperty("结束小节")
+    private Integer end;
 }

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

@@ -18,10 +18,6 @@ public class StudentLessonExaminationSaveDto {
     @ApiModelProperty(value = "学员编号，逗号分割")
     private String studentIds;
 
-//    @ApiModelProperty(value = "声部")
-//    private Integer subjectId;
-
-
     @ApiModelProperty("作业分组")
     private Integer group;
 

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

@@ -39,6 +39,12 @@ public class StudentLessonTrainingDetailWrapper {
 
         @ApiModelProperty("声部")
         private Integer subjectId;
+
+        @ApiModelProperty("开始小节")
+        private Integer start;
+
+        @ApiModelProperty("结束小节")
+        private Integer end;
     }
 
     @Data

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

@@ -56,6 +56,14 @@ public class StudentLessonTrainingDetail implements Serializable {
 	@TableField(value = "music_score_id_")
     private Long musicScoreId;
 
+    @ApiModelProperty("开始小节")
+    @TableField(value = "start_")
+    private Integer start;
+
+    @ApiModelProperty("结束小节")
+    @TableField(value = "end_")
+    private Integer end;
+
     @ApiModelProperty("分谱")
     @TableField(value = "part_index_")
     private Integer partIndex;

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

@@ -10,11 +10,7 @@ import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.ExtraExercilseQueryInfo;
-import com.ym.mec.biz.service.ExtracurricularExercisesService;
-import com.ym.mec.biz.service.StudentLessonTrainingDetailService;
-import com.ym.mec.biz.service.StudentServeService;
-import com.ym.mec.biz.service.SysConfigService;
-import com.ym.mec.biz.service.SysMessageService;
+import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
@@ -56,13 +52,8 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
     private StudentServeService studentServeService;
     @Autowired
     private StudentCourseHomeworkDao studentCourseHomeworkDao;
-
-    @Autowired
-    private ClassGroupStudentMapperDao classGroupStudentMapperDao;
-
     @Autowired
     private ClassGroupDao classGroupDao;
-
     @Autowired
     private SysConfigService sysConfigService;
     @Autowired
@@ -76,12 +67,6 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
     @Override
     @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
     public void createExtraExercises(ExtracurricularExercises exercises) {
-        if(StringUtils.isBlank(exercises.getTitle())){
-            // throw new BizException("请填写标题");
-        }
-        if(StringUtils.isBlank(exercises.getContent())){
-            // throw new BizException("请填写内容");
-        }
         if (exercises.getMusicGroupId() != null) {
             exercises.setGroupType(ELessonTrainingType.EXTRACURRICULAR.getCode());
         } else {

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

@@ -57,6 +57,8 @@ public class StudentLessonExaminationDetailServiceImpl extends ServiceImpl<Stude
                     studentLessonExaminationDetail.setMusicScoreId(vo.getMusicScoreId());
                     studentLessonExaminationDetail.setHeardLevel(vo.getHeardLevel());
                     studentLessonExaminationDetail.setStandardScore(vo.getScore());
+                    studentLessonExaminationDetail.setStart(vo.getStart());
+                    studentLessonExaminationDetail.setEnd(vo.getEnd());
                     studentLessonExaminationDetail.setGroup(dto.getGroup());
                     if(i == 0){
                         studentLessonExaminationDetail.setAvgScore(score + subScore);

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

@@ -124,7 +124,6 @@ public class StudentLessonTrainingDetailServiceImpl extends ServiceImpl<StudentL
             studentLessonTrainingDetail.setUpdateTime(new Date());
             studentLessonTrainingDetail.setGroup(group);
             studentLessonTrainingDetail.setType(type);
-
         }
         return result;
     }

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

@@ -473,6 +473,10 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 			return pageInfo;
 		}
 		params.put("studentIdList",studentIdList);
+		List<Integer> memberStudent = new ArrayList<>();
+		if (queryInfo.getMemberFlag() == null){
+			memberStudent = studentDao.queryMemberStudent(true, studentIdList);
+		}
 		int count = sysMusicCompareRecordDao.countStudentTrain(params);
 		List<CountStudentTrainDataDto> dataList = new ArrayList<>();
 		if(count > 0){
@@ -484,6 +488,11 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 			pageInfo.setTotal(count);
 			for (CountStudentTrainDataDto e : dataList) {
 				e.setMusicGroupName(groupNameMap.get(e.getUserId()));
+				if (queryInfo.getMemberFlag() != null){
+					e.setMemberFlag(queryInfo.getMemberFlag());
+				}else {
+					e.setMemberFlag(memberStudent.contains(e.getUserId()));
+				}
 				if(visitFlag == 1){
 					e.setVisitFlag(visitFlag);
 				}

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

@@ -70,9 +70,8 @@
             <if test="deviceNo != null">
                 device_no_ = #{deviceNo},
             </if>
-
         </set>
-        WHERE id_ = #{id} ans tenant_id_ = #{tenantId}
+        WHERE id_ = #{id}
     </update>
 
     <!-- 根据主键删除一条记录 -->