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

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

@@ -72,7 +72,7 @@
         <result property="userId" column="user_id_"/>
         <result property="phone" column="phone_"/>
         <result property="username" column="username_"/>
-        <result property="trainingScore" column="training_score_"/>
+        <result property="trainingScore" column="training_score_1"/>
         <result property="trainingTime" column="training_time_"/>
         <collection property="detailDtos" ofType="com.ym.mec.biz.dal.dto.StudentLessonExaminationDetailDto1">
             <result property="standardScore" column="standard_score_"/>
@@ -84,7 +84,7 @@
         </collection>
     </resultMap>
     <select id="queryStudentPage" resultMap="StudentLessonExaminationDtoMap">
-        select sle.user_id_,su.username_,su.phone_,sb.name_ subjectName,sle.training_score_,
+        select sle.user_id_,su.username_,su.phone_,sb.name_ subjectName,sle.training_score_1,
                sms.name_ musicScoreName,sled.actual_avg_score_,sled.standard_score_,sled.training_score_,
                sled.avg_score_,sled.heard_level_,sle.training_time_
         from student_lesson_examination sle

mec-web/src/main/java/com/ym/mec/web/controller/LessonExaminationController.java

@@ -13,6 +13,7 @@ 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.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -38,12 +39,14 @@ public class LessonExaminationController extends BaseController {
 
     @ApiOperation(value = "获取作业学员列表")
     @PostMapping("queryStudentPage")
+    @PreAuthorize("@pcs.hasPermissions('lessonExamination/queryStudentPage')")
     public HttpResponseResult<List<StudentLessonExaminationDto1>> queryStudentPage(Long lessonExaminationId,Integer subjectId) {
         return succeed(studentLessonExaminationService.queryStudentPage(lessonExaminationId,subjectId));
     }
 
     @ApiOperation(value = "获取作业列表")
     @PostMapping("queryPage")
+    @PreAuthorize("@pcs.hasPermissions('lessonExamination/queryPage')")
     public HttpResponseResult<PageInfo<LessonExaminationResultDto>> queryPage(@RequestBody LessonExaminationQueryInfo queryInfo) {
         queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
         return succeed(lessonExaminationService.queryPage(queryInfo));
@@ -51,6 +54,7 @@ public class LessonExaminationController extends BaseController {
 
     @ApiOperation(value = "获取作业关联的所有声部")
     @GetMapping("querySubject")
+    @PreAuthorize("@pcs.hasPermissions('lessonExamination/querySubject')")
     public HttpResponseResult<List<Subject>> querySubject(Long lessonExaminationId) {
         return succeed(lessonExaminationService.querySubject(lessonExaminationId));
     }