he2802 1 年間 前
コミット
bbaf362ab2

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/ExamStudyRecordVo.java

@@ -118,4 +118,7 @@ public class ExamStudyRecordVo {
     private Integer status;
     @ApiModelProperty("文件数量")
     private Long fileNum;
+
+    @ApiModelProperty("科目名称拼接")
+    private String subjectNames;
 }

+ 2 - 1
zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -129,6 +129,7 @@
         <result property="status" column="status"/>
         <result property="sectionNum" column="section_num"/>
         <result property="fileNum" column="file_num"/>
+        <result property="subjectNames" column="subject_names"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.ExamSonStudyRecordVo" id="ExamSonStudyRecordVoResult">
@@ -810,6 +811,7 @@
         s.service_start_time,
         s.service_end_time,
         s.order_goods_id,
+        (SELECT GROUP_CONCAT(subject_name) from course_subject where FIND_IN_SET(id,g.subject_ids)) subject_names,
         ( SELECT m.category_name FROM major m WHERE   m.id =g.major_id LIMIT 1) AS category_name,
         ( SELECT i.business_name FROM course_business i WHERE i.id = g.business_id LIMIT 1) AS business_name,
         ( SELECT p.project_name FROM course_project_type p WHERE p.id = g.project_id LIMIT 1) AS project_name,
@@ -895,7 +897,6 @@
         WHERE
         gc.goods_id = g.goods_id
         AND cm.type = 1)) as chapter_num,
-        ( SELECT e.education_name FROM course_education_type e WHERE e.id = g.education_type_id LIMIT 1) AS education_name,
         (( SELECT
         COUNT( cm.id )
         FROM