Merge branch 'dev_v1.3.5_20220929'

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityEvaluationController.java

@@ -85,7 +85,7 @@ public class ActivityEvaluationController extends BaseController {
 
 	@ApiOperation(value = "批量更新曲目信息")
 	@PostMapping("/batchUpdate")
-	public HttpResponseResult<Boolean> batchUpdateEvaluationInfo(ActivityEvaluationDto info) {
+	public HttpResponseResult<Boolean> batchUpdateEvaluationInfo(@Valid @RequestBody ActivityEvaluationDto info) {
 
 		SysUser user = sysUserFeignService.queryUserInfo();
 		if (user == null || null == user.getId()) {

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TeacherController.java

@@ -270,7 +270,7 @@ public class TeacherController extends BaseController {
     @ApiOperation(value = "老师琴房课绑定学员列表")
     @PostMapping("/bindingUserList")
     // @PreAuthorize("@pcs.hasPermissions('teacher/bindingUserList')")
-    public HttpResponseResult<PageInfo<TeacherBindingUserVo.BindingUserList>> bindingUserList(@RequestBody TeacherBindingUserVo.BindingUserQuery query) {
+    public HttpResponseResult<PageInfo<TeacherBindingUserVo.BindingUserList>> bindingUserList(@RequestBody  @Valid  TeacherBindingUserVo.BindingUserQuery query) {
         IPage<UserBindingTeacherWrapper> wrapperIPage = userBindingTeacherService.selectBindingUserPage(PageUtil.getPage(query),
                                                         TeacherBindingUserQueryInfo.BindingUserQuery.from(query.jsonString()));
         // 数据转换
@@ -284,7 +284,7 @@ public class TeacherController extends BaseController {
     @ApiOperation(value = "查看课表")
     @PostMapping("/selectBindingUserCourse")
     // @PreAuthorize("@pcs.hasPermissions('teacher/selectBindingUserCourse')")
-    public HttpResponseResult<PageInfo<TeacherBindingUserVo.BindingStudentCourseList>> selectBindingUserCourse(@RequestBody TeacherBindingUserVo.BindingStudentCourseQuery query) {
+    public HttpResponseResult<PageInfo<TeacherBindingUserVo.BindingStudentCourseList>> selectBindingUserCourse(@RequestBody @Valid TeacherBindingUserVo.BindingStudentCourseQuery query) {
         IPage<UserBindingCourseWrapper> wrapperIPage = userBindingTeacherService.selectBindingUserCoursePage(PageUtil.getPage(query),
                                                                                                              TeacherBindingUserQueryInfo.BindingStudentCourseQuery.from(query.jsonString()));
         // 数据转换

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/io/request/TeacherBindingUserVo.java

@@ -20,7 +20,7 @@ public class TeacherBindingUserVo {
     @ApiModel("BindingUserQuery-老师绑定的学生列表查询")
     public static class BindingUserQuery extends QueryInfo {
 
-        @ApiModelProperty("老师id")
+        @ApiModelProperty(value = "老师id",required = true)
         @NotNull(message = "老师id不能为空")
         private Long teacherId;
 
@@ -209,12 +209,12 @@ public class TeacherBindingUserVo {
     @ApiModel("BindingStudentCourseQuery-绑定学生课程列表查询")
     public static class BindingStudentCourseQuery extends QueryInfo{
 
-        @ApiModelProperty("老师id")
+        @ApiModelProperty(value = "老师id",required = true)
         @NotNull(message = "老师id不能为空")
         private Long teacherId;
 
         @NotNull(message = "学员id不能为空")
-        @ApiModelProperty("学员id")
+        @ApiModelProperty(value = "学员id",required = true)
         private Long studentId;
         public String jsonString() {
             return JSON.toJSONString(this);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/ActivityEvaluationDto.java

@@ -31,7 +31,7 @@ public class ActivityEvaluationDto extends BaseEntity {
 	@ApiModelProperty("活动老师id 多个用,分割 ")
 	private String teacherIds; // 分享活动老师ID
 
-	@ApiModelProperty("评测内空 ")
+	@ApiModelProperty("评测曲目信息 ")
 	private List<EvaluationInfo> evaluationInfos;
 
 	public String getTeacherIds() {