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

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/LessonExaminationDao.java

@@ -6,6 +6,7 @@ import com.ym.mec.biz.dal.dto.LessonExaminationResultDto1;
 import com.ym.mec.biz.dal.dto.LessonExaminationResultDto2;
 import com.ym.mec.biz.dal.dto.LessonExaminationSaveDto;
 import com.ym.mec.biz.dal.entity.LessonExamination;
+import com.ym.mec.biz.dal.entity.Subject;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
@@ -37,5 +38,7 @@ public interface LessonExaminationDao extends BaseMapper<LessonExamination> {
     void updateStandardNum(@Param("lessonExaminationId") Long lessonExaminationId);
 
     List<LessonExamination> queryEndList();
+
+    List<Subject> querySubject(@Param("lessonExaminationId") Long lessonExaminationId);
 }
 

mec-biz/src/main/java/com/ym/mec/biz/service/LessonExaminationService.java

@@ -6,10 +6,13 @@ import com.ym.mec.biz.dal.dto.LessonExaminationResultDto;
 import com.ym.mec.biz.dal.dto.LessonExaminationResultDto1;
 import com.ym.mec.biz.dal.dto.LessonExaminationSaveDto;
 import com.ym.mec.biz.dal.entity.LessonExamination;
+import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.page.LessonExaminationQueryInfo;
 import com.ym.mec.biz.dal.page.LessonExaminationQueryInfo1;
 import com.ym.mec.common.page.PageInfo;
 
+import java.util.List;
+
 /**
  * 进度评测表(LessonExamination)表服务接口
  *
@@ -29,5 +32,7 @@ public interface LessonExaminationService extends IService<LessonExamination> {
     LessonExaminationResultDto1 getOne(Integer userId, Long lessonExaminationId);
 
     void pushEndMsg();
+
+    List<Subject> querySubject(Long lessonExaminationId);
 }
 

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

@@ -224,5 +224,10 @@ public class LessonExaminationServiceImpl extends ServiceImpl<LessonExaminationD
         }
     }
 
+    @Override
+    public List<Subject> querySubject(Long lessonExaminationId) {
+        return baseMapper.querySubject(lessonExaminationId);
+    }
+
 }
 

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

@@ -140,5 +140,21 @@
     <select id="queryEndList" resultType="com.ym.mec.biz.dal.entity.LessonExamination">
         select * from lesson_examination where NOW() > expire_date_ AND push_flag_ = 0
     </select>
+    <resultMap type="com.ym.mec.biz.dal.entity.Subject" id="Subject">
+        <result column="id_" property="id"/>
+        <result column="name_" property="name"/>
+        <result column="code_" property="code"/>
+        <result column="parent_subject_id_" property="parentSubjectId"/>
+        <result column="img_" property="img"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+    </resultMap>
+    <select id="querySubject" resultMap="Subject">
+        select s.* from student_lesson_examination sle
+        left join subject s ON s.id_ = sle.subject_id_
+        where sle.lesson_examination_id_ = #{lessonExaminationId}
+        group by s.id_
+    </select>
 
 </mapper>

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

@@ -3,6 +3,7 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.biz.dal.dto.LessonExaminationResultDto;
 import com.ym.mec.biz.dal.dto.StudentLessonExaminationDto1;
+import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.page.LessonExaminationQueryInfo;
 import com.ym.mec.biz.service.LessonExaminationService;
 import com.ym.mec.biz.service.OrganizationService;
@@ -12,10 +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.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -50,5 +48,11 @@ public class LessonExaminationController extends BaseController {
         queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
         return succeed(lessonExaminationService.queryPage(queryInfo));
     }
+
+    @ApiOperation(value = "获取作业关联的所有声部")
+    @GetMapping("querySubject")
+    public HttpResponseResult<List<Subject>> querySubject(Long lessonExaminationId) {
+        return succeed(lessonExaminationService.querySubject(lessonExaminationId));
+    }
 }