Merge branch 'feature_HW_20230331' into master_saas

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

@@ -44,11 +44,11 @@ public class StudentLessonExaminationDetailServiceImpl extends ServiceImpl<Stude
                 LessonExaminationDetailDto vo = detailDtos.get(i);
                 StudentLessonExaminationDetail studentLessonExaminationDetail = new StudentLessonExaminationDetail();
                 studentLessonExaminationDetail.setLessonExaminationId(lessonExaminationId);
-                studentLessonExaminationDetail.setScore(vo.getScore());
+                studentLessonExaminationDetail.setStandardScore(vo.getScore());
                 if(i == 0){
-                    studentLessonExaminationDetail.setStandardScore(score + subScore);
+                    studentLessonExaminationDetail.setAvgScore(score + subScore);
                 }else {
-                    studentLessonExaminationDetail.setStandardScore(score);
+                    studentLessonExaminationDetail.setAvgScore(score);
                 }
                 studentLessonExaminationDetail.setPartIndex(vo.getPartIndex());
                 studentLessonExaminationDetail.setHeardLevel(vo.getHeardLevel());

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

@@ -1,40 +0,0 @@
-package com.ym.mec.web.controller;
-
-
-import com.ym.mec.biz.dal.dto.StudentLessonExaminationDto1;
-import com.ym.mec.biz.service.StudentLessonExaminationService;
-import com.ym.mec.common.controller.BaseController;
-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.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * 学生进度评测表(StudentLessonExamination)表控制层
- *
- * @author zx
- * @since 2023-04-03 18:21:30
- */
-@Api(tags = "学生进度评测表")
-@RestController
-@RequestMapping("/studentLessonExamination")
-public class StudentLessonExaminationController extends BaseController {
-    /**
-     * 服务对象
-     */
-    @Resource
-    private StudentLessonExaminationService studentLessonExaminationService;
-
-    @ApiOperation(value = "获取评测学员列表")
-    @PostMapping("queryPage")
-    public HttpResponseResult<PageInfo<StudentLessonExaminationDto1>> queryPage(Integer studentLessonExaminationId) {
-        return succeed(studentLessonExaminationService.queryPageByWeb(studentLessonExaminationId));
-    }
-
-}
-